diff --git a/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab b/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab
index 0370b0f2..08569066 100644
--- a/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab
+++ b/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab
@@ -25,32 +25,32 @@
         "__id__": 10
       },
       {
-        "__id__": 38
+        "__id__": 47
       },
       {
-        "__id__": 106
+        "__id__": 131
       },
       {
-        "__id__": 125
+        "__id__": 150
       },
       {
-        "__id__": 140
+        "__id__": 165
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 155
+        "__id__": 180
       },
       {
-        "__id__": 157
+        "__id__": 182
       },
       {
-        "__id__": 159
+        "__id__": 184
       }
     ],
     "_prefab": {
-      "__id__": 161
+      "__id__": 186
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -269,20 +269,20 @@
         "__id__": 11
       },
       {
-        "__id__": 17
+        "__id__": 26
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 33
+        "__id__": 42
       },
       {
-        "__id__": 35
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 46
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -315,139 +315,216 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "WorldCamera",
     "_objFlags": 0,
-    "__editorExtras__": {},
     "_parent": {
       "__id__": 10
     },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 12
-      },
+    "_prefab": {
+      "__id__": 12
+    },
+    "__editorExtras__": {}
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 11
+    },
+    "asset": {
+      "__uuid__": "1ee4a519-c5ef-453c-98d6-9940781b6fcc",
+      "__expectedType__": "cc.Prefab"
+    },
+    "fileId": "64PJYFWgBDZrEsaiYwZxmh",
+    "instance": {
+      "__id__": 13
+    },
+    "targetOverrides": null
+  },
+  {
+    "__type__": "cc.PrefabInstance",
+    "fileId": "2fBi1gb7xM5Z+0qX8xffGY",
+    "prefabRootNode": {
+      "__id__": 1
+    },
+    "mountedChildren": [],
+    "mountedComponents": [
       {
         "__id__": 14
       }
     ],
-    "_prefab": {
-      "__id__": 16
+    "propertyOverrides": [
+      {
+        "__id__": 18
+      },
+      {
+        "__id__": 20
+      },
+      {
+        "__id__": 21
+      },
+      {
+        "__id__": 22
+      },
+      {
+        "__id__": 23
+      },
+      {
+        "__id__": 25
+      }
+    ],
+    "removedComponents": []
+  },
+  {
+    "__type__": "cc.MountedComponentsInfo",
+    "targetInfo": {
+      "__id__": 15
     },
-    "_lpos": {
+    "components": [
+      {
+        "__id__": 16
+      }
+    ]
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "64PJYFWgBDZrEsaiYwZxmh"
+    ]
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "mountedRoot": {
+        "__id__": 11
+      }
+    },
+    "node": {
+      "__id__": 11
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 17
+    },
+    "_alignFlags": 44,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 720,
+    "_originalHeight": 0,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "c9P/N0EtBKRqjVfxNVfhKv"
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 19
+    },
+    "propertyPath": [
+      "_name"
+    ],
+    "value": "游戏渲染"
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "64PJYFWgBDZrEsaiYwZxmh"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 19
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": -360,
       "y": 0,
       "z": 0
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 19
     },
-    "_lrot": {
+    "propertyPath": [
+      "_lrot"
+    ],
+    "value": {
       "__type__": "cc.Quat",
       "x": 0,
       "y": 0,
       "z": 0,
       "w": 1
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 19
     },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
+    "propertyPath": [
+      "_euler"
+    ],
+    "value": {
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
       "z": 0
-    },
-    "_id": ""
+    }
   },
   {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 11
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 24
     },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 13
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 720,
-      "height": 1280
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "61k/3xmdtHe6Srw0droR6G"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 11
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 15
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "a0d1e275-5512-493e-8e15-7d2db8beb48e@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 1,
-    "_fillCenter": {
+    "propertyPath": [
+      "_anchorPoint"
+    ],
+    "value": {
       "__type__": "cc.Vec2",
       "x": 0,
       "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
+    }
   },
   {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "eb9IOPTBFJjLwXgqVCKLbC"
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "61k/3xmdtHe6Srw0droR6G"
+    ]
   },
   {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 24
     },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "64PJYFWgBDZrEsaiYwZxmh",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
+    "propertyPath": [
+      "_contentSize"
+    ],
+    "value": {
+      "__type__": "cc.Size",
+      "width": 720,
+      "height": 1280
+    }
   },
   {
     "__type__": "cc.Node",
@@ -459,23 +536,23 @@
     },
     "_children": [
       {
-        "__id__": 18
+        "__id__": 27
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 26
+        "__id__": 35
       },
       {
-        "__id__": 28
+        "__id__": 37
       },
       {
-        "__id__": 30
+        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 41
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -512,23 +589,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 17
+      "__id__": 26
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 28
       },
       {
-        "__id__": 21
+        "__id__": 30
       },
       {
-        "__id__": 23
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 34
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -565,11 +642,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 18
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 20
+      "__id__": 29
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -593,11 +670,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 18
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 22
+      "__id__": 31
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -638,11 +715,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 18
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 24
+      "__id__": 33
     },
     "_color": {
       "__type__": "cc.Color",
@@ -677,11 +754,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 26
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 27
+      "__id__": 36
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -705,11 +782,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 26
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 38
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -750,11 +827,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 26
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 31
+      "__id__": 40
     },
     "_alignFlags": 9,
     "_target": null,
@@ -803,7 +880,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 34
+      "__id__": 43
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -831,7 +908,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 36
+      "__id__": 45
     },
     "_alignFlags": 45,
     "_target": null,
@@ -880,29 +957,29 @@
     },
     "_children": [
       {
-        "__id__": 39
+        "__id__": 48
       },
       {
-        "__id__": 47
+        "__id__": 72
       },
       {
-        "__id__": 61
+        "__id__": 86
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 99
+        "__id__": 124
       },
       {
-        "__id__": 101
+        "__id__": 126
       },
       {
-        "__id__": 103
+        "__id__": 128
       }
     ],
     "_prefab": {
-      "__id__": 105
+      "__id__": 130
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -933,235 +1010,6 @@
     },
     "_id": ""
   },
-  {
-    "__type__": "cc.Node",
-    "_name": "野怪列表",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 38
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 40
-      },
-      {
-        "__id__": 42
-      },
-      {
-        "__id__": 44
-      }
-    ],
-    "_prefab": {
-      "__id__": 46
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 223.109,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 39
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 41
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 720,
-      "height": 120
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "0ccMb6aEJJmKtQPc0NQqC7"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 39
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 43
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 190,
-      "g": 190,
-      "b": 190,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "19pPQvdvdMCJ7w/Z+yYIek"
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 39
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 45
-    },
-    "_alignFlags": 40,
-    "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
-    "_horizontalCenter": 0,
-    "_verticalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 100,
-    "_originalHeight": 0,
-    "_alignMode": 2,
-    "_lockFlags": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "41TovpTmVCz4oCICCj50W/"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "cfqtEvOKpHO7NzoHh8DAIM",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "阵法",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 38
-    },
-    "_children": [
-      {
-        "__id__": 48
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 56
-      },
-      {
-        "__id__": 58
-      }
-    ],
-    "_prefab": {
-      "__id__": 60
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": -94.905,
-      "y": -59.881,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
   {
     "__type__": "cc.Node",
     "_objFlags": 0,
@@ -1179,10 +1027,10 @@
       "__id__": 48
     },
     "asset": {
-      "__uuid__": "9d7eeadb-58f6-4c42-aaed-bc402f272c84",
+      "__uuid__": "a9053170-1055-4272-b3fd-ad6fa75b5f25",
       "__expectedType__": "cc.Prefab"
     },
-    "fileId": "a8T0NC/KpNY7MMbRkPRuwY",
+    "fileId": "cfqtEvOKpHO7NzoHh8DAIM",
     "instance": {
       "__id__": 50
     },
@@ -1190,7 +1038,7 @@
   },
   {
     "__type__": "cc.PrefabInstance",
-    "fileId": "b5oOS+qEhH3IdM0aj6XS+/",
+    "fileId": "62h8g16k1FNKBdg5I1Dmk2",
     "prefabRootNode": {
       "__id__": 1
     },
@@ -1208,6 +1056,33 @@
       },
       {
         "__id__": 55
+      },
+      {
+        "__id__": 56
+      },
+      {
+        "__id__": 58
+      },
+      {
+        "__id__": 60
+      },
+      {
+        "__id__": 62
+      },
+      {
+        "__id__": 64
+      },
+      {
+        "__id__": 66
+      },
+      {
+        "__id__": 68
+      },
+      {
+        "__id__": 70
+      },
+      {
+        "__id__": 71
       }
     ],
     "removedComponents": []
@@ -1220,12 +1095,12 @@
     "propertyPath": [
       "_name"
     ],
-    "value": "阵法"
+    "value": "野怪列表"
   },
   {
     "__type__": "cc.TargetInfo",
     "localID": [
-      "a8T0NC/KpNY7MMbRkPRuwY"
+      "cfqtEvOKpHO7NzoHh8DAIM"
     ]
   },
   {
@@ -1239,7 +1114,7 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 0,
+      "y": 240,
       "z": 0
     }
   },
@@ -1274,17 +1149,342 @@
       "z": 0
     }
   },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 57
+    },
+    "propertyPath": [
+      "_right"
+    ],
+    "value": 0
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "41TovpTmVCz4oCICCj50W/"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 59
+    },
+    "propertyPath": [
+      "_contentSize"
+    ],
+    "value": {
+      "__type__": "cc.Size",
+      "width": 720,
+      "height": 120
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "0ccMb6aEJJmKtQPc0NQqC7"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 61
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": -300,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "4chdzdAAZG2ZnA2dvWbz+Q"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 63
+    },
+    "propertyPath": [
+      "_contentSize"
+    ],
+    "value": {
+      "__type__": "cc.Size",
+      "width": 480,
+      "height": 120
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "eeHVlqM0NN2bU8pdiFGOQ4"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 65
+    },
+    "propertyPath": [
+      "_contentSize"
+    ],
+    "value": {
+      "__type__": "cc.Size",
+      "width": 480,
+      "height": 120
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "8aRE0q34tED5M48dqLGa9P"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 67
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": -240,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "69mnnKIwlAhZMU3bytgVs0"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 69
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 300,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "510efzkfVOYJnng80lj0PW"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 57
+    },
+    "propertyPath": [
+      "_alignFlags"
+    ],
+    "value": 41
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 57
+    },
+    "propertyPath": [
+      "_top"
+    ],
+    "value": 0
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "阵法",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 47
+    },
+    "_children": [
+      {
+        "__id__": 73
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 81
+      },
+      {
+        "__id__": 83
+      }
+    ],
+    "_prefab": {
+      "__id__": 85
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -94.905,
+      "y": -57.565,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 72
+    },
+    "_prefab": {
+      "__id__": 74
+    },
+    "__editorExtras__": {}
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 73
+    },
+    "asset": {
+      "__uuid__": "9d7eeadb-58f6-4c42-aaed-bc402f272c84",
+      "__expectedType__": "cc.Prefab"
+    },
+    "fileId": "a8T0NC/KpNY7MMbRkPRuwY",
+    "instance": {
+      "__id__": 75
+    },
+    "targetOverrides": null
+  },
+  {
+    "__type__": "cc.PrefabInstance",
+    "fileId": "b5oOS+qEhH3IdM0aj6XS+/",
+    "prefabRootNode": {
+      "__id__": 1
+    },
+    "mountedChildren": [],
+    "mountedComponents": [],
+    "propertyOverrides": [
+      {
+        "__id__": 76
+      },
+      {
+        "__id__": 78
+      },
+      {
+        "__id__": 79
+      },
+      {
+        "__id__": 80
+      }
+    ],
+    "removedComponents": []
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 77
+    },
+    "propertyPath": [
+      "_name"
+    ],
+    "value": "阵法"
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "a8T0NC/KpNY7MMbRkPRuwY"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 77
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 77
+    },
+    "propertyPath": [
+      "_lrot"
+    ],
+    "value": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 77
+    },
+    "propertyPath": [
+      "_euler"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    }
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 47
+      "__id__": 72
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 57
+      "__id__": 82
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1308,11 +1508,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 47
+      "__id__": 72
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 59
+      "__id__": 84
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1366,32 +1566,32 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 38
+      "__id__": 47
     },
     "_children": [
       {
-        "__id__": 62
+        "__id__": 87
       },
       {
-        "__id__": 78
+        "__id__": 103
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 94
+        "__id__": 119
       },
       {
-        "__id__": 96
+        "__id__": 121
       }
     ],
     "_prefab": {
-      "__id__": 98
+      "__id__": 123
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 249.748,
-      "y": -62.84,
+      "y": -60.524,
       "z": 0
     },
     "_lrot": {
@@ -1423,27 +1623,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 61
+      "__id__": 86
     },
     "_children": [
       {
-        "__id__": 63
+        "__id__": 88
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 71
+        "__id__": 96
       },
       {
-        "__id__": 73
+        "__id__": 98
       },
       {
-        "__id__": 75
+        "__id__": 100
       }
     ],
     "_prefab": {
-      "__id__": 77
+      "__id__": 102
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1480,23 +1680,23 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 62
+      "__id__": 87
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 64
+        "__id__": 89
       },
       {
-        "__id__": 66
+        "__id__": 91
       },
       {
-        "__id__": 68
+        "__id__": 93
       }
     ],
     "_prefab": {
-      "__id__": 70
+      "__id__": 95
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1533,11 +1733,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 63
+      "__id__": 88
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 65
+      "__id__": 90
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1561,11 +1761,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 63
+      "__id__": 88
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 67
+      "__id__": 92
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1606,11 +1806,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 63
+      "__id__": 88
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 69
+      "__id__": 94
     },
     "_color": {
       "__type__": "cc.Color",
@@ -1645,11 +1845,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 62
+      "__id__": 87
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 72
+      "__id__": 97
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1673,11 +1873,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 62
+      "__id__": 87
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 74
+      "__id__": 99
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1718,11 +1918,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 62
+      "__id__": 87
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 76
+      "__id__": 101
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1774,7 +1974,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 62
+      "__id__": 87
     },
     "_id": ""
   },
