提交地图

2025-09-26 10:16:14 +00:00 · 2023-12-23 19:00:53 +08:00
parent d66f08455e
commit 516d520c5e
38 changed files with 3020 additions and 287 deletions
--- a/JisolGameCocos/assets/resources/config/json/tbgonhookmap1.json
+++ b/JisolGameCocos/assets/resources/config/json/tbgonhookmap1.json
@@ -1,10 +0,0 @@
-[
-  {
-    "id": 1,
-    "data": {
-      "level": 1,
-      "petLevel": 0,
-      "oddsId": 1
-    }
-  }
-]
--- a/JisolGameCocos/assets/resources/config/json/tbgonhookmap120001.json
+++ b/JisolGameCocos/assets/resources/config/json/tbgonhookmap120001.json
@@ -0,0 +1,972 @@
+[
+  {
+    "id": 1,
+    "data": {
+      "level": 1,
+      "childLevel": 1,
+      "petLevel": 0,
+      "petSize": 1,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 2,
+    "data": {
+      "level": 1,
+      "childLevel": 2,
+      "petLevel": 0,
+      "petSize": 2,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 3,
+    "data": {
+      "level": 1,
+      "childLevel": 3,
+      "petLevel": 0,
+      "petSize": 3,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 4,
+    "data": {
+      "level": 1,
+      "childLevel": 4,
+      "petLevel": 0,
+      "petSize": 4,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 5,
+    "data": {
+      "level": 1,
+      "childLevel": 5,
+      "petLevel": 0,
+      "petSize": 5,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 6,
+    "data": {
+      "level": 1,
+      "childLevel": 6,
+      "petLevel": 0,
+      "petSize": 6,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 7,
+    "data": {
+      "level": 2,
+      "childLevel": 1,
+      "petLevel": 1,
+      "petSize": 1,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 8,
+    "data": {
+      "level": 2,
+      "childLevel": 2,
+      "petLevel": 1,
+      "petSize": 2,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 9,
+    "data": {
+      "level": 2,
+      "childLevel": 3,
+      "petLevel": 1,
+      "petSize": 3,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 10,
+    "data": {
+      "level": 2,
+      "childLevel": 4,
+      "petLevel": 1,
+      "petSize": 4,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 11,
+    "data": {
+      "level": 2,
+      "childLevel": 5,
+      "petLevel": 1,
+      "petSize": 5,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 12,
+    "data": {
+      "level": 2,
+      "childLevel": 6,
+      "petLevel": 1,
+      "petSize": 6,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 13,
+    "data": {
+      "level": 3,
+      "childLevel": 1,
+      "petLevel": 2,
+      "petSize": 1,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 14,
+    "data": {
+      "level": 3,
+      "childLevel": 2,
+      "petLevel": 2,
+      "petSize": 2,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 15,
+    "data": {
+      "level": 3,
+      "childLevel": 3,
+      "petLevel": 2,
+      "petSize": 3,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 16,
+    "data": {
+      "level": 3,
+      "childLevel": 4,
+      "petLevel": 2,
+      "petSize": 4,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 17,
+    "data": {
+      "level": 3,
+      "childLevel": 5,
+      "petLevel": 2,
+      "petSize": 5,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 18,
+    "data": {
+      "level": 3,
+      "childLevel": 6,
+      "petLevel": 2,
+      "petSize": 6,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 19,
+    "data": {
+      "level": 4,
+      "childLevel": 1,
+      "petLevel": 3,
+      "petSize": 1,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 20,
+    "data": {
+      "level": 4,
+      "childLevel": 2,
+      "petLevel": 3,
+      "petSize": 2,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 21,
+    "data": {
+      "level": 4,
+      "childLevel": 3,
+      "petLevel": 3,
+      "petSize": 3,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 22,
+    "data": {
+      "level": 4,
+      "childLevel": 4,
+      "petLevel": 3,
+      "petSize": 4,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 23,
+    "data": {
+      "level": 4,
+      "childLevel": 5,
+      "petLevel": 3,
+      "petSize": 5,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 24,
+    "data": {
+      "level": 4,
+      "childLevel": 6,
+      "petLevel": 3,
+      "petSize": 6,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 25,
+    "data": {
+      "level": 5,
+      "childLevel": 1,
+      "petLevel": 4,
+      "petSize": 1,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 26,
+    "data": {
+      "level": 5,
+      "childLevel": 2,
+      "petLevel": 4,
+      "petSize": 2,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 27,
+    "data": {
+      "level": 5,
+      "childLevel": 3,
+      "petLevel": 4,
+      "petSize": 3,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 28,
+    "data": {
+      "level": 5,
+      "childLevel": 4,
+      "petLevel": 4,
+      "petSize": 4,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 29,
+    "data": {
+      "level": 5,
+      "childLevel": 5,
+      "petLevel": 4,
+      "petSize": 5,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 30,
+    "data": {
+      "level": 5,
+      "childLevel": 6,
+      "petLevel": 4,
+      "petSize": 6,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 31,
+    "data": {
+      "level": 6,
+      "childLevel": 1,
+      "petLevel": 5,
+      "petSize": 1,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 32,
+    "data": {
+      "level": 6,
+      "childLevel": 2,
+      "petLevel": 5,
+      "petSize": 2,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 33,
+    "data": {
+      "level": 6,
+      "childLevel": 3,
+      "petLevel": 5,
+      "petSize": 3,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 34,
+    "data": {
+      "level": 6,
+      "childLevel": 4,
+      "petLevel": 5,
+      "petSize": 4,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 35,
+    "data": {
+      "level": 6,
+      "childLevel": 5,
+      "petLevel": 5,
+      "petSize": 5,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 36,
+    "data": {
+      "level": 6,
+      "childLevel": 6,
+      "petLevel": 5,
+      "petSize": 6,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 37,
+    "data": {
+      "level": 7,
+      "childLevel": 1,
+      "petLevel": 6,
+      "petSize": 1,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 38,
+    "data": {
+      "level": 7,
+      "childLevel": 2,
+      "petLevel": 6,
+      "petSize": 2,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 39,
+    "data": {
+      "level": 7,
+      "childLevel": 3,
+      "petLevel": 6,
+      "petSize": 3,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 40,
+    "data": {
+      "level": 7,
+      "childLevel": 4,
+      "petLevel": 6,
+      "petSize": 4,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 41,
+    "data": {
+      "level": 7,
+      "childLevel": 5,
+      "petLevel": 6,
+      "petSize": 5,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 42,
+    "data": {
+      "level": 7,
+      "childLevel": 6,
+      "petLevel": 6,
+      "petSize": 6,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 43,
+    "data": {
+      "level": 8,
+      "childLevel": 1,
+      "petLevel": 7,
+      "petSize": 1,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 44,
+    "data": {
+      "level": 8,
+      "childLevel": 2,
+      "petLevel": 7,
+      "petSize": 2,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 45,
+    "data": {
+      "level": 8,
+      "childLevel": 3,
+      "petLevel": 7,
+      "petSize": 3,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 46,
+    "data": {
+      "level": 8,
+      "childLevel": 4,
+      "petLevel": 7,
+      "petSize": 4,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 47,
+    "data": {
+      "level": 8,
+      "childLevel": 5,
+      "petLevel": 7,
+      "petSize": 5,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 48,
+    "data": {
+      "level": 8,
+      "childLevel": 6,
+      "petLevel": 7,
+      "petSize": 6,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 49,
+    "data": {
+      "level": 9,
+      "childLevel": 1,
+      "petLevel": 8,
+      "petSize": 1,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 50,
+    "data": {
+      "level": 9,
+      "childLevel": 2,
+      "petLevel": 8,
+      "petSize": 2,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 51,
+    "data": {
+      "level": 9,
+      "childLevel": 3,
+      "petLevel": 8,
+      "petSize": 3,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 52,
+    "data": {
+      "level": 9,
+      "childLevel": 4,
+      "petLevel": 8,
+      "petSize": 4,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 53,
+    "data": {
+      "level": 9,
+      "childLevel": 5,
+      "petLevel": 8,
+      "petSize": 5,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 54,
+    "data": {
+      "level": 9,
+      "childLevel": 6,
+      "petLevel": 8,
+      "petSize": 6,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 55,
+    "data": {
+      "level": 10,
+      "childLevel": 1,
+      "petLevel": 9,
+      "petSize": 1,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 56,
+    "data": {
+      "level": 10,
+      "childLevel": 2,
+      "petLevel": 9,
+      "petSize": 2,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 57,
+    "data": {
+      "level": 10,
+      "childLevel": 3,
+      "petLevel": 9,
+      "petSize": 3,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 58,
+    "data": {
+      "level": 10,
+      "childLevel": 4,
+      "petLevel": 9,
+      "petSize": 4,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 59,
+    "data": {
+      "level": 10,
+      "childLevel": 5,
+      "petLevel": 9,
+      "petSize": 5,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 60,
+    "data": {
+      "level": 10,
+      "childLevel": 6,
+      "petLevel": 9,
+      "petSize": 6,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 61,
+    "data": {
+      "level": 11,
+      "childLevel": 1,
+      "petLevel": 10,
+      "petSize": 1,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 62,
+    "data": {
+      "level": 11,
+      "childLevel": 2,
+      "petLevel": 10,
+      "petSize": 2,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 63,
+    "data": {
+      "level": 11,
+      "childLevel": 3,
+      "petLevel": 10,
+      "petSize": 3,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 64,
+    "data": {
+      "level": 11,
+      "childLevel": 4,
+      "petLevel": 10,
+      "petSize": 4,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 65,
+    "data": {
+      "level": 11,
+      "childLevel": 5,
+      "petLevel": 10,
+      "petSize": 5,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 66,
+    "data": {
+      "level": 11,
+      "childLevel": 6,
+      "petLevel": 10,
+      "petSize": 6,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 67,
+    "data": {
+      "level": 12,
+      "childLevel": 1,
+      "petLevel": 11,
+      "petSize": 1,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 68,
+    "data": {
+      "level": 12,
+      "childLevel": 2,
+      "petLevel": 11,
+      "petSize": 2,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 69,
+    "data": {
+      "level": 12,
+      "childLevel": 3,
+      "petLevel": 11,
+      "petSize": 3,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 70,
+    "data": {
+      "level": 12,
+      "childLevel": 4,
+      "petLevel": 11,
+      "petSize": 4,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 71,
+    "data": {
+      "level": 12,
+      "childLevel": 5,
+      "petLevel": 11,
+      "petSize": 5,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 72,
+    "data": {
+      "level": 12,
+      "childLevel": 6,
+      "petLevel": 11,
+      "petSize": 6,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 73,
+    "data": {
+      "level": 13,
+      "childLevel": 1,
+      "petLevel": 12,
+      "petSize": 1,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 74,
+    "data": {
+      "level": 13,
+      "childLevel": 2,
+      "petLevel": 12,
+      "petSize": 2,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 75,
+    "data": {
+      "level": 13,
+      "childLevel": 3,
+      "petLevel": 12,
+      "petSize": 3,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 76,
+    "data": {
+      "level": 13,
+      "childLevel": 4,
+      "petLevel": 12,
+      "petSize": 4,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 77,
+    "data": {
+      "level": 13,
+      "childLevel": 5,
+      "petLevel": 12,
+      "petSize": 5,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 78,
+    "data": {
+      "level": 13,
+      "childLevel": 6,
+      "petLevel": 12,
+      "petSize": 6,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 79,
+    "data": {
+      "level": 14,
+      "childLevel": 1,
+      "petLevel": 13,
+      "petSize": 1,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 80,
+    "data": {
+      "level": 14,
+      "childLevel": 2,
+      "petLevel": 13,
+      "petSize": 2,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 81,
+    "data": {
+      "level": 14,
+      "childLevel": 3,
+      "petLevel": 13,
+      "petSize": 3,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 82,
+    "data": {
+      "level": 14,
+      "childLevel": 4,
+      "petLevel": 13,
+      "petSize": 4,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 83,
+    "data": {
+      "level": 14,
+      "childLevel": 5,
+      "petLevel": 13,
+      "petSize": 5,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 84,
+    "data": {
+      "level": 14,
+      "childLevel": 6,
+      "petLevel": 13,
+      "petSize": 6,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 85,
+    "data": {
+      "level": 15,
+      "childLevel": 1,
+      "petLevel": 14,
+      "petSize": 1,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 86,
+    "data": {
+      "level": 15,
+      "childLevel": 2,
+      "petLevel": 14,
+      "petSize": 2,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 87,
+    "data": {
+      "level": 15,
+      "childLevel": 3,
+      "petLevel": 14,
+      "petSize": 3,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 88,
+    "data": {
+      "level": 15,
+      "childLevel": 4,
+      "petLevel": 14,
+      "petSize": 4,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 89,
+    "data": {
+      "level": 15,
+      "childLevel": 5,
+      "petLevel": 14,
+      "petSize": 5,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 90,
+    "data": {
+      "level": 15,
+      "childLevel": 6,
+      "petLevel": 14,
+      "petSize": 6,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 91,
+    "data": {
+      "level": 16,
+      "childLevel": 1,
+      "petLevel": 15,
+      "petSize": 1,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 92,
+    "data": {
+      "level": 16,
+      "childLevel": 2,
+      "petLevel": 15,
+      "petSize": 2,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 93,
+    "data": {
+      "level": 16,
+      "childLevel": 3,
+      "petLevel": 15,
+      "petSize": 3,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 94,
+    "data": {
+      "level": 16,
+      "childLevel": 4,
+      "petLevel": 15,
+      "petSize": 4,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 95,
+    "data": {
+      "level": 16,
+      "childLevel": 5,
+      "petLevel": 15,
+      "petSize": 5,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 96,
+    "data": {
+      "level": 16,
+      "childLevel": 6,
+      "petLevel": 15,
+      "petSize": 6,
+      "oddsId": 1
+    }
+  },
+  {
+    "id": 97,
+    "data": {
+      "level": 17,
+      "childLevel": 1,
+      "petLevel": 16,
+      "petSize": 1,
+      "oddsId": 1
+    }
+  }
+]
--- a/JisolGameCocos/assets/resources/config/json/tbgonhookmap120001.json.meta
+++ b/JisolGameCocos/assets/resources/config/json/tbgonhookmap120001.json.meta
@@ -2,7 +2,7 @@
  "ver": "2.0.1",
  "importer": "json",
  "imported": true,
-  "uuid": "6baeb0a2-41ee-4611-b21b-bccecaf19df3",
+  "uuid": "717f4b1d-3e94-4ce4-ada9-769f086d5a8c",
  "files": [
    ".json"
  ],
--- a/JisolGameCocos/assets/resources/config/json/tbgonhookmaps.json
+++ b/JisolGameCocos/assets/resources/config/json/tbgonhookmaps.json
@@ -9,7 +9,7 @@
      10002,
      10003
    ],
-    "sign": "",
+    "sign": "TbGOnHookMap120001",
    "introduce": "新手地图在这里可以遇到可爱的宠物哦~"
  },
  {
@@ -23,7 +23,7 @@
      10006,
      10007
    ],
-    "sign": "",
+    "sign": "TbGOnHookMap120001",
    "introduce": "魔法阵 这里有魔法精灵~"
  }
 ]
--- a/JisolGameCocos/assets/resources/prefab/battle/mode/CampGuardianMode.prefab
+++ b/JisolGameCocos/assets/resources/prefab/battle/mode/CampGuardianMode.prefab
@@ -595,6 +595,9 @@
      "__uuid__": "e989c288-5957-41c1-953c-190622651f52",
      "__expectedType__": "cc.Prefab"
    },
+    "modeCamera": {
+      "__id__": 15
+    },
    "_id": ""
  },
  {
--- a/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab
+++ b/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab
@@ -35,22 +35,25 @@
      },
      {
        "__id__": 199
+      },
+      {
+        "__id__": 214
      }
    ],
    "_active": true,
    "_components": [
      {
-        "__id__": 214
+        "__id__": 229
      },
      {
-        "__id__": 216
+        "__id__": 231
      },
      {
-        "__id__": 218
+        "__id__": 233
      }
    ],
    "_prefab": {
-      "__id__": 220
+      "__id__": 235
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -4368,6 +4371,369 @@
    "targetOverrides": null,
    "nestedPrefabInstanceRoots": null
  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Button-002",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 215
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 221
+      },
+      {
+        "__id__": 223
+      },
+      {
+        "__id__": 225
+      }
+    ],
+    "_prefab": {
+      "__id__": 228
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 279.236,
+      "y": 533.93,
+      "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__": 214
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 216
+      },
+      {
+        "__id__": 218
+      }
+    ],
+    "_prefab": {
+      "__id__": 220
+    },
+    "_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__": 215
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 217
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 40
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "1dMX0k8ARKYLi1Iy56H0O1"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 215
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 219
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_string": "下一关",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 20,
+    "_fontSize": 20,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 1,
+    "_enableWrapText": false,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": false,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b0SEZOjSBFoam0g02qh+Di"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "d34tqTzC5HBroVsNAUv/7n",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 214
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 222
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 40
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "bbMKHWygtK+6gZdOYaV3pM"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 214
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 224
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@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": "beHQz9cBtOvame1aqOtqBf"
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 214
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 226
+    },
+    "clickEvents": [
+      {
+        "__id__": 227
+      }
+    ],
+    "_interactable": true,
+    "_transition": 2,
+    "_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": {
+      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_hoverSprite": {
+      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_pressedSprite": {
+      "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_disabledSprite": {
+      "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_duration": 0.1,
+    "_zoomScale": 1.2,
+    "_target": {
+      "__id__": 214
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b5QfGzIuFMQY3VrRK8yY7x"
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "b51bfKvsidNPKBbFirAFgQI",
+    "handler": "onClickNextLevel",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "17CMT1W0RGYJBXfOVnTcFL",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
  {
    "__type__": "cc.UITransform",
    "_name": "",
@@ -4378,7 +4744,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 215
+      "__id__": 230
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -4406,7 +4772,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 217
+      "__id__": 232
    },
    "_alignFlags": 45,
    "_target": null,
@@ -4442,7 +4808,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 219
+      "__id__": 234
    },
    "mask": false,
    "maskOpcity": 80,
--- a/JisolGameCocos/assets/resources/prefab/ui/模式/CampGuardian/阵营守护战斗页面.prefab
+++ b/JisolGameCocos/assets/resources/prefab/ui/模式/CampGuardian/阵营守护战斗页面.prefab
@@ -25,23 +25,23 @@
        "__id__": 10
      },
      {
-        "__id__": 28
+        "__id__": 30
      }
    ],
    "_active": true,
    "_components": [
-      {
-        "__id__": 46
-      },
-      {
-        "__id__": 48
-      },
      {
        "__id__": 50
+      },
+      {
+        "__id__": 52
+      },
+      {
+        "__id__": 54
      }
    ],
    "_prefab": {
-      "__id__": 52
+      "__id__": 56
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -161,7 +161,7 @@
    "node": {
      "__id__": 2
    },
-    "_enabled": false,
+    "_enabled": true,
    "__prefab": {
      "__id__": 6
    },
@@ -262,9 +262,6 @@
    ],
    "_active": true,
    "_components": [
-      {
-        "__id__": 19
-      },
      {
        "__id__": 21
      },
@@ -273,10 +270,13 @@
      },
      {
        "__id__": 25
+      },
+      {
+        "__id__": 27
      }
    ],
    "_prefab": {
-      "__id__": 27
+      "__id__": 29
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -326,15 +326,18 @@
      },
      {
        "__id__": 16
+      },
+      {
+        "__id__": 18
      }
    ],
    "_prefab": {
-      "__id__": 18
+      "__id__": 20
    },
    "_lpos": {
      "__type__": "cc.Vec3",
-      "x": 277.5,
-      "y": 480,
+      "x": -360,
+      "y": 0,
      "z": 0
    },
    "_lrot": {
@@ -379,8 +382,8 @@
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
+      "x": 0,
+      "y": 0
    },
    "_id": ""
  },
@@ -469,6 +472,28 @@
    "__type__": "cc.CompPrefabInfo",
    "fileId": "6dA2rok9xJt7UY+5UpcF6Y"
  },
+  {
+    "__type__": "00e93M1gwFDX4OxuD8p5I6L",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 11
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 19
+    },
+    "hitPrefab": {
+      "__uuid__": "de8f19b4-20e0-4020-ac9c-8c52f9ffffa2",
+      "__expectedType__": "cc.Prefab"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "d9QAiPB5RIu6nvdocVEcW0"
+  },
  {
    "__type__": "cc.PrefabInfo",
    "root": {
@@ -478,8 +503,6 @@
      "__id__": 0
    },
    "fileId": "6dxMJc0zxIEpiISGg2rCXY",
-    "instance": null,
-    "targetOverrides": null,
    "nestedPrefabInstanceRoots": null
  },
  {
@@ -492,7 +515,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 20
+      "__id__": 22
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -520,7 +543,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 22
+      "__id__": 24
    },
    "_alignFlags": 44,
    "_target": null,
@@ -556,7 +579,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 24
+      "__id__": 26
    },
    "_type": 0,
    "_inverted": false,
@@ -578,7 +601,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 26
+      "__id__": 28
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -637,26 +660,26 @@
    },
    "_children": [
      {
-        "__id__": 29
+        "__id__": 31
      }
    ],
    "_active": true,
    "_components": [
-      {
-        "__id__": 37
-      },
-      {
-        "__id__": 39
-      },
      {
        "__id__": 41
      },
      {
        "__id__": 43
+      },
+      {
+        "__id__": 45
+      },
+      {
+        "__id__": 47
      }
    ],
    "_prefab": {
-      "__id__": 45
+      "__id__": 49
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -693,28 +716,31 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
-      "__id__": 28
+      "__id__": 30
    },
    "_children": [],
    "_active": true,
    "_components": [
-      {
-        "__id__": 30
-      },
      {
        "__id__": 32
      },
      {
        "__id__": 34
+      },
+      {
+        "__id__": 36
+      },
+      {
+        "__id__": 38
      }
    ],
    "_prefab": {
-      "__id__": 36
+      "__id__": 40
    },
    "_lpos": {
      "__type__": "cc.Vec3",
-      "x": -277.5,
-      "y": 480,
+      "x": -915,
+      "y": 0,
      "z": 0
    },
    "_lrot": {
@@ -746,11 +772,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 29
+      "__id__": 31
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 31
+      "__id__": 33
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -759,8 +785,8 @@
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
+      "x": 0,
+      "y": 0
    },
    "_id": ""
  },
@@ -774,11 +800,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 29
+      "__id__": 31
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 33
+      "__id__": 35
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -819,11 +845,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 29
+      "__id__": 31
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 35
+      "__id__": 37
    },
    "_alignFlags": 36,
    "_target": null,
@@ -849,6 +875,28 @@
    "__type__": "cc.CompPrefabInfo",
    "fileId": "d6TwpFoyFD5pp/1ZQKEL8o"
  },
+  {
+    "__type__": "00e93M1gwFDX4OxuD8p5I6L",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 31
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 39
+    },
+    "hitPrefab": {
+      "__uuid__": "de8f19b4-20e0-4020-ac9c-8c52f9ffffa2",
+      "__expectedType__": "cc.Prefab"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "fb2ohdpgNAtoalakyUrPwu"
+  },
  {
    "__type__": "cc.PrefabInfo",
    "root": {
@@ -868,11 +916,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 28
+      "__id__": 30
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 38
+      "__id__": 42
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -896,11 +944,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 28
+      "__id__": 30
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 40
+      "__id__": 44
    },
    "_alignFlags": 40,
    "_target": null,
@@ -932,11 +980,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 28
+      "__id__": 30
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 42
+      "__id__": 46
    },
    "_type": 0,
    "_inverted": false,
@@ -954,11 +1002,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 28
+      "__id__": 30
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 44
+      "__id__": 48
    },
    "_customMaterial": null,
    "_srcBlendFactor": 2,
@@ -1017,7 +1065,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 47
+      "__id__": 51
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -1045,7 +1093,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 49
+      "__id__": 53
    },
    "_alignFlags": 45,
    "_target": null,
@@ -1081,7 +1129,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 51
+      "__id__": 55
    },
    "mask": true,
    "maskOpcity": 80,
--- a/JisolGameCocos/assets/script/App.ts
+++ b/JisolGameCocos/assets/script/App.ts
@@ -28,12 +28,12 @@ import AppAction from "./AppAction";
 import { Asset } from "cc";
 import { Component } from "cc";

-let APIPath = `http://localhost:8080`
-let WsPath = `ws://localhost:8080/websocket`
+// let APIPath = `http://localhost:8080`
+// let WsPath = `ws://localhost:8080/websocket`
 // let APIPath = `http://192.168.1.23:8080`
 // let WsPath = `ws://192.168.1.23:8080/websocket`
-// let APIPath = `http://192.168.0.122:8080`
-// let WsPath = `ws://192.168.0.122:8080/websocket`
+let APIPath = `http://192.168.0.116:8080`
+let WsPath = `ws://192.168.0.116:8080/websocket`
 // let APIPath = `https://api.pet.jisol.cn`
 // let WsPath = `wss://api.pet.jisol.cn/websocket`

--- a/JisolGameCocos/assets/script/battle/base/role/GRoleDefault.ts
+++ b/JisolGameCocos/assets/script/battle/base/role/GRoleDefault.ts
@@ -81,7 +81,8 @@ export default class GRoleDefault extends GRoleBase<{}>{
        //监听攻击
        this.fsmAnim.addEventListener(GRoleAnimEvent.Attack,this.onAttack.bind(this));
        //监听死亡击飞
-        this.fsmAnim.addStartListener(GPetAminEnum.Fly,this.onFly.bind(this));
+        // this.fsmAnim.addStartListener(GPetAminEnum.Fly,this.onFly.bind(this));
+        this.killBack.push(this.onFly.bind(this));
    }

    //初始化
@@ -106,7 +107,10 @@ export default class GRoleDefault extends GRoleBase<{}>{
        //设置血条位置
        if(this.spine){
            let runtimeData = this.spine.skeletonData.getRuntimeData();
-            let headY = (runtimeData.height + runtimeData.y + 20) * this.spine.node.scale.x;
+            let height = Math.abs(runtimeData.height);
+            let y = Math.abs(runtimeData.y);
+            let x = Math.abs(this.spine.node.scale.x);
+            let headY = (height + y + 20) * x;
            this.headInfo.setPosition(v3(this.headInfo.position.x,headY,this.headInfo.position.z))
        }
        
@@ -155,7 +159,7 @@ export default class GRoleDefault extends GRoleBase<{}>{
        this.JTween(vWorld)
            .to({x:vEndWorld.x},1200)
            .onUpdate(pos => {
-                if(this.node.isValid)
+                if(this.node && this.node.isValid)
                    this.node.worldPosition = pos;
            })
            .start();
@@ -163,7 +167,7 @@ export default class GRoleDefault extends GRoleBase<{}>{
            .to({y:vEndWorld.y},1200)
            .easing(JEasing.Circular.Out)
            .onUpdate(pos => {
-                if(this.node.isValid)
+                if(this.node && this.node.isValid)
                    this.node.worldPosition = vWorld
            })
            .start();
--- a/JisolGameCocos/assets/script/battle/modes/GCampGuardianMode.ts
+++ b/JisolGameCocos/assets/script/battle/modes/GCampGuardianMode.ts
@@ -7,7 +7,7 @@ import GBaseMode from "../GBaseMode";
 import { Prefab } from "cc";
 import { instantiate } from "cc";
 import GRoleCGCrystal from "../base/role/CampGuardian/GRoleCGCrystal";
-import { TD } from "../../App";
+import { TD, app } from "../../App";
 import { GTowards } from "../base/GObject";
 import GRoleBase from "../base/role/GRoleBase";
 import { GTactical } from "../entity/GTactical";
@@ -16,6 +16,8 @@ import { TbGPetId } from "../../config/TbGPet";
 import GModeTools from "./GModeTools";
 import GPetAttribute from "../base/values/attribute/role/GPetAttribute";
 import RandomUtil from "../../../../extensions/ngame/assets/ngame/util/RandomUtil";
+import { GModeEvent } from "./GMode";
+import { Camera } from "cc";
 const { ccclass, property } = _decorator;

 //阵营守护 角色
@@ -51,6 +53,10 @@ export default class GCampGuardianMode extends GBaseMode<{},{}>{
    //敌方宠物
    enemyRoles: GRoleBase<{}>[] = [];

+    //模式相机
+    @property(Camera)
+    modeCamera:Camera;
+
    onSyncInitSuccess(){
        
        //生成水晶
@@ -127,8 +133,8 @@ export default class GCampGuardianMode extends GBaseMode<{},{}>{
            petStar:0,
            petStarExp:0,
        }));
-        // //绑定受击回调
-        // entity.addHitCallback(this.onHitBack.bind(this));
+        //绑定受击回调
+        entity.addHitCallback(this.onHitBack.bind(this));

        this.addGObject(entity,pos);
        this.getOnesRole(type).push(entity);
@@ -158,6 +164,22 @@ export default class GCampGuardianMode extends GBaseMode<{},{}>{
        },3000)

    }
+
+    //角色受击回调
+    onHitBack(role:GRoleDefault,hit:number){
+
+        if(!role.get()) return;
+
+        //添加受击显示
+        app.event.emit(GModeEvent.HIT,{
+            mode:this,
+            role:role,
+            hit:hit,
+            world:role.v2World,
+            camera:this.modeCamera,
+        });
+
+    }
    
 }

--- a/JisolGameCocos/assets/script/battle/modes/GMode.ts
+++ b/JisolGameCocos/assets/script/battle/modes/GMode.ts
@@ -0,0 +1,17 @@
+import { Vec2 } from "cc";
+import GBaseMode from "../GBaseMode";
+import GRoleBase from "../base/role/GRoleBase";
+import { Camera } from "cc";
+
+export interface GModeHitInfo{
+    mode:GBaseMode<{},{}>,  //模式
+    role:GRoleBase<{}>,     //宠物
+    hit:number,             //受击
+    world:Vec2,             //世界坐标
+    camera:Camera,          //相机
+}
+
+export enum GModeEvent{
+    //受击通知
+    HIT = "ModeRenderEvent_HIT"
+}
--- a/JisolGameCocos/assets/script/battle/modes/GMode.ts.meta
+++ b/JisolGameCocos/assets/script/battle/modes/GMode.ts.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "b9fffb62-4b14-48cb-85fe-51ab780f49c0",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
--- a/JisolGameCocos/assets/script/battle/modes/GOnHookMode.ts
+++ b/JisolGameCocos/assets/script/battle/modes/GOnHookMode.ts
@@ -15,7 +15,7 @@ import { TD, app } from "../../App";
 import { v3 } from "cc";
 import { v2 } from "cc";
 import GFSMOnHookMode from "./OnHook/GFSMOnHookMode";
-import { TB } from "../../config/data/schema";
+import { TB, TbGEntity } from "../../config/data/schema";
 import PlayerTacticalData, { PlayerTacticalEvent } from "../../data/PlayerTacticalData";
 import GRoleOnHookPlayerExpand from "../base/role/expand/OnHook/GRoleOnHookPlayerExpand";
 import PlayerPetData from "../../data/PlayerPetData";
@@ -23,10 +23,10 @@ import { GUI } from "../../ui/UIConfig";
 import { GOnHookPet, GOnHookPets } from "../../../../extensions/ngame/assets/ngame/message/proto";
 import GOnHookManager, { GOnHookManagerEvent } from "../../manager/battle/mode/GOnHookManager";
 import GRoleOnHookCreepsExpand from "../base/role/expand/OnHook/GRoleOnHookCreepsExpand";
-import { ModeRenderEvent } from "../../ui/Consts/Game/ModeRender";
 import GPetAttribute from "../base/values/attribute/role/GPetAttribute";
 import GDefaultMode from "./default/GDefaultMode";
 import GOnHookData from "../../data/GOnHookData";
+import { GModeEvent, GModeHitInfo } from "./GMode";
 const { ccclass, property } = _decorator;

 //挂机模式状态
@@ -262,7 +262,7 @@ export default class GOnHookMode extends GDefaultMode<{},{}>{
            petId:0,               
            petPlayerId:0,         
            petTbId:creeps.petTbId,        
-            petLevel:0,            
+            petLevel:creeps.petLevel,            
            petStar:0,             
            petStarExp:0,          
        }));
@@ -357,7 +357,13 @@ export default class GOnHookMode extends GDefaultMode<{},{}>{
        //获取敌人
        let creeps = GOnHookManager.getIns().getNextCreeps();
        if(!creeps) return; //没有获取到野怪则返回
-        this.onGenCreeps(2,creeps);
+
+        let sign = TD.TbGOnHookMaps.get(GOnHookData.getIns().info.onHookMap).sign;
+        let table:{data:TbGEntity.TOnHookLevel} = TD[sign].get(GOnHookData.getIns().info.levelId);
+
+        for (let index = 0; index < table.data.petSize; index++) {
+            this.onGenCreeps(index + 1,creeps);
+        }
        // this.enemyInfo.roles.forEach((info,index) => this.onGenRole(GOnHookModePlayerEnum.ENEMY,index + 1,info));
    }

@@ -385,7 +391,13 @@ export default class GOnHookMode extends GDefaultMode<{},{}>{
        if(!role.get()) return;

        //添加受击显示
-        app.event.emit(ModeRenderEvent.HIT,role.v2World.clone(),hit);
+        app.event.emit(GModeEvent.HIT,{
+            mode:this,
+            role:role,
+            hit:hit,
+            world:role.v2World,
+            camera:this.camera,
+        });

    }

--- a/JisolGameCocos/assets/script/battle/modes/GPVPMode.ts
+++ b/JisolGameCocos/assets/script/battle/modes/GPVPMode.ts
@@ -11,10 +11,10 @@ import { TB } from "../../config/data/schema";
 import JNFrameTime from "../../../../extensions/ngame/assets/ngame/sync/frame/game/time/JNFrameTime";
 import GBattleModeManager from "../GBattleModeManager";
 import { app, TD } from "../../App";
-import { ModeRenderEvent } from "../../ui/Consts/Game/ModeRender";
 import { GPVPStart } from "../../action/PVPAction";
 import { PlayerPetOV } from "../../consts/API";
 import GPetAttribute from "../base/values/attribute/role/GPetAttribute";
+import { GModeEvent } from "./GMode";
 const { ccclass, property } = _decorator;

 //PVP 角色
@@ -241,7 +241,13 @@ export default class GPVPMode extends GBaseMode<{},GPVPStart>{
        if(!role.get()) return;

        //添加受击显示
-        app.event.emit(ModeRenderEvent.HIT,role.v2World.clone(),hit);
+        app.event.emit(GModeEvent.HIT,{
+            mode:this,
+            role:role,
+            hit:hit,
+            world:role.v2World,
+            camera:this.camera,
+        });

    }
    
--- a/JisolGameCocos/assets/script/config/data/schema.ts
+++ b/JisolGameCocos/assets/script/config/data/schema.ts
@@ -589,7 +589,7 @@ export class TbGOnHookMaps {


 export namespace TB {
-export class TbGOnHookMap1 {
+export class TbGOnHookMap120001 {

    constructor(_json_: any) {
        if (_json_.id === undefined) { throw new Error() }
@@ -624,8 +624,12 @@ export class TOnHookLevel {
    constructor(_json_: any) {
        if (_json_.level === undefined) { throw new Error() }
        this.level = _json_.level
+        if (_json_.childLevel === undefined) { throw new Error() }
+        this.childLevel = _json_.childLevel
        if (_json_.petLevel === undefined) { throw new Error() }
        this.petLevel = _json_.petLevel
+        if (_json_.petSize === undefined) { throw new Error() }
+        this.petSize = _json_.petSize
        if (_json_.oddsId === undefined) { throw new Error() }
        this.oddsId = _json_.oddsId
    }
@@ -634,10 +638,18 @@ export class TOnHookLevel {
     * 关卡等级
     */
    readonly level: number
+    /**
+     * 子关卡等级
+     */
+    readonly childLevel: number
    /**
     * 宠物等级
     */
    readonly petLevel: number
+    /**
+     * 宠物数量
+     */
+    readonly petSize: number
    /**
     * 概率Id
     */
@@ -1140,24 +1152,24 @@ export class TbGOnHookMaps{



-export class TbGOnHookMap1{
-    private _dataMap: Map<number, TB.TbGOnHookMap1>
-    private _dataList: TB.TbGOnHookMap1[]
+export class TbGOnHookMap120001{
+    private _dataMap: Map<number, TB.TbGOnHookMap120001>
+    private _dataList: TB.TbGOnHookMap120001[]
    constructor(_json_: any) {
-        this._dataMap = new Map<number, TB.TbGOnHookMap1>()
+        this._dataMap = new Map<number, TB.TbGOnHookMap120001>()
        this._dataList = []
        for(var _json2_ of _json_) {
-            let _v: TB.TbGOnHookMap1
-            _v = new TB.TbGOnHookMap1(_json2_)
+            let _v: TB.TbGOnHookMap120001
+            _v = new TB.TbGOnHookMap120001(_json2_)
            this._dataList.push(_v)
            this._dataMap.set(_v.id, _v)
        }
    }

-    getDataMap(): Map<number, TB.TbGOnHookMap1> { return this._dataMap; }
-    getDataList(): TB.TbGOnHookMap1[] { return this._dataList; }
+    getDataMap(): Map<number, TB.TbGOnHookMap120001> { return this._dataMap; }
+    getDataList(): TB.TbGOnHookMap120001[] { return this._dataList; }

-    get(key: number): TB.TbGOnHookMap1 | undefined { return this._dataMap.get(key); }
+    get(key: number): TB.TbGOnHookMap120001 | undefined { return this._dataMap.get(key); }

    resolve(tables:Tables)
    {
@@ -1235,8 +1247,8 @@ export class Tables {
    get TbGRoleBaseAttribute(): TbGRoleBaseAttribute  { return this._TbGRoleBaseAttribute;}
    private _TbGOnHookMaps: TbGOnHookMaps
    get TbGOnHookMaps(): TbGOnHookMaps  { return this._TbGOnHookMaps;}
-    private _TbGOnHookMap1: TbGOnHookMap1
-    get TbGOnHookMap1(): TbGOnHookMap1  { return this._TbGOnHookMap1;}
+    private _TbGOnHookMap120001: TbGOnHookMap120001
+    get TbGOnHookMap120001(): TbGOnHookMap120001  { return this._TbGOnHookMap120001;}
    private _TbBattleResource: TbBattleResource
    get TbBattleResource(): TbBattleResource  { return this._TbBattleResource;}

@@ -1255,7 +1267,7 @@ export class Tables {
        this._TbGAttribute = new TbGAttribute(loader('tbgattribute'))
        this._TbGRoleBaseAttribute = new TbGRoleBaseAttribute(loader('tbgrolebaseattribute'))
        this._TbGOnHookMaps = new TbGOnHookMaps(loader('tbgonhookmaps'))
-        this._TbGOnHookMap1 = new TbGOnHookMap1(loader('tbgonhookmap1'))
+        this._TbGOnHookMap120001 = new TbGOnHookMap120001(loader('tbgonhookmap120001'))
        this._TbBattleResource = new TbBattleResource(loader('tbbattleresource'))

        this._TbGGlobal.resolve(this)
@@ -1272,7 +1284,7 @@ export class Tables {
        this._TbGAttribute.resolve(this)
        this._TbGRoleBaseAttribute.resolve(this)
        this._TbGOnHookMaps.resolve(this)
-        this._TbGOnHookMap1.resolve(this)
+        this._TbGOnHookMap120001.resolve(this)
        this._TbBattleResource.resolve(this)
    }
 }
--- a/JisolGameCocos/assets/script/consts/GAPI.ts
+++ b/JisolGameCocos/assets/script/consts/GAPI.ts
@@ -7,6 +7,7 @@ export interface ModeOnHookOV{

    playerId:number;        //玩家Id
    onHookMap:number;       //当前玩家所在的地图(配置表Id)
+    levelId:number;         //当前关卡Id

 }

@@ -23,5 +24,7 @@ export const GAPI = {
    GOnHookCatchCreeps : async (creepId) => RData(await app.api.post(`/game/mode/onHook/onCatchCreeps/${creepId}`)) as PlayerPetOV,
    //出售野怪
    GOnHookSellCreeps : async (creepId) => RData(await app.api.post(`/game/mode/onHook/onSellCreeps/${creepId}`)) as boolean,
+    //下一关
+    GOnHookNextLevel : async () => RData(await app.api.post(`/game/mode/onHook/nextLevel`)) as boolean,

 }
--- a/JisolGameCocos/assets/script/ui/Consts/Game/ModeRender.ts
+++ b/JisolGameCocos/assets/script/ui/Consts/Game/ModeRender.ts
@@ -8,13 +8,9 @@ import { instantiate } from 'cc';
 import { v3 } from 'cc';
 import { ModeRenderHitText } from './ModeRenderHitText';
 import { Vec2 } from 'cc';
+import { GModeEvent, GModeHitInfo } from '../../../battle/modes/GMode';
 const { ccclass, property } = _decorator;

-export enum ModeRenderEvent{
-    //受击
-    HIT = "ModeRenderEvent_HIT"
-}
-
@ccclass('ModeRender')
 export class ModeRender extends Component {

@@ -24,27 +20,27 @@ export class ModeRender extends Component {

    onLoad(){

-        app.event.on(ModeRenderEvent.HIT,this.onHit,this);
+        app.event.on(GModeEvent.HIT,this.onHit,this);

    }

    protected onDestroy(): void {

-        app.event.off(ModeRenderEvent.HIT,this.onHit,this);
+        app.event.off(GModeEvent.HIT,this.onHit,this);

    }
    
    //受击
-    onHit(pos:Vec2,hit:number){
+    onHit(info:GModeHitInfo){

-        let rolePos = GData.WorldCanvas.camera.worldToScreen(v3(pos.x,pos.y));
+        let rolePos = info.camera.worldToScreen(v3(info.world.x,info.world.y));
        
        let hitNode = instantiate(this.hitPrefab);

        this.node.addChild(hitNode);
        hitNode.position = rolePos.add(v3(0,100,0));
        
-        hitNode.getComponent(ModeRenderHitText).setText(hit);
+        hitNode.getComponent(ModeRenderHitText).setText(info.hit);

    }

--- a/JisolGameCocos/assets/script/ui/Home/MainView.ts
+++ b/JisolGameCocos/assets/script/ui/Home/MainView.ts
@@ -6,6 +6,7 @@ import GBattleModeManager, { BattleMode } from '../../battle/GBattleModeManager'
 import { JNGLayerBase } from '../../components/JNComponent';
 import { app } from '../../App';
 import { GAction } from '../../consts/GAction';
+import { GAPI } from '../../consts/GAPI';
 const { ccclass, property } = _decorator;

@ccclass('MainView')
@@ -60,6 +61,12 @@ export class MainView extends JNGLayerBase {
        app.layer.Open(GUI.MapSelectView);
    }

+    //点击下一关
+    async onClickNextLevel(){
+        await GAPI.GOnHookNextLevel();
+        app.layer.Open(GUI.Tips,{text:"下一关"});
+    }
+
 }


--- a/JisolGameCocos/extensions/ngame
+++ b/JisolGameCocos/extensions/ngame
--- a/JisolGameCocos/proto/GOnHookMessage.proto
+++ b/JisolGameCocos/proto/GOnHookMessage.proto
@@ -6,6 +6,7 @@ option java_package = "cn.jisol.ngame.proto";
 message GOnHookPet {
    string key = 1;     //生成宠物的key
    int32 petTbId = 2; //生成宠物的配置表Id
+    int32 petLevel = 3; //生成宠物的等级
 }

 //生成的宠物类列表