@@ -1801,27 +2001,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 61
+      "__id__": 86
     },
     "_children": [
       {
-        "__id__": 79
+        "__id__": 104
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 87
+        "__id__": 112
       },
       {
-        "__id__": 89
+        "__id__": 114
       },
       {
-        "__id__": 91
+        "__id__": 116
       }
     ],
     "_prefab": {
-      "__id__": 93
+      "__id__": 118
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1858,23 +2058,23 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 78
+      "__id__": 103
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 80
+        "__id__": 105
       },
       {
-        "__id__": 82
+        "__id__": 107
       },
       {
-        "__id__": 84
+        "__id__": 109
       }
     ],
     "_prefab": {
-      "__id__": 86
+      "__id__": 111
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1911,11 +2111,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 79
+      "__id__": 104
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 81
+      "__id__": 106
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1939,11 +2139,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 79
+      "__id__": 104
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 83
+      "__id__": 108
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1984,11 +2184,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 79
+      "__id__": 104
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 110
     },
     "_color": {
       "__type__": "cc.Color",
@@ -2023,11 +2223,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 78
+      "__id__": 103
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 88
+      "__id__": 113
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2051,11 +2251,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 78
+      "__id__": 103
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 90
+      "__id__": 115
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2096,11 +2296,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 78
+      "__id__": 103
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 92
+      "__id__": 117
     },
     "clickEvents": [],
     "_interactable": true,
@@ -2152,7 +2352,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 78
+      "__id__": 103
     },
     "_id": ""
   },
@@ -2179,11 +2379,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 61
+      "__id__": 86
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 95
+      "__id__": 120
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2207,11 +2407,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 61
+      "__id__": 86
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 97
+      "__id__": 122
     },
     "_resizeMode": 1,
     "_layoutType": 2,
@@ -2248,6 +2448,8 @@
       "__id__": 0
     },
     "fileId": "a7k4jJN+9E4o9tingaVO93",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -2256,11 +2458,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 47
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 100
+      "__id__": 125
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2284,11 +2486,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 47
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 102
+      "__id__": 127
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2329,11 +2531,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 47
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 104
+      "__id__": 129
     },
     "_alignFlags": 44,
     "_target": null,
@@ -2382,26 +2584,26 @@
     },
     "_children": [
       {
-        "__id__": 107
+        "__id__": 132
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 115
+        "__id__": 140
       },
       {
-        "__id__": 117
+        "__id__": 142
       },
       {
-        "__id__": 119
+        "__id__": 144
       },
       {
-        "__id__": 121
+        "__id__": 146
       }
     ],
     "_prefab": {
-      "__id__": 124
+      "__id__": 149
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2438,23 +2640,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 106
+      "__id__": 131
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 108
+        "__id__": 133
       },
       {
-        "__id__": 110
+        "__id__": 135
       },
       {
-        "__id__": 112
+        "__id__": 137
       }
     ],
     "_prefab": {
-      "__id__": 114
+      "__id__": 139
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2491,11 +2693,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 107
+      "__id__": 132
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 109
+      "__id__": 134
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2519,11 +2721,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 107
+      "__id__": 132
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 111
+      "__id__": 136
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2564,11 +2766,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 107
+      "__id__": 132
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 113
+      "__id__": 138
     },
     "_color": {
       "__type__": "cc.Color",
@@ -2603,11 +2805,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 106
+      "__id__": 131
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 116
+      "__id__": 141
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2631,11 +2833,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 106
+      "__id__": 131
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 118
+      "__id__": 143
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2676,11 +2878,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 106
+      "__id__": 131
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 120
+      "__id__": 145
     },
     "_alignFlags": 44,
     "_target": null,
@@ -2712,15 +2914,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 106
+      "__id__": 131
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 122
+      "__id__": 147
     },
     "clickEvents": [
       {
-        "__id__": 123
+        "__id__": 148
       }
     ],
     "_interactable": true,
@@ -2799,23 +3001,23 @@
     },
     "_children": [
       {
-        "__id__": 126
+        "__id__": 151
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 132
+        "__id__": 157
       },
       {
-        "__id__": 134
+        "__id__": 159
       },
       {
-        "__id__": 136
+        "__id__": 161
       }
     ],
     "_prefab": {
-      "__id__": 139
+      "__id__": 164
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2852,20 +3054,20 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 125
+      "__id__": 150
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 127
+        "__id__": 152
       },
       {
-        "__id__": 129
+        "__id__": 154
       }
     ],
     "_prefab": {
-      "__id__": 131
+      "__id__": 156
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2902,11 +3104,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 126
+      "__id__": 151
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 128
+      "__id__": 153
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2930,11 +3132,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 126
+      "__id__": 151
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 130
+      "__id__": 155
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2988,11 +3190,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 125
+      "__id__": 150
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 133
+      "__id__": 158
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3016,11 +3218,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 125
+      "__id__": 150
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 135
+      "__id__": 160
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3061,15 +3263,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 125
+      "__id__": 150
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 137
+      "__id__": 162
     },
     "clickEvents": [
       {
-        "__id__": 138
+        "__id__": 163
       }
     ],
     "_interactable": true,
@@ -3121,7 +3323,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 125
+      "__id__": 150
     },
     "_id": ""
   },
@@ -3162,23 +3364,23 @@
     },
     "_children": [
       {
-        "__id__": 141
+        "__id__": 166
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 147
+        "__id__": 172
       },
       {
-        "__id__": 149
+        "__id__": 174
       },
       {
-        "__id__": 151
+        "__id__": 176
       }
     ],
     "_prefab": {
-      "__id__": 154
+      "__id__": 179
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3215,20 +3417,20 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 140
+      "__id__": 165
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 142
+        "__id__": 167
       },
       {
-        "__id__": 144
+        "__id__": 169
       }
     ],
     "_prefab": {
-      "__id__": 146
+      "__id__": 171
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3265,11 +3467,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 141
+      "__id__": 166
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 143
+      "__id__": 168
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3293,11 +3495,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 141
+      "__id__": 166
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 145
+      "__id__": 170
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3351,11 +3553,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 140
+      "__id__": 165
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 148
+      "__id__": 173
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3379,11 +3581,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 140
+      "__id__": 165
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 150
+      "__id__": 175
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3424,15 +3626,15 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 140
+      "__id__": 165
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 152
+      "__id__": 177
     },
     "clickEvents": [
       {
-        "__id__": 153
+        "__id__": 178
       }
     ],
     "_interactable": true,
@@ -3484,7 +3686,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 140
+      "__id__": 165
     },
     "_id": ""
   },
@@ -3525,7 +3727,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 156
+      "__id__": 181
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3553,7 +3755,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 158
+      "__id__": 183
     },
     "_alignFlags": 45,
     "_target": null,
@@ -3589,13 +3791,13 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 160
+      "__id__": 185
     },
     "mask": false,
     "maskOpcity": 80,
     "isClickMaskeClose": false,
     "playerNameLabel": {
-      "__id__": 21
+      "__id__": 30
     },
     "_id": ""
   },
@@ -3615,8 +3817,14 @@
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
+      {
+        "__id__": 73
+      },
       {
         "__id__": 48
+      },
+      {
+        "__id__": 11
       }
     ]
   }
diff --git a/JisolGameCocos/assets/resources/prefab/ui/主页/野怪.meta b/JisolGameCocos/assets/resources/prefab/ui/主页/野怪.meta
new file mode 100644
index 00000000..518bba68
--- /dev/null
+++ b/JisolGameCocos/assets/resources/prefab/ui/主页/野怪.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "9dfe6258-273d-4107-ac09-d279fb04f952",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/JisolGameCocos/assets/resources/prefab/ui/主页/野怪/野怪列表.prefab b/JisolGameCocos/assets/resources/prefab/ui/主页/野怪/野怪列表.prefab
new file mode 100644
index 00000000..c21e2f3d
--- /dev/null
+++ b/JisolGameCocos/assets/resources/prefab/ui/主页/野怪/野怪列表.prefab
@@ -0,0 +1,1634 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "野怪列表",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "野怪列表",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 21
+      },
+      {
+        "__id__": 49
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 67
+      },
+      {
+        "__id__": 69
+      },
+      {
+        "__id__": 71
+      },
+      {
+        "__id__": 73
+      }
+    ],
+    "_prefab": {
+      "__id__": 75
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -0.5,
+      "y": 223.109,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "捕捉",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 11
+      },
+      {
+        "__id__": 13
+      },
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 18
+      }
+    ],
+    "_prefab": {
+      "__id__": 20
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -299.5,
+      "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
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Label",
+    "_objFlags": 512,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 4
+      },
+      {
+        "__id__": 6
+      },
+      {
+        "__id__": 8
+      }
+    ],
+    "_prefab": {
+      "__id__": 10
+    },
+    "_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
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 5
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 40
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a1mvp9/o9NjIW1zI1XSnaE"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 7
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_string": "捕 捉",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 30,
+    "_fontSize": 30,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 1,
+    "_enableWrapText": false,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "eaKrlqTo5KhoaqCB9+3f1a"
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 9
+    },
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_width": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "3fUqLTaV1N0J8yJd5k+NJn"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "25BUTF0LJD0Yl3hsJX7L5R",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 12
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 120,
+      "height": 120
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "c0h8KrYclATJ+XYcOdUwG6"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 14
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 150,
+      "g": 150,
+      "b": 150,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 1,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "560XWAYXxD25jo21OcRK2W"
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 16
+    },
+    "clickEvents": [
+      {
+        "__id__": 17
+      }
+    ],
+    "_interactable": true,
+    "_transition": 3,
+    "_normalColor": {
+      "__type__": "cc.Color",
+      "r": 214,
+      "g": 214,
+      "b": 214,
+      "a": 255
+    },
+    "_hoverColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_pressedColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_normalSprite": null,
+    "_hoverSprite": null,
+    "_pressedSprite": null,
+    "_disabledSprite": null,
+    "_duration": 0.1,
+    "_zoomScale": 1.2,
+    "_target": {
+      "__id__": 2
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "e0rgkHWjVLarcO0HgPDqbq"
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "fe2adMH7MZF5KXgR4KwvwJX",
+    "handler": "onClickCatch",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 19
+    },
+    "_alignFlags": 13,
+    "_target": null,
+    "_left": 0,
+    "_right": 464.25,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 100,
+    "_originalHeight": 100,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "41IKA5M65IWJvyXgOyZQ+Y"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "4chdzdAAZG2ZnA2dvWbz+Q",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "ScrollView",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 22
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 40
+      },
+      {
+        "__id__": 42
+      },
+      {
+        "__id__": 44
+      },
+      {
+        "__id__": 46
+      }
+    ],
+    "_prefab": {
+      "__id__": 48
+    },
+    "_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
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "view",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 21
+    },
+    "_children": [
+      {
+        "__id__": 23
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 31
+      },
+      {
+        "__id__": 33
+      },
+      {
+        "__id__": 35
+      },
+      {
+        "__id__": 37
+      }
+    ],
+    "_prefab": {
+      "__id__": 39
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -239.5,
+      "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
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "content",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 22
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 24
+      },
+      {
+        "__id__": 26
+      },
+      {
+        "__id__": 28
+      }
+    ],
+    "_prefab": {
+      "__id__": 30
+    },
+    "_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
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 23
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 25
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 10,
+      "height": 120
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "96XBXy5mxD7oh85thNj3N4"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 23
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 27
+    },
+    "_alignFlags": 5,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 400,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "8aVf/2yiBF46YBKe/tTx96"
+  },
+  {
+    "__type__": "cc.Layout",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 23
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 29
+    },
+    "_resizeMode": 1,
+    "_layoutType": 1,
+    "_cellSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_startAxis": 0,
+    "_paddingLeft": 10,
+    "_paddingRight": 10,
+    "_paddingTop": 0,
+    "_paddingBottom": 0,
+    "_spacingX": 10,
+    "_spacingY": 0,
+    "_verticalDirection": 1,
+    "_horizontalDirection": 0,
+    "_constraint": 0,
+    "_constraintNum": 2,
+    "_affectedByScale": false,
+    "_isAlign": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "df1bSi7VlGP5Up+DBnpR0b"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "9e+sJ0B/JJxIiEsfdzffk0",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 22
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 32
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 479,
+      "height": 120
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "8aRE0q34tED5M48dqLGa9P"
+  },
+  {
+    "__type__": "cc.Mask",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 22
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 34
+    },
+    "_type": 0,
+    "_inverted": false,
+    "_segments": 64,
+    "_alphaThreshold": 0.1,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "c5LHIjTTVC9ZSySWwdEsC3"
+  },
+  {
+    "__type__": "cc.Graphics",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 22
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 36
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_lineWidth": 1,
+    "_strokeColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_lineJoin": 2,
+    "_lineCap": 0,
+    "_fillColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 0
+    },
+    "_miterLimit": 10,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "fbx6z4iylPL4XGhLi3UaJW"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 22
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 38
+    },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 240,
+    "_originalHeight": 250,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "7f9gjytPtPrKT6p6boYSS1"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "69mnnKIwlAhZMU3bytgVs0",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 21
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 41
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 479,
+      "height": 120
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "eeHVlqM0NN2bU8pdiFGOQ4"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 21
+    },
+    "_enabled": false,
+    "__prefab": {
+      "__id__": 43
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 1,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "f45lDKRONBnIgTX1XKFzZK"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 21
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 45
+    },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 120,
+    "_right": 120,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 240,
+    "_originalHeight": 250,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "fc3W4BGP9PWJPeY5Z5b2I0"
+  },
+  {
+    "__type__": "563f2c1JcVKmrpHhC0vl3PI",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 21
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 47
+    },
+    "bounceDuration": 0.3,
+    "brake": 0.75,
+    "elastic": true,
+    "inertia": true,
+    "horizontal": true,
+    "vertical": false,
+    "cancelInnerEvents": true,
+    "scrollEvents": [],
+    "_content": {
+      "__id__": 23
+    },
+    "_horizontalScrollBar": null,
+    "_verticalScrollBar": null,
+    "itemPrefab": {
+      "__uuid__": "29473705-12eb-4ba9-83f1-a4b75ad3a30f",
+      "__expectedType__": "cc.Prefab"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "1bM/FEGdVHV6tknHqXFTMh"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "d5DzUHKbFAZoKbwNB17f0W",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "出售",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 50
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 58
+      },
+      {
+        "__id__": 60
+      },
+      {
+        "__id__": 62
+      },
+      {
+        "__id__": 64
+      }
+    ],
+    "_prefab": {
+      "__id__": 66
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 299.5,
+      "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
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Label",
+    "_objFlags": 512,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 49
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 51
+      },
+      {
+        "__id__": 53
+      },
+      {
+        "__id__": 55
+      }
+    ],
+    "_prefab": {
+      "__id__": 57
+    },
+    "_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
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 50
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 52
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 40
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "benjJotd5PrJ/R+sdlfwFK"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 50
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 54
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_string": "出 售",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 30,
+    "_fontSize": 30,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 1,
+    "_enableWrapText": false,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "09FEUUrlhDtJr7Z/U7NnMM"
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 50
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 56
+    },
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_width": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "90wfJdfRpLqo4Ohp9vy0qu"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "c6FJ5KuKxMCbTGPUYxAfNQ",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 49
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 59
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 120,
+      "height": 120
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "5fGEHL5MZHmJwAxaGZptgb"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 49
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 61
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 150,
+      "g": 150,
+      "b": 150,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 1,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "0d2U2Q79ZJrqXgt4dLuV4Z"
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 49
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 63
+    },
+    "clickEvents": [],
+    "_interactable": true,
+    "_transition": 3,
+    "_normalColor": {
+      "__type__": "cc.Color",
+      "r": 214,
+      "g": 214,
+      "b": 214,
+      "a": 255
+    },
+    "_hoverColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_pressedColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_normalSprite": null,
+    "_hoverSprite": null,
+    "_pressedSprite": null,
+    "_disabledSprite": null,
+    "_duration": 0.1,
+    "_zoomScale": 1.2,
+    "_target": {
+      "__id__": 49
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "46kCHG8yRJL65tBER5eoyC"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 49
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 65
+    },
+    "_alignFlags": 37,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 100,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "19Qrf2OPRFhZegHgMxp55W"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "510efzkfVOYJnng80lj0PW",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 68
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 719,
+      "height": 120
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "0ccMb6aEJJmKtQPc0NQqC7"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 70
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 190,
+      "g": 190,
+      "b": 190,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "19pPQvdvdMCJ7w/Z+yYIek"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 72
+    },
+    "_alignFlags": 40,
+    "_target": null,
+    "_left": 0,
+    "_right": 1,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 100,
+    "_originalHeight": 0,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "41TovpTmVCz4oCICCj50W/"
+  },
+  {
+    "__type__": "fe2adMH7MZF5KXgR4KwvwJX",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 74
+    },
+    "views": {
+      "__id__": 46
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "4aMPRpmwJL5Z/rayvvzZht"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "cfqtEvOKpHO7NzoHh8DAIM",
+    "instance": null,
+    "targetOverrides": null
+  }
+]
\ No newline at end of file
diff --git a/JisolGameCocos/assets/resources/prefab/ui/主页/野怪/野怪列表.prefab.meta b/JisolGameCocos/assets/resources/prefab/ui/主页/野怪/野怪列表.prefab.meta
new file mode 100644
index 00000000..f4257f11
--- /dev/null
+++ b/JisolGameCocos/assets/resources/prefab/ui/主页/野怪/野怪列表.prefab.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.49",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "a9053170-1055-4272-b3fd-ad6fa75b5f25",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "野怪列表"
+  }
+}
diff --git a/JisolGameCocos/assets/resources/prefab/ui/主页/野怪/野怪列表ICON.prefab b/JisolGameCocos/assets/resources/prefab/ui/主页/野怪/野怪列表ICON.prefab
new file mode 100644
index 00000000..92b95baa
--- /dev/null
+++ b/JisolGameCocos/assets/resources/prefab/ui/主页/野怪/野怪列表ICON.prefab
@@ -0,0 +1,296 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "野怪列表ICON",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "野怪列表ICON",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 13
+      },
+      {
+        "__id__": 15
+      }
+    ],
+    "_prefab": {
+      "__id__": 17
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -217,
+      "y": -50,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_prefab": {
+      "__id__": 3
+    },
+    "__editorExtras__": {}
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 2
+    },
+    "asset": {
+      "__uuid__": "e59969f5-99a0-4259-ba3e-71093a65cfd8",
+      "__expectedType__": "cc.Prefab"
+    },
+    "fileId": "02c3tqHwFAbp7zhkA22zq9",
+    "instance": {
+      "__id__": 4
+    },
+    "targetOverrides": [
+      {
+        "__id__": 10
+      }
+    ]
+  },
+  {
+    "__type__": "cc.PrefabInstance",
+    "fileId": "92tNwwtwJEj5SOclnRjbw5",
+    "prefabRootNode": {
+      "__id__": 1
+    },
+    "mountedChildren": [],
+    "mountedComponents": [],
+    "propertyOverrides": [
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 9
+      }
+    ],
+    "removedComponents": []
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
+    },
+    "propertyPath": [
+      "_name"
+    ],
+    "value": "选择宠物ICON"
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "02c3tqHwFAbp7zhkA22zq9"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
+    },
+    "propertyPath": [
+      "_lrot"
+    ],
+    "value": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
+    },
+    "propertyPath": [
+      "_euler"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "cc.TargetOverrideInfo",
+    "source": null,
+    "sourceInfo": null,
+    "propertyPath": [
+      "petIcon"
+    ],
+    "target": {
+      "__id__": 11
+    },
+    "targetInfo": {
+      "__id__": 12
+    }
+  },
+  {
+    "__type__": "cc.Node",
+    "__editorExtras__": {}
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "a8v6Wyt6FBsbms2ouS3gEa"
+    ]
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 14
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "60HDOce21EU4mT/teH3tKt"
+  },
+  {
+    "__type__": "590f9LG0/NBQ53k5HoSVyV6",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 16
+    },
+    "icon": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a9goNZgrtIaozwZgOyRy/0"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "02c3tqHwFAbp7zhkA22zq9",
+    "instance": null,
+    "targetOverrides": [
+      {
+        "__id__": 18
+      }
+    ],
+    "nestedPrefabInstanceRoots": [
+      {
+        "__id__": 2
+      }
+    ]
+  },
+  {
+    "__type__": "cc.TargetOverrideInfo",
+    "source": {
+      "__id__": 15
+    },
+    "sourceInfo": null,
+    "propertyPath": [
+      "icon"
+    ],
+    "target": {
+      "__id__": 2
+    },
+    "targetInfo": {
+      "__id__": 19
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "d4qo68UJJHyonQhZ4UFX08"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/JisolGameCocos/assets/resources/prefab/ui/主页/野怪/野怪列表ICON.prefab.meta b/JisolGameCocos/assets/resources/prefab/ui/主页/野怪/野怪列表ICON.prefab.meta
new file mode 100644
index 00000000..c62f5ae4
--- /dev/null
+++ b/JisolGameCocos/assets/resources/prefab/ui/主页/野怪/野怪列表ICON.prefab.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.49",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "29473705-12eb-4ba9-83f1-a4b75ad3a30f",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "野怪列表ICON"
+  }
+}
diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/宠物ICON.prefab b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/宠物ICON.prefab
new file mode 100644
index 00000000..94bef3a2
--- /dev/null
+++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/宠物ICON.prefab
@@ -0,0 +1,474 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "宠物ICON",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "宠物ICON",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 8
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 16
+      },
+      {
+        "__id__": 18
+      },
+      {
+        "__id__": 20
+      }
+    ],
+    "_prefab": {
+      "__id__": 22
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -217,
+      "y": -50,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "背景",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_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
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 4
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "5dXmPodeBIzK9ZudCJ0lyM"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 6
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "20sb9VIT5KFIQeKj9xXgfd"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "5fFj0bKJZKHaJ1M3mytw3C",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Spine",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 9
+      },
+      {
+        "__id__": 11
+      }
+    ],
+    "_prefab": {
+      "__id__": 13
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -34,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 0.8,
+      "y": 0.8,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 10
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "e4A0L+eItAaJtEFXgkYXR2"
+  },
+  {
+    "__type__": "sp.Skeleton",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 12
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_skeletonData": null,
+    "defaultSkin": "",
+    "defaultAnimation": "",
+    "_premultipliedAlpha": false,
+    "_timeScale": 1,
+    "_preCacheMode": -1,
+    "_cacheMode": 0,
+    "_defaultCacheMode": 0,
+    "_sockets": [],
+    "_useTint": false,
+    "_debugMesh": false,
+    "_debugBones": false,
+    "_debugSlots": false,
+    "_enableBatch": false,
+    "loop": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "4cHiUZWxdPRr49P1mMMVEz"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "50gNLxcs1J8ZGN6PlbNEU8",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 15
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "60HDOce21EU4mT/teH3tKt"
+  },
+  {
+    "__type__": "b3809FuWrhB2ovECDdqMTOs",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 17
+    },
+    "spine": {
+      "__id__": 11
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a8v6Wyt6FBsbms2ouS3gEa"
+  },
+  {
+    "__type__": "cc.Mask",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 19
+    },
+    "_type": 0,
+    "_inverted": false,
+    "_segments": 64,
+    "_alphaThreshold": 0.1,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "10zYj9H5FENZXD89pQVuyU"
+  },
+  {
+    "__type__": "cc.Graphics",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 21
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_lineWidth": 1,
+    "_strokeColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_lineJoin": 2,
+    "_lineCap": 0,
+    "_fillColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 0
+    },
+    "_miterLimit": 10,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "1broUYdiFORJt5rRvetp3L"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "02c3tqHwFAbp7zhkA22zq9",
+    "instance": null,
+    "targetOverrides": null
+  }
+]
\ No newline at end of file
diff --git a/JisolGameCocos/assets/resources/prefab/ui/阵法/宠物ICON.prefab.meta b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/宠物ICON.prefab.meta
similarity index 77%
rename from JisolGameCocos/assets/resources/prefab/ui/阵法/宠物ICON.prefab.meta
rename to JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/宠物ICON.prefab.meta
index 6e9f3559..80ca41e2 100644
--- a/JisolGameCocos/assets/resources/prefab/ui/阵法/宠物ICON.prefab.meta
+++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/宠物ICON.prefab.meta
@@ -2,7 +2,7 @@
   "ver": "1.1.49",
   "importer": "prefab",
   "imported": true,
-  "uuid": "e59969f5-99a0-4259-ba3e-71093a65cfd8",
+  "uuid": "ef1f320e-328a-41c9-bfdc-ad17d402e14f",
   "files": [
     ".json"
   ],
diff --git a/JisolGameCocos/assets/resources/prefab/ui/阵法/宠物ICON.prefab b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/选择宠物ICON.prefab
similarity index 64%
rename from JisolGameCocos/assets/resources/prefab/ui/阵法/宠物ICON.prefab
rename to JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/选择宠物ICON.prefab
index 4e356626..2e3b70d6 100644
--- a/JisolGameCocos/assets/resources/prefab/ui/阵法/宠物ICON.prefab
+++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/选择宠物ICON.prefab
@@ -1,7 +1,7 @@
 [
   {
     "__type__": "cc.Prefab",
-    "_name": "宠物ICON",
+    "_name": "选择宠物ICON",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_native": "",
@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "宠物ICON",
+    "_name": "选择宠物ICON",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": null,
@@ -26,22 +26,19 @@
       },
       {
         "__id__": 14
-      },
-      {
-        "__id__": 20
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 26
+        "__id__": 22
       },
       {
-        "__id__": 28
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 26
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -346,273 +343,115 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "背景",
     "_objFlags": 0,
-    "__editorExtras__": {},
     "_parent": {
       "__id__": 1
     },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 15
-      },
-      {
-        "__id__": 17
-      }
-    ],
     "_prefab": {
-      "__id__": 19
+      "__id__": 15
     },
-    "_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
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
+    "__editorExtras__": {}
   },
   {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
+    "__type__": "cc.PrefabInfo",
+    "root": {
       "__id__": 14
     },
-    "_enabled": true,
-    "__prefab": {
+    "asset": {
+      "__uuid__": "ef1f320e-328a-41c9-bfdc-ad17d402e14f",
+      "__expectedType__": "cc.Prefab"
+    },
+    "fileId": "02c3tqHwFAbp7zhkA22zq9",
+    "instance": {
       "__id__": 16
     },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
+    "targetOverrides": null
   },
   {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "5dXmPodeBIzK9ZudCJ0lyM"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 14
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 18
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "20sb9VIT5KFIQeKj9xXgfd"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
+    "__type__": "cc.PrefabInstance",
+    "fileId": "eaan0oyQBEKJFVRxGbOCuw",
+    "prefabRootNode": {
       "__id__": 1
     },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "5fFj0bKJZKHaJ1M3mytw3C",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "Spine",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
+    "mountedChildren": [],
+    "mountedComponents": [],
+    "propertyOverrides": [
       {
-        "__id__": 21
+        "__id__": 17
       },
       {
-        "__id__": 23
+        "__id__": 19
+      },
+      {
+        "__id__": 20
+      },
+      {
+        "__id__": 21
       }
     ],
-    "_prefab": {
-      "__id__": 25
+    "removedComponents": []
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 18
     },
-    "_lpos": {
+    "propertyPath": [
+      "_name"
+    ],
+    "value": "宠物ICON"
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "02c3tqHwFAbp7zhkA22zq9"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 18
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -34,
+      "y": 0,
       "z": 0
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 18
     },
-    "_lrot": {
+    "propertyPath": [
+      "_lrot"
+    ],
+    "value": {
       "__type__": "cc.Quat",
       "x": 0,
       "y": 0,
       "z": 0,
       "w": 1
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 18
     },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 0.8,
-      "y": 0.8,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
+    "propertyPath": [
+      "_euler"
+    ],
+    "value": {
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
       "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 20
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 22
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "e4A0L+eItAaJtEFXgkYXR2"
-  },
-  {
-    "__type__": "sp.Skeleton",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 20
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 24
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_skeletonData": null,
-    "defaultSkin": "",
-    "defaultAnimation": "",
-    "_premultipliedAlpha": false,
-    "_timeScale": 1,
-    "_preCacheMode": -1,
-    "_cacheMode": 0,
-    "_defaultCacheMode": 0,
-    "_sockets": [],
-    "_useTint": false,
-    "_debugMesh": false,
-    "_debugBones": false,
-    "_debugSlots": false,
-    "_enableBatch": false,
-    "loop": true,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "4cHiUZWxdPRr49P1mMMVEz"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "50gNLxcs1J8ZGN6PlbNEU8",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
+    }
   },
   {
     "__type__": "cc.UITransform",
@@ -624,7 +463,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 27
+      "__id__": 23
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -652,11 +491,9 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
-    },
-    "spine": {
-      "__id__": 23
+      "__id__": 25
     },
+    "petIcon": null,
     "select": {
       "__id__": 8
     },
@@ -679,6 +516,37 @@
     },
     "fileId": "02c3tqHwFAbp7zhkA22zq9",
     "instance": null,
-    "targetOverrides": null
+    "targetOverrides": [
+      {
+        "__id__": 27
+      }
+    ],
+    "nestedPrefabInstanceRoots": [
+      {
+        "__id__": 14
+      }
+    ]
+  },
+  {
+    "__type__": "cc.TargetOverrideInfo",
+    "source": {
+      "__id__": 24
+    },
+    "sourceInfo": null,
+    "propertyPath": [
+      "petIcon"
+    ],
+    "target": {
+      "__id__": 14
+    },
+    "targetInfo": {
+      "__id__": 28
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "a8v6Wyt6FBsbms2ouS3gEa"
+    ]
   }
 ]
\ No newline at end of file
diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/选择宠物ICON.prefab.meta b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/选择宠物ICON.prefab.meta
new file mode 100644
index 00000000..94b80e95
--- /dev/null
+++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/选择宠物ICON.prefab.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.49",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "e59969f5-99a0-4259-ba3e-71093a65cfd8",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "选择宠物ICON"
+  }
+}
diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏.meta b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏.meta
new file mode 100644
index 00000000..69ad231a
--- /dev/null
+++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "decf04e2-b691-4a4e-8f3c-a3a25c5b0760",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/受击文本.prefab b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/受击文本.prefab
new file mode 100644
index 00000000..e0d064f4
--- /dev/null
+++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/受击文本.prefab
@@ -0,0 +1,200 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "受击文本",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "受击文本",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 4
+      },
+      {
+        "__id__": 6
+      },
+      {
+        "__id__": 8
+      }
+    ],
+    "_prefab": {
+      "__id__": 10
+    },
+    "_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
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 3
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 51.98828125,
+      "height": 54.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b186ppLiZKhpRV4S4YdSvq"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 5
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_string": "Hit",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 36,
+    "_fontSize": 36,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "202sLGd8RLPYo4PayL2Ddw"
+  },
+  {
+    "__type__": "fad17KCTqZBj4nGCb/xtHxi",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 7
+    },
+    "hitLabel": {
+      "__id__": 4
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "ea6CTSqbJCFosx/ZPeThgW"
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 9
+    },
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 214,
+      "g": 49,
+      "b": 49,
+      "a": 255
+    },
+    "_width": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "efrxiMS+dIzZoddk4GEHvU"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "10gWQ16mdFu5gvlYBIDeBU",
+    "instance": null,
+    "targetOverrides": null
+  }
+]
\ No newline at end of file
diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/受击文本.prefab.meta b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/受击文本.prefab.meta
new file mode 100644
index 00000000..0b713423
--- /dev/null
+++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/受击文本.prefab.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.49",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "de8f19b4-20e0-4020-ac9c-8c52f9ffffa2",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "受击文本"
+  }
+}
diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/游戏模式渲染.prefab b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/游戏模式渲染.prefab
new file mode 100644
index 00000000..c4066cae
--- /dev/null
+++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/游戏模式渲染.prefab
@@ -0,0 +1,172 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "游戏模式渲染",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "游戏模式渲染",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 4
+      },
+      {
+        "__id__": 6
+      }
+    ],
+    "_prefab": {
+      "__id__": 8
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -360,
+      "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
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 3
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 720,
+      "height": 1280
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "61k/3xmdtHe6Srw0droR6G"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 5
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "a0d1e275-5512-493e-8e15-7d2db8beb48e@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "eb9IOPTBFJjLwXgqVCKLbC"
+  },
+  {
+    "__type__": "00e93M1gwFDX4OxuD8p5I6L",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 7
+    },
+    "hitPrefab": {
+      "__uuid__": "de8f19b4-20e0-4020-ac9c-8c52f9ffffa2",
+      "__expectedType__": "cc.Prefab"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a1GrhIZWJFDo/VFCx6xwRM"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "64PJYFWgBDZrEsaiYwZxmh",
+    "instance": null,
+    "targetOverrides": null
+  }
+]
\ No newline at end of file
diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/游戏模式渲染.prefab.meta b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/游戏模式渲染.prefab.meta
new file mode 100644
index 00000000..5006eb99
--- /dev/null
+++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/游戏模式渲染.prefab.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.49",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "1ee4a519-c5ef-453c-98d6-9940781b6fcc",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "游戏模式渲染"
+  }
+}
diff --git a/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法宠物ICON.prefab b/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法宠物ICON.prefab
new file mode 100644
index 00000000..7fc8c6b9
--- /dev/null
+++ b/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法宠物ICON.prefab
@@ -0,0 +1,296 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "阵法宠物ICON",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "阵法宠物ICON",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 13
+      },
+      {
+        "__id__": 15
+      }
+    ],
+    "_prefab": {
+      "__id__": 17
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -217,
+      "y": -50,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_prefab": {
+      "__id__": 3
+    },
+    "__editorExtras__": {}
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 2
+    },
+    "asset": {
+      "__uuid__": "e59969f5-99a0-4259-ba3e-71093a65cfd8",
+      "__expectedType__": "cc.Prefab"
+    },
+    "fileId": "02c3tqHwFAbp7zhkA22zq9",
+    "instance": {
+      "__id__": 4
+    },
+    "targetOverrides": [
+      {
+        "__id__": 10
+      }
+    ]
+  },
+  {
+    "__type__": "cc.PrefabInstance",
+    "fileId": "38bYsBY+lB0IKazeP060us",
+    "prefabRootNode": {
+      "__id__": 1
+    },
+    "mountedChildren": [],
+    "mountedComponents": [],
+    "propertyOverrides": [
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 9
+      }
+    ],
+    "removedComponents": []
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
+    },
+    "propertyPath": [
+      "_name"
+    ],
+    "value": "选择宠物ICON"
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "02c3tqHwFAbp7zhkA22zq9"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
+    },
+    "propertyPath": [
+      "_lrot"
+    ],
+    "value": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
+    },
+    "propertyPath": [
+      "_euler"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "cc.TargetOverrideInfo",
+    "source": null,
+    "sourceInfo": null,
+    "propertyPath": [
+      "petIcon"
+    ],
+    "target": {
+      "__id__": 11
+    },
+    "targetInfo": {
+      "__id__": 12
+    }
+  },
+  {
+    "__type__": "cc.Node",
+    "__editorExtras__": {}
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "a8v6Wyt6FBsbms2ouS3gEa"
+    ]
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 14
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "60HDOce21EU4mT/teH3tKt"
+  },
+  {
+    "__type__": "0d7f0xLgLJJ+7qr9McTG53a",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 16
+    },
+    "select": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "6etm75eOVF37vJbMmq4O6z"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "02c3tqHwFAbp7zhkA22zq9",
+    "instance": null,
+    "targetOverrides": [
+      {
+        "__id__": 18
+      }
+    ],
+    "nestedPrefabInstanceRoots": [
+      {
+        "__id__": 2
+      }
+    ]
+  },
+  {
+    "__type__": "cc.TargetOverrideInfo",
+    "source": {
+      "__id__": 15
+    },
+    "sourceInfo": null,
+    "propertyPath": [
+      "select"
+    ],
+    "target": {
+      "__id__": 2
+    },
+    "targetInfo": {
+      "__id__": 19
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "d4qo68UJJHyonQhZ4UFX08"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法宠物ICON.prefab.meta b/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法宠物ICON.prefab.meta
new file mode 100644
index 00000000..a29a4b9b
--- /dev/null
+++ b/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法宠物ICON.prefab.meta
@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.49",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "fc8eb7b6-f756-49f4-9102-ac3cca3a20ae",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "阵法宠物ICON"
+  }
+}
diff --git a/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法选择页面.prefab b/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法选择页面.prefab
index 85d2bd64..6ac0abe9 100644
--- a/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法选择页面.prefab
+++ b/JisolGameCocos/assets/resources/prefab/ui/阵法/阵法选择页面.prefab
@@ -957,7 +957,7 @@
       "__id__": 35
     },
     "itemPrefab": {
-      "__uuid__": "e59969f5-99a0-4259-ba3e-71093a65cfd8",
+      "__uuid__": "fc8eb7b6-f756-49f4-9102-ac3cca3a20ae",
       "__expectedType__": "cc.Prefab"
     },
     "_id": ""
@@ -2092,7 +2092,7 @@
       "__id__": 37
     },
     "petIconPrefab": {
-      "__uuid__": "e59969f5-99a0-4259-ba3e-71093a65cfd8",
+      "__uuid__": "fc8eb7b6-f756-49f4-9102-ac3cca3a20ae",
       "__expectedType__": "cc.Prefab"
     },
     "spine": {
diff --git a/JisolGameCocos/assets/script/App.ts b/JisolGameCocos/assets/script/App.ts
index 76eeac35..349d7649 100644
--- a/JisolGameCocos/assets/script/App.ts
+++ b/JisolGameCocos/assets/script/App.ts
@@ -25,10 +25,12 @@ import { StorageData, StorageEnum } from "./consts/GData";
 import { JAPI, JAPIConfig } from "../../extensions/ngame/assets/ngame/util/JAPI";
 import { AppData } from "./AppData";
 
-let APIPath = `http://localhost:8080`
-let WsPath = `ws://localhost:8080/websocket`
-// let APIPath = `https://api.pet.jisol.cn`
-// let WsPath = `wss://api.pet.jisol.cn/websocket`
+// let APIPath = `http://localhost:8080`
+// let WsPath = `ws://localhost:8080/websocket`
+// let APIPath = `http://192.168.0.123:8080`
+// let WsPath = `ws://192.168.0.123:8080/websocket`
+let APIPath = `https://api.pet.jisol.cn`
+let WsPath = `wss://api.pet.jisol.cn/websocket`
 
 //重写UI
 class JNGLayer extends JNLayer{
diff --git a/JisolGameCocos/assets/script/Main.ts b/JisolGameCocos/assets/script/Main.ts
index 93348395..af191765 100644
--- a/JisolGameCocos/assets/script/Main.ts
+++ b/JisolGameCocos/assets/script/Main.ts
@@ -2,6 +2,7 @@ import { _decorator, Component, director, instantiate, Node, Prefab } from 'cc';
 import { app } from './App';
 import { Env, JNGame } from '../../extensions/ngame/assets/ngame/JNGame';
 import { JNSyncAction } from '../../extensions/ngame/assets/ngame/sync/JNSyncAction';
+import { GOnHookPets } from '../../extensions/ngame/assets/ngame/message/proto';
 const { ccclass, property } = _decorator;
 
 @ccclass('Main')
diff --git a/JisolGameCocos/assets/script/WorldCanvas.ts b/JisolGameCocos/assets/script/WorldCanvas.ts
index 2acfb3c7..6e29bec0 100644
--- a/JisolGameCocos/assets/script/WorldCanvas.ts
+++ b/JisolGameCocos/assets/script/WorldCanvas.ts
@@ -1,6 +1,7 @@
 import { _decorator, Component, Node, Prefab } from 'cc';
 import { Camera } from 'cc';
 import GBattleModeManager from './battle/GBattleModeManager';
+import { GData } from './consts/GData';
 const { ccclass, property } = _decorator;
 
 @ccclass('WorldCanvas')
@@ -18,6 +19,8 @@ export class WorldCanvas extends Component {
 
     async onLoad(){
 
+        GData.WorldCanvas = this;
+
         //重置相机位置
         this.camera.node.setWorldPosition(0,0,1000);
 
diff --git a/JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts b/JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts
index a1db0d4d..4618cadc 100644
--- a/JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts
+++ b/JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts
@@ -58,7 +58,7 @@ export default abstract class GRoleBase<T> extends GObject<T>{
 
     //攻击回调
     attackCallbacks:Function[] = [];
-    //添加受击回调
+    //添加攻击回调
     addAttackCallback(fun:Function){this.attackCallbacks.push(fun)};
 
     get():this{
@@ -147,7 +147,7 @@ export default abstract class GRoleBase<T> extends GObject<T>{
     onHit(){
         // return;
         this.blood -= 10;
-        this.hitCallbacks.forEach(fun => fun());
+        this.hitCallbacks.forEach(fun => fun(this,10));
         //检测是否死亡
         if(this.blood <= 0){
             //关闭状态机
diff --git a/JisolGameCocos/assets/script/battle/base/role/expand/OnHook/GRoleOnHookCreepsExpand.ts b/JisolGameCocos/assets/script/battle/base/role/expand/OnHook/GRoleOnHookCreepsExpand.ts
new file mode 100644
index 00000000..87fcb1e3
--- /dev/null
+++ b/JisolGameCocos/assets/script/battle/base/role/expand/OnHook/GRoleOnHookCreepsExpand.ts
@@ -0,0 +1,18 @@
+import { _decorator } from "cc";
+import GRoleExpandBase from "../GRoleExpandBase";
+import { GOnHookPet } from "../../../../../../../extensions/ngame/assets/ngame/message/proto";
+const { ccclass, property } = _decorator;
+
+/**
+ * 无限模式 野怪 扩展类
+ */
+@ccclass('GRoleOnHookCreepsExpand')
+export default class GRoleOnHookCreepsExpand extends GRoleExpandBase<{}>{
+
+    //野怪
+    creeps:GOnHookPet;
+    
+}
+
+
+
diff --git a/JisolGameCocos/assets/script/battle/base/role/expand/OnHook/GRoleOnHookExpand.ts.meta b/JisolGameCocos/assets/script/battle/base/role/expand/OnHook/GRoleOnHookCreepsExpand.ts.meta
similarity index 70%
rename from JisolGameCocos/assets/script/battle/base/role/expand/OnHook/GRoleOnHookExpand.ts.meta
rename to JisolGameCocos/assets/script/battle/base/role/expand/OnHook/GRoleOnHookCreepsExpand.ts.meta
index 97f44ac1..ca9a2749 100644
--- a/JisolGameCocos/assets/script/battle/base/role/expand/OnHook/GRoleOnHookExpand.ts.meta
+++ b/JisolGameCocos/assets/script/battle/base/role/expand/OnHook/GRoleOnHookCreepsExpand.ts.meta
@@ -2,7 +2,7 @@
   "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
-  "uuid": "edf60f56-5d3e-48d1-90b4-6deef4b5635c",
+  "uuid": "3a21518a-766b-4f61-a59f-3e8825cf08f0",
   "files": [],
   "subMetas": {},
   "userData": {}
diff --git a/JisolGameCocos/assets/script/battle/base/role/expand/OnHook/GRoleOnHookExpand.ts b/JisolGameCocos/assets/script/battle/base/role/expand/OnHook/GRoleOnHookPlayerExpand.ts
similarity index 50%
rename from JisolGameCocos/assets/script/battle/base/role/expand/OnHook/GRoleOnHookExpand.ts
rename to JisolGameCocos/assets/script/battle/base/role/expand/OnHook/GRoleOnHookPlayerExpand.ts
index 399511c0..5fc5848a 100644
--- a/JisolGameCocos/assets/script/battle/base/role/expand/OnHook/GRoleOnHookExpand.ts
+++ b/JisolGameCocos/assets/script/battle/base/role/expand/OnHook/GRoleOnHookPlayerExpand.ts
@@ -1,13 +1,12 @@
 import { _decorator } from "cc";
-import GRoleDefault from "../../GRoleDefault";
 import GRoleExpandBase from "../GRoleExpandBase";
 const { ccclass, property } = _decorator;
 
 /**
- * 角色 无限模式 扩展类
+ * 无限模式 玩家 扩展类
  */
-@ccclass('GRoleDefault')
-export default class GRoleOnHookExpand extends GRoleExpandBase<{}>{
+@ccclass('GRoleOnHookPlayerExpand')
+export default class GRoleOnHookPlayerExpand extends GRoleExpandBase<{}>{
 
     //角色Id
     petId:number;
diff --git a/JisolGameCocos/assets/script/battle/base/role/expand/OnHook/GRoleOnHookPlayerExpand.ts.meta b/JisolGameCocos/assets/script/battle/base/role/expand/OnHook/GRoleOnHookPlayerExpand.ts.meta
new file mode 100644
index 00000000..e6411422
--- /dev/null
+++ b/JisolGameCocos/assets/script/battle/base/role/expand/OnHook/GRoleOnHookPlayerExpand.ts.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "3c2ff03b-a7e4-4afb-bb3c-ceacb17300ae",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/JisolGameCocos/assets/script/battle/modes/GOnHookMode.ts b/JisolGameCocos/assets/script/battle/modes/GOnHookMode.ts
index c82ab8c6..9b3bc7a6 100644
--- a/JisolGameCocos/assets/script/battle/modes/GOnHookMode.ts
+++ b/JisolGameCocos/assets/script/battle/modes/GOnHookMode.ts
@@ -17,11 +17,13 @@ import { v2 } from "cc";
 import GFSMOnHookMode from "./OnHook/GFSMOnHookMode";
 import { TB } from "../../../resources/config/data/schema";
 import PlayerTacticalData, { PlayerTacticalEvent } from "../../data/PlayerTacticalData";
-import GRoleOnHookExpand from "../base/role/expand/OnHook/GRoleOnHookExpand";
+import GRoleOnHookPlayerExpand from "../base/role/expand/OnHook/GRoleOnHookPlayerExpand";
 import PlayerPetData from "../../data/PlayerPetData";
 import { GUI } from "../../ui/UIConfig";
-import { GAction } from "../../consts/GAction";
-import { GActionType } from "../../consts/GActionType";
+import { GOnHookPet, GOnHookPets } from "../../../../extensions/ngame/assets/ngame/message/proto";
+import GOnHookManager from "../../manager/battle/mode/GOnHookManager";
+import GRoleOnHookCreepsExpand from "../base/role/expand/OnHook/GRoleOnHookCreepsExpand";
+import { ModeRenderEvent } from "../../ui/Consts/Game/ModeRender";
 const { ccclass, property } = _decorator;
 
 //挂机模式状态
@@ -45,18 +47,8 @@ export interface GOnHookInfo{
     roles: TB.TbGRole[];
 }
 
-//野怪
-interface GOnHookPet{
-    key:string;     //野怪唯一Id
-    petTbId:number; //野怪配置表Id
-}
-//野怪列表
-interface GOnHookPets{
-    pets:GOnHookPet[];
-}
-
 /**
- * 挂机模式 无限出现小怪 (不是联机模式 该模式支持使用本地数据)
+ * 挂机模式 无限出现小怪 (不是联机模式 该模式支持使用本地数据 和 API)
  */
 @ccclass('GOnHookMode')
 export default class GOnHookMode extends GBaseMode<{}>{
@@ -115,21 +107,6 @@ export default class GOnHookMode extends GBaseMode<{}>{
     //是否允许攻击
     isAllowAttack:boolean = false;
 
-    //野怪列表
-    _wildlifes:GOnHookPets;
-    get wildlifes(){
-        //如果没有野怪了 则 向服务器生成
-        if(!this._wildlifes || !(this._wildlifes.pets.length)){
-            //生成
-            this.onSpawnWildlife();
-            return null;
-        }
-        return this._wildlifes;
-    }
-    set wildlifes(data:GOnHookPets){
-        this._wildlifes = data;
-    }
-
     //添加监听事件
     addEvent(){
         app.event.on(PlayerTacticalEvent.UPDATE_TACTICAL,this.onUpdatePlayerPet,this);
@@ -185,18 +162,7 @@ export default class GOnHookMode extends GBaseMode<{}>{
         // this.onResetGenerateEnemy();
 
     }
-
-    //生成野怪
-    onSpawnWildlife(){
-        //获取服务器野怪
-        app.socket.SendBack(GAction.MODE_ON_HOOK_SPAWN_PET,{
-            type:GActionType.GOnHookPets,
-            fun:(info:GOnHookPets) => {
-                this.wildlifes = info;
-            }
-        })
-    }
-
+    
     //更新玩家宠物
     onUpdatePlayerPet(){
         //获取玩家阵容
@@ -205,7 +171,7 @@ export default class GOnHookMode extends GBaseMode<{}>{
         //移除不再阵容中的宠物
         let roles = [...this.getOnesRoleAlive(GOnHookModePlayerEnum.PLAYER)]
         roles.forEach(role => {
-            let expand = role.getComponent(GRoleOnHookExpand);
+            let expand = role.getComponent(GRoleOnHookPlayerExpand);
             //如果宠物不再阵容中 则 移除宠物
             if(infos.indexOf(expand.petId) < 0){
                 //移除宠物
@@ -267,7 +233,7 @@ export default class GOnHookMode extends GBaseMode<{}>{
         //如果场上有这个宠物则更新阵法位置
         let passRole:GRoleDefault;
         this.playerRoles.forEach(role => {
-            if(role.getComponent(GRoleOnHookExpand).petId == petId)
+            if(role.getComponent(GRoleOnHookPlayerExpand).petId == petId)
                 passRole = role;
         })
         if(passRole){
@@ -285,10 +251,21 @@ export default class GOnHookMode extends GBaseMode<{}>{
         }
         let role = this.onGenRole(GOnHookModePlayerEnum.PLAYER,index,TD.TbGRole.get(info.petTbId));
         //向宠物添加 OnHook 扩展
-        let expand = role.node.addComponent(GRoleOnHookExpand);
+        let expand = role.node.addComponent(GRoleOnHookPlayerExpand);
         expand.petId = petId;
     }
 
+    //生成野怪
+    onGenCreeps(index:number,creeps:GOnHookPet){
+
+        let role = this.onGenRole(GOnHookModePlayerEnum.ENEMY,index,TD.TbGRole.get(creeps.petTbId));
+
+        //向野怪添加扩展
+        let expand = role.node.addComponent(GRoleOnHookCreepsExpand);
+        expand.creeps = creeps;
+
+    }
+
     //生成宠物
     onGenRole(type: GOnHookModePlayerEnum,index:number,info:TB.TbGRole):GRoleDefault {
 
@@ -308,6 +285,8 @@ export default class GOnHookMode extends GBaseMode<{}>{
 
         //绑定死亡回调
         entity.addKillBackEvent(this.onRoleKillBack.bind(this))
+        //绑定受击回调
+        entity.addHitCallback(this.onHitBack.bind(this));
 
         this.addGObject(entity,tactical.getPosition(index));
 
@@ -364,11 +343,10 @@ export default class GOnHookMode extends GBaseMode<{}>{
     //生成敌人
     onResetGenerateEnemy(){
         this.enemyRoles = [];
-        if(!this.wildlifes) return;
-        
         //获取敌人
-        let wildlife = this.wildlifes.pets.shift();
-        this.onGenRole(GOnHookModePlayerEnum.ENEMY,2,GRoleUtil.getGRole(wildlife.petTbId));
+        let creeps = GOnHookManager.getIns().getNextCreeps();
+        if(!creeps) return; //没有获取到野怪则返回
+        this.onGenCreeps(2,creeps);
         // this.enemyInfo.roles.forEach((info,index) => this.onGenRole(GOnHookModePlayerEnum.ENEMY,index + 1,info));
     }
 
@@ -380,14 +358,22 @@ export default class GOnHookMode extends GBaseMode<{}>{
                 role.node.destroy()
         },3000)
 
+        //如果死亡的是野怪则通知野怪死亡
+        if(role.getComponent(GRoleOnHookCreepsExpand)){
+            GOnHookManager.getIns().onKillSreeps(role.getComponent(GRoleOnHookCreepsExpand).creeps);
+        }
+
         //清理
         this.onClearCache();
 
-        // //如果没有敌人则生成敌人
-        // if(this.getOnesRole(GOnHookModePlayerEnum.ENEMY).filter(role => !!role.get()).length <= 0){
-        //     //生成敌人
-        //     this.onResetGenerateEnemy();
-        // }
+    }
+
+    //角色受击回调
+    onHitBack(role:GRoleDefault,hit:number){
+
+        //添加受击显示
+        app.event.emit(ModeRenderEvent.HIT,role,hit);
+
     }
 
     //清理缓存
diff --git a/JisolGameCocos/assets/script/consts/API.ts b/JisolGameCocos/assets/script/consts/API.ts
index ed613405..a83f9174 100644
--- a/JisolGameCocos/assets/script/consts/API.ts
+++ b/JisolGameCocos/assets/script/consts/API.ts
@@ -1,7 +1,8 @@
 import { app } from "../App";
 import { GUI } from "../ui/UIConfig";
 
-const RData = (data:any,isTips:boolean = true) => {
+//接受到JSON消息
+export const RData = (data:any,isTips:boolean = true) => {
     if(data.data.state == 200){
         return data.data.data;
     }else{
@@ -12,6 +13,18 @@ const RData = (data:any,isTips:boolean = true) => {
         return data.data.data;
     }
 }
+//接受到Protobuf
+export const RProto = (data:any,type:string) => {
+
+    try{
+        return app.proto
+            .getType(type)
+            .decode(new Uint8Array(data.data)) as any;;
+    }catch{
+        app.layer.Open(GUI.Tips,{text:"Protobuf 解析失败"});
+    }
+
+}
 
 /************** 请求类 *******************/
 export interface NewsContext{
diff --git a/JisolGameCocos/assets/script/consts/GAPI.ts b/JisolGameCocos/assets/script/consts/GAPI.ts
new file mode 100644
index 00000000..b91257bb
--- /dev/null
+++ b/JisolGameCocos/assets/script/consts/GAPI.ts
@@ -0,0 +1,14 @@
+import { GOnHookPets } from "../../../extensions/ngame/assets/ngame/message/proto";
+import { app } from "../App";
+import { PlayerPetOV, RData, RProto } from "./API";
+import { GActionType } from "./GActionType";
+
+export const GAPI = {
+
+    /************** 无限模式接口 ********************/
+    //生成野怪
+    GOnHookSpawnCreeps : async () => RProto(await app.api.get(`/game/mode/onHook/onSpawnCreeps`,{responseType:'arraybuffer'}),GActionType.GOnHookPets) as GOnHookPets,
+    //捕捉野怪
+    GOnHookCatchCreeps : async (creepId) => RData(await app.api.post(`/game/mode/onHook/onCatchCreeps/${creepId}`)) as PlayerPetOV,
+
+}
\ No newline at end of file
diff --git a/JisolGameCocos/assets/script/consts/GAPI.ts.meta b/JisolGameCocos/assets/script/consts/GAPI.ts.meta
new file mode 100644
index 00000000..2a131c9d
--- /dev/null
+++ b/JisolGameCocos/assets/script/consts/GAPI.ts.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "4ecc480c-6d05-4b57-bc01-1605ae0c1512",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/JisolGameCocos/assets/script/consts/GAction.ts b/JisolGameCocos/assets/script/consts/GAction.ts
index 19e45c8d..dbbc103f 100644
--- a/JisolGameCocos/assets/script/consts/GAction.ts
+++ b/JisolGameCocos/assets/script/consts/GAction.ts
@@ -8,9 +8,5 @@ export enum GAction {
 
     
     /*************** 游戏模式 : 无尽模式(OnHook) **************/
-    MODE_ON_HOOK_SPAWN_PET = 3001, //生成宠物
-    MODE_ON_HOOK_CAPTURE_PET = 3002, //捕捉宠物
-    MODE_ON_HOOK_SELL_PET = 3003,   //卖出宠物
-
 
 }
\ No newline at end of file
diff --git a/JisolGameCocos/assets/script/consts/GData.ts b/JisolGameCocos/assets/script/consts/GData.ts
index 6173ea9d..9d170670 100644
--- a/JisolGameCocos/assets/script/consts/GData.ts
+++ b/JisolGameCocos/assets/script/consts/GData.ts
@@ -1,13 +1,14 @@
 import { sys } from "cc";
+import { WorldCanvas } from "../WorldCanvas";
 
+//UI 动画
 export enum UIPetAnim{
     std = "std",
 }
 
+//存储Key
 export enum StorageEnum{
-
     Token = "Storage_Token", // Token
-
 }
 
 export class StorageData {
@@ -26,10 +27,13 @@ export class StorageData {
 
 }
 
-export const GData = {
+export class GData {
     //层级
-    layer: {
+    static layer = {
         World: 1,
-    }
+    };
+
+    //世界画布节点
+    static WorldCanvas: WorldCanvas;
 }
 
diff --git a/JisolGameCocos/assets/script/data/PlayerPetData.ts b/JisolGameCocos/assets/script/data/PlayerPetData.ts
index 4f48d885..0712a805 100644
--- a/JisolGameCocos/assets/script/data/PlayerPetData.ts
+++ b/JisolGameCocos/assets/script/data/PlayerPetData.ts
@@ -38,6 +38,11 @@ export default class PlayerPetData extends BaseData{
         return this.datas.filter(item => item.petId == petId)[0]
     }
 
+    //添加宠物
+    addPet(pet:PlayerPetOV){
+        this.datas.push(pet);
+    }
+
 
 }
 
diff --git a/JisolGameCocos/assets/script/manager/battle.meta b/JisolGameCocos/assets/script/manager/battle.meta
new file mode 100644
index 00000000..1f61d008
--- /dev/null
+++ b/JisolGameCocos/assets/script/manager/battle.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "d92a44bc-1e3c-44d4-b3e5-a3b2f1324e98",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/JisolGameCocos/assets/script/manager/battle/mode.meta b/JisolGameCocos/assets/script/manager/battle/mode.meta
new file mode 100644
index 00000000..73083b9a
--- /dev/null
+++ b/JisolGameCocos/assets/script/manager/battle/mode.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "ec650551-a3f2-4b5c-a9bb-a4fd649dbdbd",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts b/JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts
new file mode 100644
index 00000000..5a6fd846
--- /dev/null
+++ b/JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts
@@ -0,0 +1,100 @@
+import { GOnHookPet } from "../../../../../extensions/ngame/assets/ngame/message/proto";
+import Singleton from "../../../../../extensions/ngame/assets/ngame/util/Singleton";
+import { app } from "../../../App";
+import { PlayerPetOV } from "../../../consts/API";
+import { GAPI } from "../../../consts/GAPI";
+import PlayerPetData from "../../../data/PlayerPetData";
+import { GUI } from "../../../ui/UIConfig";
+
+export enum GOnHookManagerEvent{
+    //添加死亡野怪
+    ADD_KILL_SREEP = "GOnHookManagerEvent_ADD_KILL_SREEP",
+    //删除死亡野怪
+    DEL_KILL_SREEP = "GOnHookManagerEvent_DEL_KILL_SREEP"
+}
+
+//游戏模式 OnHook 管理器
+export default class GOnHookManager extends Singleton{
+
+    //野怪列表
+    _sreeps:Map<string,GOnHookPet> = new Map();
+    get sreeps(){
+        //如果没有野怪了 则 向服务器生成
+        if(!this._sreeps || !(this._sreeps.size)){
+            //生成
+            this.onSpawnSreeps();
+            return null;
+        }
+        return this._sreeps;
+    }
+    set sreeps(data:Map<string,GOnHookPet>){
+        this._sreeps = data;
+    }
+
+    //已经死亡的野怪列表
+    killSreeps:GOnHookPet[] = [];
+
+
+    //生成野怪
+    onSpawnSreeps(){
+        GAPI.GOnHookSpawnCreeps().then(data => {
+            data.pets.forEach(pet => {
+                this._sreeps.set(pet.key,pet as GOnHookPet);
+            })
+        });
+    }
+
+    //获取下一只野怪
+    getNextCreeps(){
+        if(!this.sreeps) return;
+        let creeps = this.sreeps.get(this.sreeps.keys().next()?.value)
+        return creeps;
+    }
+
+    //野怪死亡
+    onKillSreeps(creeps:GOnHookPet){
+
+        this.sreeps.delete(creeps.key);
+        //记入死亡
+        //判断是否在死亡中如果在则跳出
+        if(this.killSreeps.indexOf(creeps) > -1){
+            return;
+        }        
+        this.killSreeps.push(creeps);
+
+        //通知添加死亡野怪
+        app.event.emit(GOnHookManagerEvent.ADD_KILL_SREEP,creeps);
+
+        console.log(`GOnHookManager : ${creeps.key} 宠物死亡 可进行捕捉 出售`);
+
+    }
+
+    //捕捉野怪
+    async onCatchCreeps(creeps:GOnHookPet):Promise<boolean>{
+        
+        let index;
+        if((index = this.killSreeps.indexOf(creeps)) < 0){
+            app.layer.Open(GUI.Tips,{text:"不可捕捉该宠物"});
+            return false;
+        }
+
+        //删除
+        this.killSreeps.splice(index,1);
+
+        //通知添加野怪被删除
+        app.event.emit(GOnHookManagerEvent.DEL_KILL_SREEP,creeps);
+
+        let pet:PlayerPetOV = await GAPI.GOnHookCatchCreeps(creeps.key);
+
+        //保存宠物
+        if(pet){
+            PlayerPetData.getIns().addPet(pet);
+        }
+
+        return !!pet;
+
+    }
+
+}
+
+
diff --git a/JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts.meta b/JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts.meta
new file mode 100644
index 00000000..3c1d345b
--- /dev/null
+++ b/JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "3e881d0a-dd68-4ca6-9043-73e2d45318bd",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/JisolGameCocos/assets/script/ui/Consts/Game.meta b/JisolGameCocos/assets/script/ui/Consts/Game.meta
new file mode 100644
index 00000000..5bc5237e
--- /dev/null
+++ b/JisolGameCocos/assets/script/ui/Consts/Game.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "a0bd4b57-3c54-4d36-a0b5-20728f53f17b",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/JisolGameCocos/assets/script/ui/Consts/Game/ModeRender.ts b/JisolGameCocos/assets/script/ui/Consts/Game/ModeRender.ts
new file mode 100644
index 00000000..bc7e5612
--- /dev/null
+++ b/JisolGameCocos/assets/script/ui/Consts/Game/ModeRender.ts
@@ -0,0 +1,54 @@
+import { _decorator, Component, Node } from 'cc';
+import { app } from '../../../App';
+import GRoleDefault from '../../../battle/base/role/GRoleDefault';
+import { GData } from '../../../consts/GData';
+import { v2 } from 'cc';
+import { Prefab } from 'cc';
+import { instantiate } from 'cc';
+import { v3 } from 'cc';
+import { ModeRenderHitText } from './ModeRenderHitText';
+const { ccclass, property } = _decorator;
+
+export enum ModeRenderEvent{
+    //受击
+    HIT = "ModeRenderEvent_HIT"
+}
+
+@ccclass('ModeRender')
+export class ModeRender extends Component {
+
+    //受击预制体
+    @property(Prefab)
+    hitPrefab:Prefab;
+
+    onLoad(){
+
+        app.event.on(ModeRenderEvent.HIT,this.onHit,this);
+
+    }
+
+    protected onDestroy(): void {
+
+        app.event.off(ModeRenderEvent.HIT,this.onHit,this);
+
+    }
+    
+    //受击
+    onHit(role:GRoleDefault,hit:number){
+
+        if(!role.get()) return;
+
+        let rolePos = GData.WorldCanvas.camera.worldToScreen(role.node.worldPosition);
+        
+        let hitNode = instantiate(this.hitPrefab);
+
+        this.node.addChild(hitNode);
+        hitNode.position = rolePos.add(v3(0,100,0));
+        
+        hitNode.getComponent(ModeRenderHitText).setText(hit);
+
+    }
+
+}
+
+
diff --git a/JisolGameCocos/assets/script/ui/Consts/Game/ModeRender.ts.meta b/JisolGameCocos/assets/script/ui/Consts/Game/ModeRender.ts.meta
new file mode 100644
index 00000000..016bfca0
--- /dev/null
+++ b/JisolGameCocos/assets/script/ui/Consts/Game/ModeRender.ts.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "00e93335-8301-435f-83b1-b83f29e48e8b",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/JisolGameCocos/assets/script/ui/Consts/Game/ModeRenderHitText.ts b/JisolGameCocos/assets/script/ui/Consts/Game/ModeRenderHitText.ts
new file mode 100644
index 00000000..4b0c0d52
--- /dev/null
+++ b/JisolGameCocos/assets/script/ui/Consts/Game/ModeRenderHitText.ts
@@ -0,0 +1,39 @@
+import { tween } from 'cc';
+import { v3 } from 'cc';
+import { Label } from 'cc';
+import { _decorator, Component, Node } from 'cc';
+const { ccclass, property } = _decorator;
+
+@ccclass('ModeRenderHitText')
+export class ModeRenderHitText extends Component {
+
+    @property(Label)
+    hitLabel:Label;
+
+    setText(hit:number){
+
+        this.hitLabel.string = `${hit}`;
+
+        this.setAnimation();
+
+    }
+
+    //设置动画
+    setAnimation(){
+
+        this.node.scale = v3(0,0,0);
+
+        tween(this.node)
+            .to(.5,{position:this.node.position.clone().add(v3(0,100,0)),scale:v3(1,1,1)},{
+                onComplete:() => {
+                    this.node.destroy();
+                },
+                easing:"quadInOut"
+            })
+            .start();
+
+    }
+
+}
+
+
diff --git a/JisolGameCocos/assets/script/ui/Consts/Game/ModeRenderHitText.ts.meta b/JisolGameCocos/assets/script/ui/Consts/Game/ModeRenderHitText.ts.meta
new file mode 100644
index 00000000..860235b2
--- /dev/null
+++ b/JisolGameCocos/assets/script/ui/Consts/Game/ModeRenderHitText.ts.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "fad17282-4ea6-418f-89c6-09bff1b47c62",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/JisolGameCocos/assets/script/ui/Consts/Pet/PetIcon.ts b/JisolGameCocos/assets/script/ui/Consts/Pet/PetIcon.ts
new file mode 100644
index 00000000..a866531d
--- /dev/null
+++ b/JisolGameCocos/assets/script/ui/Consts/Pet/PetIcon.ts
@@ -0,0 +1,24 @@
+import { sp } from 'cc';
+import { _decorator, Component, Node } from 'cc';
+import { app } from '../../../App';
+import { UIPetAnim } from '../../../consts/GData';
+import { v3 } from 'cc';
+const { ccclass, property } = _decorator;
+
+@ccclass('PetIcon')
+export class PetIcon extends Component {
+
+    @property(sp.Skeleton)
+    spine:sp.Skeleton;
+
+    //设置icon
+    setIcon(petTbId:number){
+
+        this.spine.skeletonData = app.battleRes.roleSpine[petTbId];
+        this.spine.setAnimation(0,UIPetAnim.std,true);
+        
+    }
+    
+}
+
+
diff --git a/JisolGameCocos/assets/script/ui/Consts/Pet/PetIcon.ts.meta b/JisolGameCocos/assets/script/ui/Consts/Pet/PetIcon.ts.meta
new file mode 100644
index 00000000..02ad85c9
--- /dev/null
+++ b/JisolGameCocos/assets/script/ui/Consts/Pet/PetIcon.ts.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "b380916e-5ab8-41da-8bc4-08376a3133ac",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/JisolGameCocos/assets/script/ui/Consts/Pet/PetIconSelect.ts b/JisolGameCocos/assets/script/ui/Consts/Pet/PetIconSelect.ts
new file mode 100644
index 00000000..2c561bcf
--- /dev/null
+++ b/JisolGameCocos/assets/script/ui/Consts/Pet/PetIconSelect.ts
@@ -0,0 +1,62 @@
+import { _decorator, Component, Node } from 'cc';
+import { PetIcon } from './PetIcon';
+const { ccclass, property } = _decorator;
+
+@ccclass('PetIconSelect')
+export class PetIconSelect extends Component {
+
+    @property(PetIcon)
+    petIcon:PetIcon;
+
+    //选中节点
+    @property(Node)
+    select:Node;
+
+    //不可选中节点
+    @property(Node)
+    noselect:Node;
+
+    //是否被选中
+    _isSelect:boolean = false;
+    get isSelect(){
+        return this._isSelect;
+    }
+    set isSelect(data:boolean){
+        this._isSelect = data;
+        this.onUpdateSelect();
+    }
+
+    //是否不可选中
+    _isNoSelect:boolean = false;
+    get isNoSelect(){
+        return this._isNoSelect;
+    }
+    set isNoSelect(data:boolean){
+        this._isNoSelect = data;
+        this.onUpdateSelect();
+    }
+
+    onLoad(){
+        this.onUpdateSelect();
+        this.noselect.active = false;
+        this.select.active = false;
+    }
+
+    
+    //设置icon
+    setIcon(petTbId:number){
+
+        this.petIcon.setIcon(petTbId);
+        
+    }
+
+    onUpdateSelect(){
+
+        this.select.active = this.isSelect;
+        this.noselect.active = this.isNoSelect;
+
+    }
+
+}
+
+
diff --git a/JisolGameCocos/assets/script/ui/Consts/Pet/PetIconSelect.ts.meta b/JisolGameCocos/assets/script/ui/Consts/Pet/PetIconSelect.ts.meta
new file mode 100644
index 00000000..d9708715
--- /dev/null
+++ b/JisolGameCocos/assets/script/ui/Consts/Pet/PetIconSelect.ts.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "7c6657dc-bcb4-460e-ace3-860bd4238a0d",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/JisolGameCocos/assets/script/ui/Home/MainView.ts b/JisolGameCocos/assets/script/ui/Home/MainView.ts
index 2e45535a..6ebd7dd6 100644
--- a/JisolGameCocos/assets/script/ui/Home/MainView.ts
+++ b/JisolGameCocos/assets/script/ui/Home/MainView.ts
@@ -24,6 +24,7 @@ export class MainView extends JNGLayerBase {
         });
 
         this.onUpdateView();
+        
     }
 
     //更新UI界面
diff --git a/JisolGameCocos/assets/script/ui/Home/Sreeps.meta b/JisolGameCocos/assets/script/ui/Home/Sreeps.meta
new file mode 100644
index 00000000..1c6f12ca
--- /dev/null
+++ b/JisolGameCocos/assets/script/ui/Home/Sreeps.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "45b68a51-740e-4ff5-91b1-ba79c76ede3d",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/JisolGameCocos/assets/script/ui/Home/Sreeps/MainSreepsIcon.ts b/JisolGameCocos/assets/script/ui/Home/Sreeps/MainSreepsIcon.ts
new file mode 100644
index 00000000..2992b6a4
--- /dev/null
+++ b/JisolGameCocos/assets/script/ui/Home/Sreeps/MainSreepsIcon.ts
@@ -0,0 +1,20 @@
+import { _decorator, Component, Node } from 'cc';
+import JNScrollViewItem from '../../../../../extensions/ngame/assets/ngame/util/components/scrollview/JNScrollViewItem';
+import { GOnHookPet } from '../../../../../extensions/ngame/assets/ngame/message/proto';
+import { PetIcon } from '../../Consts/Pet/PetIcon';
+import { PetIconSelect } from '../../Consts/Pet/PetIconSelect';
+const { ccclass, property } = _decorator;
+
+@ccclass('MainSreepsIcon')
+export class MainSreepsIcon extends JNScrollViewItem<GOnHookPet> {
+
+    @property(PetIconSelect)
+    icon:PetIconSelect;
+
+    start(){
+        this.icon.setIcon(this.data.petTbId);
+    }
+
+}
+
+
diff --git a/JisolGameCocos/assets/script/ui/Home/Sreeps/MainSreepsIcon.ts.meta b/JisolGameCocos/assets/script/ui/Home/Sreeps/MainSreepsIcon.ts.meta
new file mode 100644
index 00000000..c0f892a5
--- /dev/null
+++ b/JisolGameCocos/assets/script/ui/Home/Sreeps/MainSreepsIcon.ts.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "590f92c6-d3f3-4143-9de4-e47a1257257a",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/JisolGameCocos/assets/script/ui/Home/Sreeps/MainSreepsList.ts b/JisolGameCocos/assets/script/ui/Home/Sreeps/MainSreepsList.ts
new file mode 100644
index 00000000..d6463de5
--- /dev/null
+++ b/JisolGameCocos/assets/script/ui/Home/Sreeps/MainSreepsList.ts
@@ -0,0 +1,93 @@
+import { _decorator, Component, Node } from 'cc';
+import JNScrollView from '../../../../../extensions/ngame/assets/ngame/util/components/scrollview/JNScrollView';
+import { app } from '../../../App';
+import GOnHookManager, { GOnHookManagerEvent } from '../../../manager/battle/mode/GOnHookManager';
+import { GOnHookPet } from '../../../../../extensions/ngame/assets/ngame/message/proto';
+import { MainSreepsIcon } from './MainSreepsIcon';
+import { NodeEventType } from 'cc';
+import { GUI } from '../../UIConfig';
+const { ccclass, property } = _decorator;
+
+@ccclass('MainSreepsList')
+export class MainSreepsList extends Component {
+    
+    //野怪列表
+    @property(JNScrollView)
+    views:JNScrollView;
+
+    //默认选择
+    index:number = 0;
+
+    onLoad(){
+
+        //监听 野怪死亡
+        app.event.on(GOnHookManagerEvent.ADD_KILL_SREEP,this.onAddSreep,this);
+        //监听 野怪删除
+        app.event.on(GOnHookManagerEvent.DEL_KILL_SREEP,this.onDelSreep,this);
+
+        //添加子节点事件
+        this.views.addItemEvent(NodeEventType.TOUCH_END,this.onClickItem.bind(this));
+
+    }
+
+    protected onDestroy(): void {
+        
+        //取消监听
+        app.event.off(GOnHookManagerEvent.ADD_KILL_SREEP,this.onAddSreep,this);
+        app.event.on(GOnHookManagerEvent.DEL_KILL_SREEP,this.onDelSreep,this);
+    }
+    
+
+    //添加野怪
+    onAddSreep(sreep:GOnHookPet){
+        this.views.addData(sreep);
+    }
+
+    //删除野怪
+    onDelSreep(sreep:GOnHookPet){
+        this.views.delData(sreep);
+    }
+
+    //刷新
+    onUpdateView(){
+
+        let items = this.views.getItems<MainSreepsIcon>();
+
+        if(items.length <= 0) return;
+
+        //取消选中
+        items.forEach(item => item.icon.isSelect = false)
+
+        //选中index
+        if(items[this.index]) items[this.index].icon.isSelect = true;
+
+    }
+
+    //点击子节点
+    onClickItem(index:number){
+
+        this.index = index;
+        this.onUpdateView();
+
+    }
+
+    //捕捉野怪
+    async onClickCatch(){
+
+        //获取选中的野怪
+        let item = this.views.getItems<MainSreepsIcon>()[this.index];
+
+        if(!item){
+            app.layer.Open(GUI.Tips,{text:"请选择需要捕捉的宠物"});
+            return;
+        }
+
+        if(await GOnHookManager.getIns().onCatchCreeps(item.data))
+            app.layer.Open(GUI.Tips,{text:"捕捉成功!"});
+
+    }
+    
+
+}
+
+
diff --git a/JisolGameCocos/assets/script/ui/Home/Sreeps/MainSreepsList.ts.meta b/JisolGameCocos/assets/script/ui/Home/Sreeps/MainSreepsList.ts.meta
new file mode 100644
index 00000000..727f9d92
--- /dev/null
+++ b/JisolGameCocos/assets/script/ui/Home/Sreeps/MainSreepsList.ts.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "fe2ad307-ecc6-45e4-a5e0-4782b0bf0257",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/JisolGameCocos/assets/script/ui/Tactical/IntoBattlePetIcon.ts b/JisolGameCocos/assets/script/ui/Tactical/IntoBattlePetIcon.ts
index a2ec4698..d5eeb104 100644
--- a/JisolGameCocos/assets/script/ui/Tactical/IntoBattlePetIcon.ts
+++ b/JisolGameCocos/assets/script/ui/Tactical/IntoBattlePetIcon.ts
@@ -1,50 +1,17 @@
 import { _decorator, Component, Node } from 'cc';
-import JNScrollViewItem from '../../../../extensions/ngame/assets/ngame/util/components/scrollview/JNScrollViewItem';
 import { PlayerPetOV } from '../../consts/API';
-import { sp } from 'cc';
-import { app } from '../../App';
-import { UIPetAnim } from '../../consts/GData';
+import JNScrollViewItem from '../../../../extensions/ngame/assets/ngame/util/components/scrollview/JNScrollViewItem';
+import { PetIconSelect } from '../Consts/Pet/PetIconSelect';
 const { ccclass, property } = _decorator;
 
 @ccclass('IntoBattlePetIcon')
 export class IntoBattlePetIcon extends JNScrollViewItem<PlayerPetOV> {
 
-    @property(sp.Skeleton)
-    spine:sp.Skeleton;
-
-    //选中节点
-    @property(Node)
-    select:Node;
-
-    //不可选中节点
-    @property(Node)
-    noselect:Node;
-
-    //是否被选中
-    isSelect:boolean = false;
-
-    //是否不可选中
-    isNoSelect:boolean = false;
-
-    onLoad(){
-        this.onUpdateSelect();
-        this.noselect.active = false;
-        this.select.active = false;
-    }
-
-    start(): void {
-        
-        //显示角色
-        this.spine.skeletonData = app.battleRes.roleSpine[this.data.petTbId];
-        this.spine.setAnimation(0,UIPetAnim.std,true);
-
-    }
-
-    onUpdateSelect(){
-
-        this.select.active = this.isSelect;
-        this.noselect.active = this.isNoSelect;
+    @property(PetIconSelect)
+    select:PetIconSelect;
 
+    protected start(): void {
+        this.select.setIcon(this.data.petTbId);
     }
 
 }
diff --git a/JisolGameCocos/assets/script/ui/Tactical/IntoBattlePetIcon.ts.meta b/JisolGameCocos/assets/script/ui/Tactical/IntoBattlePetIcon.ts.meta
index d9708715..bcf8c92f 100644
--- a/JisolGameCocos/assets/script/ui/Tactical/IntoBattlePetIcon.ts.meta
+++ b/JisolGameCocos/assets/script/ui/Tactical/IntoBattlePetIcon.ts.meta
@@ -2,7 +2,7 @@
   "ver": "4.0.23",
   "importer": "typescript",
   "imported": true,
-  "uuid": "7c6657dc-bcb4-460e-ace3-860bd4238a0d",
+  "uuid": "0d7f0c4b-80b2-49fb-baab-f4c7131b9dda",
   "files": [],
   "subMetas": {},
   "userData": {}
diff --git a/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts b/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts
index 29df13ae..7d680c2e 100644
--- a/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts
+++ b/JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts
@@ -21,9 +21,6 @@ export class IntoBattleView extends JNLayerBase {
     @property(JNScrollView)
     views:JNScrollView; //宠物列表
 
-    @property(Prefab)
-    petIconPrefab; //宠物Icon预制体
-
     @property(sp.Skeleton)
     spine:sp.Skeleton; //当前选中的宠物
 
@@ -58,7 +55,7 @@ export class IntoBattleView extends JNLayerBase {
         //设置不可选中
         this.views.getItems<IntoBattlePetIcon>().forEach(item => {
             if(PlayerTacticalData.getIns().getTacticalInfo().indexOf(item.data.petId) != -1)
-                item.isNoSelect = true; //如果在阵法里则不可选中
+                item.select.isNoSelect = true; //如果在阵法里则不可选中
         })
 
         //向子节点添加点击事件
@@ -73,15 +70,13 @@ export class IntoBattleView extends JNLayerBase {
 
         //默认都不选中
         this.views.getItems<IntoBattlePetIcon>().forEach(item => {
-            item.isSelect = false;
-            item.onUpdateSelect();
+            item.select.isSelect = false;
         })
 
         //设置选中
         if(this.index != -1){
             let current = this.views.getItems<IntoBattlePetIcon>()[this.index]
-            current.isSelect = true;
-            current.onUpdateSelect();
+            current.select.isSelect = true;
 
             //显示选中宠物
             this.spine.skeletonData = app.battleRes.roleSpine[this.pets[this.index].petTbId];
@@ -94,7 +89,7 @@ export class IntoBattleView extends JNLayerBase {
     onClickItem(index:number){
 
         //判断是否不可选中
-        if(this.views.getItems<IntoBattlePetIcon>()[index].isNoSelect) {
+        if(this.views.getItems<IntoBattlePetIcon>()[index].select.isNoSelect) {
             app.layer.Open(GUI.Tips,{text:"当前宠物已上阵"})
             return;
         }
diff --git a/JisolGameCocos/extensions/ngame b/JisolGameCocos/extensions/ngame
index ea12e2c1..1943c699 160000
--- a/JisolGameCocos/extensions/ngame
+++ b/JisolGameCocos/extensions/ngame
@@ -1 +1 @@
-Subproject commit ea12e2c1097c07ed71baf59504455038e3b0b856
+Subproject commit 1943c6992fd3f7269e7a08b174cdf5e49028c074
diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/actions/GActionEnum.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/actions/GActionEnum.java
index e2a4fae2..24ce5fb4 100644
--- a/JisolGameServer/Main/src/main/java/cn/jisol/game/actions/GActionEnum.java
+++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/actions/GActionEnum.java
@@ -8,9 +8,4 @@ public interface GActionEnum {
     int CHAT_MESSAGE = 2001; //发送聊天消息
     int CHAT_RECEIVE_MESSAGE = 2002; //接受聊天消息
 
-    /*************** 游戏模式 : 无尽模式(OnHook) **************/
-    int MODE_ON_HOOK_SPAWN_PET = 3001; //生成宠物
-    int MODE_ON_HOOK_CAPTURE_PET = 3002; //捕捉宠物
-    int MODE_ON_HOOK_SELL_PET = 3003;   //卖出宠物
-
 }
diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/actions/onhook/GOnHookAction.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/actions/onhook/GOnHookAction.java
index 00291b60..e8b04ccf 100644
--- a/JisolGameServer/Main/src/main/java/cn/jisol/game/actions/onhook/GOnHookAction.java
+++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/actions/onhook/GOnHookAction.java
@@ -1,66 +1,9 @@
 package cn.jisol.game.actions.onhook;
 
-import cfg.TB.TbGRole;
-import cn.hutool.core.lang.UUID;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.RandomUtil;
-import cn.jisol.game.actions.GActionEnum;
-import cn.jisol.game.data.GlobalIds;
-import cn.jisol.game.data.TD;
-import cn.jisol.game.network.client.GClient;
-import cn.jisol.game.proto.GOnHookMessage;
 import cn.jisol.ngame.actions.core.NAction;
-import cn.jisol.ngame.actions.core.NActionMethod;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
 
 //无尽模式
 @NAction
 public class GOnHookAction {
 
-    //生成的宠物列表
-    public static Map<Long,Map<String, GOnHookMessage.GOnHookPet>> PETS = new HashMap<>();
-
-    //生成宠物 返回生成好的列表
-    @NActionMethod(GActionEnum.MODE_ON_HOOK_SPAWN_PET)
-    public static GOnHookMessage.GOnHookPets onSpawnPet(GClient client){
-
-        //获取玩家生成的宠物
-        Map<String, GOnHookMessage.GOnHookPet> pets = PETS.get(client.player.getPlayerId());
-
-        //如果没有则生成类
-        if(Objects.isNull(pets)){
-            PETS.put(client.player.getPlayerId(),pets = new HashMap<>());
-        }
-
-        //获取可生成的最大数量
-        int max = Integer.parseInt(TD.DATA.getTbGOnHookGlobal().get(GlobalIds.MODE_ON_HOOK_SPAWN_NUM).args);
-
-        //获取配置表全部宠物
-        ArrayList<TbGRole> tdPets = TD.DATA.getTbGRole().getDataList();
-
-        //如果小于最大数量则生成
-        while (pets.size() < max){
-
-            //目前随机生成宠物
-            GOnHookMessage.GOnHookPet hookPet = GOnHookMessage.GOnHookPet.newBuilder()
-                    //生成唯一Id
-                    .setKey(RandomUtil.randomString(8))
-                    //随机取配置表宠物中的宠物
-                    .setPetTbId(tdPets.get(RandomUtil.randomInt(0, tdPets.size() - 1)).id)
-                    .build();
-
-            //添加到宠物列表中
-            pets.put(hookPet.getKey(),hookPet);
-
-        }
-
-        //返回生成好的宠物
-        return GOnHookMessage.GOnHookPets.newBuilder().addAllPets(pets.values()).build();
-    }
-
 }
diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java
index a76c6ef9..0660c027 100644
--- a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java
+++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java
@@ -1,13 +1,122 @@
 package cn.jisol.game.controller.game.mode;
 
+import cfg.TB.TbGRole;
+import cn.hutool.core.util.RandomUtil;
+import cn.jisol.game.controller.argsresolver.CurrentPlayer;
+import cn.jisol.game.data.GlobalIds;
+import cn.jisol.game.data.TD;
+import cn.jisol.game.entity.game.Player;
+import cn.jisol.game.entity.game.PlayerPet;
+import cn.jisol.game.proto.GOnHookMessage;
+import cn.jisol.game.service.PlayerPetService;
+import cn.jisol.ngame.util.NewsContext;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
 @Api(value = "JNGameDemo - API", tags = {"无尽模式 - API"})
 @RestController
-@RequestMapping("/game/mode/onhook")
+@RequestMapping("/game/mode/onHook")
 @ResponseBody
 public class GOnHookController {
 
+    @Autowired
+    PlayerPetService playerPetService;
+
+    //生成的野怪列表
+    public static Map<Long, Map<String, GOnHookMessage.GOnHookPet>> CREEPS = new HashMap<>();
+
+    //生成野怪
+    @ApiImplicitParams({})
+    @ApiOperation(value = "生成野怪")
+    @GetMapping("/onSpawnCreeps")
+    public ResponseEntity<byte[]> onSpawnCreeps(@CurrentPlayer Player player){
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("Content-Type", "application/json");
+
+        //获取玩家生成的宠物
+        Map<String, GOnHookMessage.GOnHookPet> creeps = CREEPS.get(player.getPlayerId());
+
+        //如果没有则生成类
+        if(Objects.isNull(creeps)){
+            CREEPS.put(player.getPlayerId(),creeps = new HashMap<>());
+        }
+
+        //获取可生成的最大数量
+        int max = Integer.parseInt(TD.DATA.getTbGOnHookGlobal().get(GlobalIds.MODE_ON_HOOK_SPAWN_NUM).args);
+
+        //获取配置表全部宠物
+        ArrayList<TbGRole> tdPets = TD.DATA.getTbGRole().getDataList();
+
+        //如果小于最大数量则生成
+        while (creeps.size() < max){
+
+            //目前随机生成宠物
+            GOnHookMessage.GOnHookPet hookPet = GOnHookMessage.GOnHookPet.newBuilder()
+                    //生成唯一Id
+                    .setKey(RandomUtil.randomString(8))
+                    //随机取配置表宠物中的宠物
+                    .setPetTbId(tdPets.get(RandomUtil.randomInt(0, tdPets.size())).id)
+                    .build();
+
+            //添加到宠物列表中
+            creeps.put(hookPet.getKey(),hookPet);
+
+        }
+
+        //返回生成好的宠物
+        return ResponseEntity.ok().headers(headers).body(GOnHookMessage.GOnHookPets.newBuilder().addAllPets(creeps.values()).build().toByteArray());
+    }
+
+    //出售野怪
+    @ApiImplicitParams({})
+    @ApiOperation(value = "出售野怪")
+    @PostMapping("/onSellCreeps/{creepId}")
+    public NewsContext<Boolean> onSellCreeps(@PathVariable String creepId){
+        return NewsContext.onSuccess("卖出成功");
+    }
+
+    //捕捉野怪
+    @ApiImplicitParams({})
+    @ApiOperation(value = "捕捉野怪")
+    @PostMapping("/onCatchCreeps/{creepId}")
+    public NewsContext<PlayerPet> onCatchCreeps(@PathVariable String creepId,@CurrentPlayer Player player){
+
+        //(目前测试阶段 捕捉概率 100%)
+
+        //获取玩家生成的野怪
+        Map<String, GOnHookMessage.GOnHookPet> creeps = CREEPS.get(player.getPlayerId());
+
+        //如果没有则生成类
+        if(Objects.isNull(creeps)){
+            CREEPS.put(player.getPlayerId(),creeps = new HashMap<>());
+            return NewsContext.onFail("捕捉失败");
+        }
+
+        GOnHookMessage.GOnHookPet onHookPet;
+        if(Objects.isNull(onHookPet = creeps.remove(creepId))){
+            return NewsContext.onFail("捕捉失败");
+        }
+
+        //捕捉
+        PlayerPet pet = PlayerPet.builder().petPlayerId(player.getPlayerId()).petTbId(onHookPet.getPetTbId()).petGrade(0).build();
+        if(playerPetService.save(pet)){
+            return NewsContext.onSuccess("捕捉成功",pet);
+        }else{
+            return NewsContext.onFail("捕捉失败");
+        }
+
+    }
 
 }