Bladeren bron

射线检测

woso_javan 1 maand geleden
bovenliggende
commit
152bb6d32a

+ 2 - 79
assets/module_aliens/FBX/Model/prefab/Ground.prefab

@@ -29,16 +29,9 @@
       }
     ],
     "_active": true,
-    "_components": [
-      {
-        "__id__": 25
-      },
-      {
-        "__id__": 27
-      }
-    ],
+    "_components": [],
     "_prefab": {
-      "__id__": 29
+      "__id__": 25
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -437,76 +430,6 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
-  {
-    "__type__": "cc.RigidBody",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 26
-    },
-    "_group": 2,
-    "_type": 2,
-    "_mass": 1,
-    "_allowSleep": true,
-    "_linearDamping": 0.1,
-    "_angularDamping": 0.1,
-    "_useGravity": true,
-    "_linearFactor": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_angularFactor": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a0Zp/Ue49LZZ76daAInUCk"
-  },
-  {
-    "__type__": "cc.PlaneCollider",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 28
-    },
-    "_material": null,
-    "_isTrigger": false,
-    "_center": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_normal": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 1,
-      "z": 0
-    },
-    "_constant": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "1aaPCJL2dGebAQ/fvfnox9"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 163 - 144
assets/module_aliens/Prefabs/Levels/lvl_1.prefab

@@ -25,20 +25,20 @@
         "__id__": 6
       },
       {
-        "__id__": 51
+        "__id__": 53
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 105
+        "__id__": 107
       },
       {
-        "__id__": 107
+        "__id__": 109
       }
     ],
     "_prefab": {
-      "__id__": 109
+      "__id__": 111
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -156,7 +156,7 @@
     "_shutter": 7,
     "_iso": 0,
     "_screenScale": 1,
-    "_visibility": 1115684864,
+    "_visibility": 1082130432,
     "_targetTexture": null,
     "_postProcess": null,
     "_usePostProcess": false,
@@ -194,19 +194,19 @@
         "__id__": 7
       },
       {
-        "__id__": 15
+        "__id__": 17
       },
       {
-        "__id__": 26
+        "__id__": 28
       },
       {
-        "__id__": 38
+        "__id__": 40
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 50
+      "__id__": 52
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -285,7 +285,14 @@
         "__id__": 14
       }
     ],
-    "removedComponents": []
+    "removedComponents": [
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 16
+      }
+    ]
   },
   {
     "__type__": "CCPropertyOverrideInfo",
@@ -349,6 +356,18 @@
       "z": 0
     }
   },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "a0Zp/Ue49LZZ76daAInUCk"
+    ]
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "1aaPCJL2dGebAQ/fvfnox9"
+    ]
+  },
   {
     "__type__": "cc.Node",
     "_objFlags": 0,
@@ -356,14 +375,14 @@
       "__id__": 6
     },
     "_prefab": {
-      "__id__": 16
+      "__id__": 18
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 15
+      "__id__": 17
     },
     "asset": {
       "__uuid__": "67c4d4d8-20c3-4295-bcd6-7629b4ae56b4",
@@ -371,7 +390,7 @@
     },
     "fileId": "4aIn0GW/pEWotYsJwbj7V9",
     "instance": {
-      "__id__": 17
+      "__id__": 19
     },
     "targetOverrides": null
   },
@@ -384,9 +403,6 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 18
-      },
       {
         "__id__": 20
       },
@@ -395,6 +411,9 @@
       },
       {
         "__id__": 24
+      },
+      {
+        "__id__": 26
       }
     ],
     "removedComponents": []
@@ -402,7 +421,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 19
+      "__id__": 21
     },
     "propertyPath": [
       "_name"
@@ -418,7 +437,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 21
+      "__id__": 23
     },
     "propertyPath": [
       "_lpos"
@@ -439,7 +458,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 23
+      "__id__": 25
     },
     "propertyPath": [
       "_lrot"
@@ -461,7 +480,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 25
+      "__id__": 27
     },
     "propertyPath": [
       "_euler"
@@ -486,14 +505,14 @@
       "__id__": 6
     },
     "_prefab": {
-      "__id__": 27
+      "__id__": 29
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 26
+      "__id__": 28
     },
     "asset": {
       "__uuid__": "81b8ee31-5423-4299-bf1c-b770379a441f",
@@ -501,7 +520,7 @@
     },
     "fileId": "ddvHPsg0tWvavD9d9s5w6S",
     "instance": {
-      "__id__": 28
+      "__id__": 30
     },
     "targetOverrides": null
   },
@@ -514,23 +533,23 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 29
-      },
       {
         "__id__": 31
       },
-      {
-        "__id__": 32
-      },
       {
         "__id__": 33
       },
       {
         "__id__": 34
       },
+      {
+        "__id__": 35
+      },
       {
         "__id__": 36
+      },
+      {
+        "__id__": 38
       }
     ],
     "removedComponents": []
@@ -538,7 +557,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 30
+      "__id__": 32
     },
     "propertyPath": [
       "_name"
@@ -554,7 +573,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 30
+      "__id__": 32
     },
     "propertyPath": [
       "_lpos"
@@ -569,7 +588,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 30
+      "__id__": 32
     },
     "propertyPath": [
       "_lrot"
@@ -585,7 +604,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 30
+      "__id__": 32
     },
     "propertyPath": [
       "_euler"
@@ -600,7 +619,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 35
+      "__id__": 37
     },
     "propertyPath": [
       "_group"
@@ -616,7 +635,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 37
+      "__id__": 39
     },
     "propertyPath": [
       "_isTrigger"
@@ -636,14 +655,14 @@
       "__id__": 6
     },
     "_prefab": {
-      "__id__": 39
+      "__id__": 41
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 38
+      "__id__": 40
     },
     "asset": {
       "__uuid__": "81b8ee31-5423-4299-bf1c-b770379a441f",
@@ -651,7 +670,7 @@
     },
     "fileId": "ddvHPsg0tWvavD9d9s5w6S",
     "instance": {
-      "__id__": 40
+      "__id__": 42
     },
     "targetOverrides": null
   },
@@ -664,23 +683,23 @@
     "mountedChildren": [],
     "mountedComponents": [],
     "propertyOverrides": [
-      {
-        "__id__": 41
-      },
       {
         "__id__": 43
       },
-      {
-        "__id__": 44
-      },
       {
         "__id__": 45
       },
       {
         "__id__": 46
       },
+      {
+        "__id__": 47
+      },
       {
         "__id__": 48
+      },
+      {
+        "__id__": 50
       }
     ],
     "removedComponents": []
@@ -688,7 +707,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 42
+      "__id__": 44
     },
     "propertyPath": [
       "_name"
@@ -704,7 +723,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 42
+      "__id__": 44
     },
     "propertyPath": [
       "_lpos"
@@ -719,7 +738,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 42
+      "__id__": 44
     },
     "propertyPath": [
       "_lrot"
@@ -735,7 +754,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 42
+      "__id__": 44
     },
     "propertyPath": [
       "_euler"
@@ -750,7 +769,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 47
+      "__id__": 49
     },
     "propertyPath": [
       "_group"
@@ -766,7 +785,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 49
+      "__id__": 51
     },
     "propertyPath": [
       "_isTrigger"
@@ -802,28 +821,28 @@
     },
     "_children": [
       {
-        "__id__": 52
+        "__id__": 54
       },
       {
-        "__id__": 62
+        "__id__": 64
       },
       {
-        "__id__": 72
+        "__id__": 74
       },
       {
-        "__id__": 80
+        "__id__": 82
       },
       {
-        "__id__": 88
+        "__id__": 90
       },
       {
-        "__id__": 96
+        "__id__": 98
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 104
+      "__id__": 106
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -858,17 +877,17 @@
     "__type__": "cc.Node",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 51
+      "__id__": 53
     },
     "_prefab": {
-      "__id__": 53
+      "__id__": 55
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 52
+      "__id__": 54
     },
     "asset": {
       "__uuid__": "f631c866-c36b-443f-a8c0-a895176b7610",
@@ -876,7 +895,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 54
+      "__id__": 56
     },
     "targetOverrides": null
   },
@@ -890,19 +909,19 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 55
+        "__id__": 57
       },
       {
-        "__id__": 57
+        "__id__": 59
       },
       {
-        "__id__": 58
+        "__id__": 60
       },
       {
-        "__id__": 59
+        "__id__": 61
       },
       {
-        "__id__": 60
+        "__id__": 62
       }
     ],
     "removedComponents": []
@@ -910,7 +929,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 56
+      "__id__": 58
     },
     "propertyPath": [
       "_name"
@@ -926,7 +945,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 56
+      "__id__": 58
     },
     "propertyPath": [
       "_lpos"
@@ -941,7 +960,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 56
+      "__id__": 58
     },
     "propertyPath": [
       "_lrot"
@@ -957,7 +976,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 56
+      "__id__": 58
     },
     "propertyPath": [
       "_euler"
@@ -972,7 +991,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 61
+      "__id__": 63
     },
     "propertyPath": [
       "_group"
@@ -989,17 +1008,17 @@
     "__type__": "cc.Node",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 51
+      "__id__": 53
     },
     "_prefab": {
-      "__id__": 63
+      "__id__": 65
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 62
+      "__id__": 64
     },
     "asset": {
       "__uuid__": "f631c866-c36b-443f-a8c0-a895176b7610",
@@ -1007,7 +1026,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 64
+      "__id__": 66
     },
     "targetOverrides": null
   },
@@ -1021,19 +1040,19 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 65
+        "__id__": 67
       },
       {
-        "__id__": 67
+        "__id__": 69
       },
       {
-        "__id__": 68
+        "__id__": 70
       },
       {
-        "__id__": 69
+        "__id__": 71
       },
       {
-        "__id__": 70
+        "__id__": 72
       }
     ],
     "removedComponents": []
@@ -1041,7 +1060,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 66
+      "__id__": 68
     },
     "propertyPath": [
       "_name"
@@ -1057,7 +1076,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 66
+      "__id__": 68
     },
     "propertyPath": [
       "_lpos"
@@ -1072,7 +1091,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 66
+      "__id__": 68
     },
     "propertyPath": [
       "_lrot"
@@ -1088,7 +1107,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 66
+      "__id__": 68
     },
     "propertyPath": [
       "_euler"
@@ -1103,7 +1122,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 71
+      "__id__": 73
     },
     "propertyPath": [
       "_group"
@@ -1120,17 +1139,17 @@
     "__type__": "cc.Node",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 51
+      "__id__": 53
     },
     "_prefab": {
-      "__id__": 73
+      "__id__": 75
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 72
+      "__id__": 74
     },
     "asset": {
       "__uuid__": "f631c866-c36b-443f-a8c0-a895176b7610",
@@ -1138,7 +1157,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 74
+      "__id__": 76
     },
     "targetOverrides": null
   },
@@ -1152,16 +1171,16 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 75
+        "__id__": 77
       },
       {
-        "__id__": 77
+        "__id__": 79
       },
       {
-        "__id__": 78
+        "__id__": 80
       },
       {
-        "__id__": 79
+        "__id__": 81
       }
     ],
     "removedComponents": []
@@ -1169,7 +1188,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 76
+      "__id__": 78
     },
     "propertyPath": [
       "_name"
@@ -1185,7 +1204,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 76
+      "__id__": 78
     },
     "propertyPath": [
       "_lpos"
@@ -1200,7 +1219,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 76
+      "__id__": 78
     },
     "propertyPath": [
       "_lrot"
@@ -1216,7 +1235,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 76
+      "__id__": 78
     },
     "propertyPath": [
       "_euler"
@@ -1232,17 +1251,17 @@
     "__type__": "cc.Node",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 51
+      "__id__": 53
     },
     "_prefab": {
-      "__id__": 81
+      "__id__": 83
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 80
+      "__id__": 82
     },
     "asset": {
       "__uuid__": "f631c866-c36b-443f-a8c0-a895176b7610",
@@ -1250,7 +1269,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 82
+      "__id__": 84
     },
     "targetOverrides": null
   },
@@ -1264,16 +1283,16 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 83
+        "__id__": 85
       },
       {
-        "__id__": 85
+        "__id__": 87
       },
       {
-        "__id__": 86
+        "__id__": 88
       },
       {
-        "__id__": 87
+        "__id__": 89
       }
     ],
     "removedComponents": []
@@ -1281,7 +1300,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 84
+      "__id__": 86
     },
     "propertyPath": [
       "_name"
@@ -1297,7 +1316,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 84
+      "__id__": 86
     },
     "propertyPath": [
       "_lpos"
@@ -1312,7 +1331,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 84
+      "__id__": 86
     },
     "propertyPath": [
       "_lrot"
@@ -1328,7 +1347,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 84
+      "__id__": 86
     },
     "propertyPath": [
       "_euler"
@@ -1344,17 +1363,17 @@
     "__type__": "cc.Node",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 51
+      "__id__": 53
     },
     "_prefab": {
-      "__id__": 89
+      "__id__": 91
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 88
+      "__id__": 90
     },
     "asset": {
       "__uuid__": "f631c866-c36b-443f-a8c0-a895176b7610",
@@ -1362,7 +1381,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 90
+      "__id__": 92
     },
     "targetOverrides": null
   },
@@ -1376,16 +1395,16 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 91
+        "__id__": 93
       },
       {
-        "__id__": 93
+        "__id__": 95
       },
       {
-        "__id__": 94
+        "__id__": 96
       },
       {
-        "__id__": 95
+        "__id__": 97
       }
     ],
     "removedComponents": []
@@ -1393,7 +1412,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 92
+      "__id__": 94
     },
     "propertyPath": [
       "_name"
@@ -1409,7 +1428,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 92
+      "__id__": 94
     },
     "propertyPath": [
       "_lpos"
@@ -1424,7 +1443,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 92
+      "__id__": 94
     },
     "propertyPath": [
       "_lrot"
@@ -1440,7 +1459,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 92
+      "__id__": 94
     },
     "propertyPath": [
       "_euler"
@@ -1456,17 +1475,17 @@
     "__type__": "cc.Node",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 51
+      "__id__": 53
     },
     "_prefab": {
-      "__id__": 97
+      "__id__": 99
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 96
+      "__id__": 98
     },
     "asset": {
       "__uuid__": "f631c866-c36b-443f-a8c0-a895176b7610",
@@ -1474,7 +1493,7 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": {
-      "__id__": 98
+      "__id__": 100
     },
     "targetOverrides": null
   },
@@ -1488,16 +1507,16 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 99
+        "__id__": 101
       },
       {
-        "__id__": 101
+        "__id__": 103
       },
       {
-        "__id__": 102
+        "__id__": 104
       },
       {
-        "__id__": 103
+        "__id__": 105
       }
     ],
     "removedComponents": []
@@ -1505,7 +1524,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 100
+      "__id__": 102
     },
     "propertyPath": [
       "_name"
@@ -1521,7 +1540,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 100
+      "__id__": 102
     },
     "propertyPath": [
       "_lpos"
@@ -1536,7 +1555,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 100
+      "__id__": 102
     },
     "propertyPath": [
       "_lrot"
@@ -1552,7 +1571,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 100
+      "__id__": 102
     },
     "propertyPath": [
       "_euler"
@@ -1587,7 +1606,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 106
+      "__id__": 108
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1615,7 +1634,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 108
+      "__id__": 110
     },
     "camera": {
       "__id__": 3
@@ -1643,31 +1662,31 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 96
+        "__id__": 98
       },
       {
-        "__id__": 88
+        "__id__": 90
       },
       {
-        "__id__": 80
+        "__id__": 82
       },
       {
-        "__id__": 72
+        "__id__": 74
       },
       {
-        "__id__": 62
+        "__id__": 64
       },
       {
-        "__id__": 52
+        "__id__": 54
       },
       {
-        "__id__": 38
+        "__id__": 40
       },
       {
-        "__id__": 26
+        "__id__": 28
       },
       {
-        "__id__": 15
+        "__id__": 17
       },
       {
         "__id__": 7

+ 22 - 1
assets/module_aliens/Prefabs/cow.prefab

@@ -29,10 +29,13 @@
       },
       {
         "__id__": 18
+      },
+      {
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 20
+      "__id__": 22
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -317,6 +320,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "52E2kPtfRIn5xFk+d+EY5R"
   },
+  {
+    "__type__": "0f4f9NJuDVDXIj25U7eS5MZ",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 21
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "5f+SuY9WdKp6mBoIx6KCwp"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 17 - 0
assets/module_aliens/RoosterAliens.ts

@@ -38,10 +38,14 @@ export class RoosterAliens extends Component {
         const btnSet = find('Canvas/GameUI/TopLeft/BtnSet')!;
         const btnPoint = find('Canvas/GameUI/Aim/BtPoint')!;
         const btnPointFrame = find('Canvas/GameUI/AimTarget/Mask/frame')!;
+        const btnShoot = find('Canvas/GameUI/AimTarget/BtnShoot')!;
 
         btnSet.on(NodeEventType.TOUCH_END, () => this.onClickSet(), this);
         btnPoint.on(NodeEventType.TOUCH_END, () => this.onClickAim(), this);
         btnPointFrame.on(NodeEventType.TOUCH_END, () => this.onClickResetAim(), this);
+        btnShoot.on(NodeEventType.TOUCH_END, () => this.onShoot(), this);
+        //TEST
+        EventDispatcher.instance.on(GameEvent.EVENT_CAMERA_SHOOT_TEXT,this.testShoot,this);
     }
 
     private onClickSet(): void {
@@ -63,6 +67,19 @@ export class RoosterAliens extends Component {
         aimTarget.active = false;
         EventDispatcher.instance.emit(GameEvent.EVENT_CAMERA_RESET_AIM);
     }
+
+    private onShoot(): void {
+        EventDispatcher.instance.emit(GameEvent.EVENT_CAMERA_SHOOT);
+    }
+
+    private testShoot(): void {
+        const lbTestShoot = AliensGlobalInstance.instance.lbTestShoot;
+        lbTestShoot.string = '击中了';
+
+        this.scheduleOnce(() => {
+            lbTestShoot.string = '';
+        }, 1.0);
+    }
 }
 
 

+ 3 - 1
assets/module_aliens/Script/CarColorsGlobalInstance.ts

@@ -6,7 +6,7 @@
  * @FilePath: /MoveCarUnscrew/assets/module_movecar/Script/AliensGlobalInstance.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
-import { _decorator, assetManager, Camera, Component, find, Node, Prefab } from 'cc';
+import { _decorator, assetManager, Camera, Component, find, Label, Node, Prefab } from 'cc';
 import { resLoader } from '../../core_tgx/base/ResLoader';
 import { ResourcePool } from './ResourcePool';
 
@@ -32,6 +32,7 @@ export class AliensGlobalInstance extends Component {
         this.titleLvl = find("Canvas/GameUI/TitleLvl");
         this.aimNode = find("Canvas/GameUI/AimNode");
         this.aimTarget = find("Canvas/GameUI/AimTarget");
+        this.lbTestShoot = find("Canvas/GameUI/LbTestShoot").getComponent(Label)!;
     }
 
     public camera: Camera = null!; //相机
@@ -42,6 +43,7 @@ export class AliensGlobalInstance extends Component {
     public titleLvl: Node = null!; //标题
     public aimNode: Node = null!; //瞄准节点
     public aimTarget: Node = null!; //瞄准放大节点
+    public lbTestShoot:Label = null!; //测试射击
 }
 
 

+ 36 - 0
assets/module_aliens/Script/Components/EnemyComponent.ts

@@ -0,0 +1,36 @@
+import { _decorator, CCBoolean, CCFloat, Collider, Component, isValid, ITriggerEvent, Node, PhysicsSystem, tween, Tween, Vec3 } from 'cc';
+
+const { ccclass, property } = _decorator;
+
+export enum EnemyStatus {
+    LIFE,
+    DIE
+}
+
+@ccclass('EnemyComponent')
+export class EnemyComponent extends Component {
+    currentHp: number = 0;
+    status: EnemyStatus = EnemyStatus.LIFE;
+    speed: number = 50;
+    headshot:boolean = false;
+    tigger: Collider = null!;
+
+    protected onLoad(): void {
+        this.tigger = this.node.getComponent(Collider)!;
+    }
+
+    start() {
+        this.status = EnemyStatus.LIFE;
+        this.tigger = this.node.getComponent(Collider)!;
+        this.tigger.on('onTriggerEnter', this.onTriggerEnter, this);
+    }
+
+    protected onTriggerEnter(event: ITriggerEvent): void {
+    }
+
+    protected onDestroy(): void {
+        Tween.stopAllByTarget(this.node);
+    }
+}
+
+

+ 9 - 0
assets/module_aliens/Script/Components/EnemyComponent.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "0f4f9349-b835-435c-88f6-e54ede4b9319",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 6 - 0
assets/module_aliens/Script/Enum/GameEvent.ts

@@ -12,6 +12,12 @@ export class GameEvent {
     /** 取消瞄准*/
     static readonly EVENT_CAMERA_RESET_AIM = 'EVENT_CAMERA_RESET_AIM';
 
+    /** 发射射击*/
+    static readonly EVENT_CAMERA_SHOOT = 'EVENT_CAMERA_SHOOT';
+
+    /** 击中文本提示测试*/
+    static readonly EVENT_CAMERA_SHOOT_TEXT = 'EVENT_CAMERA_SHOOT_TEXT';
+
     /** 检测游戏是否结束*/
     static readonly EVENT_CHECK_GAME_OVER = 'EVENT_CHECK_GAME_OVER';
 

+ 42 - 1
assets/module_aliens/Script/LevelAction.ts

@@ -1,9 +1,15 @@
-import { _decorator, BoxCollider2D, Button, Camera, CircleCollider2D, Collider2D, Component, EventTouch, find, Input, input, Node, NodeEventType, RenderTexture, Tween, tween, v3, Vec3 } from 'cc';
+import { _decorator, BoxCollider2D, Button, Camera, CircleCollider2D, Color, Component, debug, DebugView, director, EventTouch, find, geometry, Input, input, Node, NodeEventType, PhysicsSystem, RenderTexture, Tween, tween, v3, Vec3, view } from 'cc';
 import { EventDispatcher } from '../../core_tgx/easy_ui_framework/EventDispatcher';
 import { GameEvent } from './Enum/GameEvent';
+import { LineDrawer } from './LineDrawer';
+import { EnemyComponent } from './Components/EnemyComponent';
 
 const { ccclass, property } = _decorator;
 
+enum ERaycastType {
+    ALL,
+    CLOSEST
+}
 @ccclass('LevelAction')
 export class LevelAction extends Component {
 
@@ -30,6 +36,8 @@ export class LevelAction extends Component {
     //镜头拉近属性
     private _zoomDuration: number = 0.5; // 拉近持续时间(秒)
 
+    private _raycastType: ERaycastType = ERaycastType.ALL;
+
     onLoad(): void {
         this._cameraOriginalPos = this.camera.node.position.clone();
         this._originalRotation = this.camera.node.eulerAngles.clone();
@@ -50,6 +58,7 @@ export class LevelAction extends Component {
         //事件监听
         EventDispatcher.instance.on(GameEvent.EVENT_CAMERA_AIM,this.onAimTarget,this);
         EventDispatcher.instance.on(GameEvent.EVENT_CAMERA_RESET_AIM,this.onResetAimTarget,this);
+        EventDispatcher.instance.on(GameEvent.EVENT_CAMERA_SHOOT,this.onShoot,this);
     }
 
     private unRegisterEvent(){
@@ -62,6 +71,7 @@ export class LevelAction extends Component {
         //事件监听
         EventDispatcher.instance.off(GameEvent.EVENT_CAMERA_AIM,this.onAimTarget,this);
         EventDispatcher.instance.off(GameEvent.EVENT_CAMERA_RESET_AIM,this.onResetAimTarget,this);
+        EventDispatcher.instance.off(GameEvent.EVENT_CAMERA_SHOOT,this.onShoot,this);
     }
 
     private onAimTarget(){
@@ -72,6 +82,37 @@ export class LevelAction extends Component {
         this.moveCameraAlongForward(30); // 正值表示拉远
     }
 
+    private onShoot(){
+        // 从屏幕中心发射射线
+        const ray = new geometry.Ray();
+        this.camera.screenPointToRay(view.getVisibleSize().width * 0.5, 
+                                   view.getVisibleSize().height * 0.5, 
+                                   ray);
+        
+        // 射线检测参数
+        const mask = 0xffffffff;
+        const maxDistance = 1000;
+        const queryTrigger = true;
+        
+        // 执行射线检测
+        const hasHit = PhysicsSystem.instance.raycast(ray, mask, maxDistance, queryTrigger);
+        console.log(`射线检测结果: ${hasHit}`);
+        
+        if (hasHit) {
+            const results = PhysicsSystem.instance.raycastResults;
+            for (let i = 0; i < results.length; i++) {
+                const item = results[i];
+                const hitNode = item.collider.node;
+                console.log(`碰撞物体${i}: ${hitNode.name}`, 
+                          `距离: ${item.distance.toFixed(2)}`);
+
+                if(hitNode.getComponent(EnemyComponent)){
+                    EventDispatcher.instance.emit(GameEvent.EVENT_CAMERA_SHOOT_TEXT);
+                }
+            }
+        }
+    }
+    
     private moveCameraAlongForward(distance: number) {
         const currentPos = this.camera.node.position.clone();
         const forward = this.camera.node.forward.negative();

+ 53 - 0
assets/module_aliens/Script/LineDrawer.ts

@@ -0,0 +1,53 @@
+import {
+    _decorator,
+    Component,
+    Vec3,
+    Color,
+    MeshRenderer,
+    Material,
+    Mesh,
+    utils,
+    gfx,
+    director
+} from 'cc';
+
+const { ccclass } = _decorator;
+
+@ccclass('LineDrawer')
+export class LineDrawer extends Component {
+    private _meshRenderer: MeshRenderer | null = null;
+
+    onLoad() {
+        this._meshRenderer = this.getComponent(MeshRenderer) || this.node.addComponent(MeshRenderer);
+        
+        // 使用 unlit 材质
+        const mat = new Material();
+        mat.initialize({ effectName: 'unlit' });
+        this._meshRenderer.material = mat;
+    }
+
+    public drawLine(start: Vec3, end: Vec3, color: Color = Color.RED) {
+        if (!this._meshRenderer) return;
+
+        // 创建顶点数据
+        const positions = [start.x, start.y, start.z, end.x, end.y, end.z];
+        const colors = [color.r, color.g, color.b, color.a, color.r, color.g, color.b, color.a];
+        
+        // 创建Mesh
+        const mesh = new Mesh();
+        utils.createMesh({
+            positions: positions,
+            colors: colors,
+            primitiveMode: gfx.PrimitiveMode.LINE_LIST
+        }, mesh);
+
+        // 设置Mesh
+        this._meshRenderer.mesh = mesh;
+    }
+
+    public clear() {
+        if (this._meshRenderer) {
+            this._meshRenderer.mesh = null;
+        }
+    }
+}

+ 9 - 0
assets/module_aliens/Script/LineDrawer.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "c3673c19-db7e-4c4a-a1c2-44c5e472e652",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

File diff suppressed because it is too large
+ 697 - 135
assets/module_aliens/rooster_aliens.scene


+ 1 - 1
assets/start/Start.ts

@@ -66,7 +66,7 @@ export class Start extends Component {
             EPhysics2DDrawFlags.Joint |
             EPhysics2DDrawFlags.Shape;
 
-        PhysicsSystem2D.instance.debugDrawFlags = 0; // 启用调试绘制
+        PhysicsSystem2D.instance.debugDrawFlags = 1; // 启用调试绘制
 
         tgxModuleContext.setDefaultModule(ModuleDef.BASIC);
 

+ 134 - 134
profiles/v2/packages/scene.json

@@ -1037,48 +1037,23 @@
       },
       "scale": 1
     },
-    "f631c866-c36b-443f-a8c0-a895176b7610": {
+    "46b5ec40-b31e-48d8-b7ab-2b9c3db10ea3": {
       "position": {
-        "x": 3.816294961457988,
-        "y": 2.602661674361906,
-        "z": 10.3869396914357
+        "x": 10.060793551958653,
+        "y": 5.5055462105109125,
+        "z": 89.18245094593021
       },
       "rotation": {
-        "x": -0.1134618623619814,
-        "y": 0.17397624851138802,
-        "z": 0.020184057366639748,
-        "w": 0.9779832690652099
+        "x": -0.030580719564270914,
+        "y": 0.056112341894502475,
+        "z": 0.001719477562056356,
+        "w": 0.9979545420884458
       },
       "viewCenter": {
         "x": 0,
         "y": 0,
         "z": 0
       },
-      "contentRect": {
-        "x": 0,
-        "y": 0,
-        "width": 707,
-        "height": 728
-      },
-      "scale": 1
-    },
-    "61f3d9f8-e63d-4508-bbf0-72254266e890": {
-      "position": {
-        "x": 21.613665264605977,
-        "y": 68.58742105605378,
-        "z": 232.40394362534244
-      },
-      "rotation": {
-        "x": -0.15177158213415257,
-        "y": 0.08648078689761347,
-        "z": 0.013330806525440941,
-        "w": 0.9845347885938044
-      },
-      "viewCenter": {
-        "x": -26.2750544922903,
-        "y": -18.16598482169102,
-        "z": -38.0854326119468
-      },
       "contentRect": {
         "x": 0,
         "y": 0,
@@ -1087,22 +1062,22 @@
       },
       "scale": 0.9862637362637363
     },
-    "67c4d4d8-20c3-4295-bcd6-7629b4ae56b4": {
+    "6a3f318c-4d9d-46e4-b3a7-60451b683572": {
       "position": {
-        "x": 8.268024122905217,
-        "y": 14.560153732478554,
-        "z": 43.171747659050624
+        "x": 4.6510191860404575,
+        "y": 2.2969513300286053,
+        "z": 10.115261060142288
       },
       "rotation": {
-        "x": -0.19948981187574794,
-        "y": 0.1366526820461952,
-        "z": 0.02810675856370324,
-        "w": 0.969917455029242
+        "x": -0.09920530774592298,
+        "y": 0.21271844406754753,
+        "z": 0.021714702755450305,
+        "w": 0.97182181605105
       },
       "viewCenter": {
-        "x": -3.501128202576104,
-        "y": -3.735860752944834,
-        "z": 2.233945119295896
+        "x": 0,
+        "y": 0,
+        "z": 0
       },
       "contentRect": {
         "x": 0,
@@ -1130,68 +1105,68 @@
         "z": -3.313731938044869
       },
       "contentRect": {
-        "x": 0,
-        "y": 0,
-        "width": 815.6401098901099,
-        "height": 718
+        "x": 189.5,
+        "y": 18,
+        "width": 707,
+        "height": 728
       },
-      "scale": 0.9862637362637363
+      "scale": 1
     },
-    "46b5ec40-b31e-48d8-b7ab-2b9c3db10ea3": {
+    "67c4d4d8-20c3-4295-bcd6-7629b4ae56b4": {
       "position": {
-        "x": 10.060793551958653,
-        "y": 5.5055462105109125,
-        "z": 89.18245094593021
+        "x": 8.268024122905217,
+        "y": 14.560153732478554,
+        "z": 43.171747659050624
       },
       "rotation": {
-        "x": -0.030580719564270914,
-        "y": 0.056112341894502475,
-        "z": 0.001719477562056356,
-        "w": 0.9979545420884458
+        "x": -0.19948981187574794,
+        "y": 0.13665268204619518,
+        "z": 0.02810675856370322,
+        "w": 0.9699174550292421
       },
       "viewCenter": {
-        "x": 0,
-        "y": 0,
-        "z": 0
+        "x": -3.501128202576104,
+        "y": -3.735860752944834,
+        "z": 2.233945119295896
       },
       "contentRect": {
-        "x": 0,
-        "y": 0,
-        "width": 815.6401098901099,
-        "height": 718
+        "x": 189.5,
+        "y": 18,
+        "width": 707,
+        "height": 728
       },
-      "scale": 0.9862637362637363
+      "scale": 1
     },
-    "6a3f318c-4d9d-46e4-b3a7-60451b683572": {
+    "61f3d9f8-e63d-4508-bbf0-72254266e890": {
       "position": {
-        "x": 4.6510191860404575,
-        "y": 2.2969513300286053,
-        "z": 10.115261060142288
+        "x": 21.61366526460597,
+        "y": 68.58742105605381,
+        "z": 232.40394362534244
       },
       "rotation": {
-        "x": -0.09920530774592298,
-        "y": 0.21271844406754753,
-        "z": 0.021714702755450305,
-        "w": 0.97182181605105
+        "x": -0.1517715821341526,
+        "y": 0.0864807868976135,
+        "z": 0.013330806525440943,
+        "w": 0.9845347885938044
       },
       "viewCenter": {
-        "x": 0,
-        "y": 0,
-        "z": 0
+        "x": -26.2750544922903,
+        "y": -18.16598482169102,
+        "z": -38.0854326119468
       },
       "contentRect": {
-        "x": 0,
-        "y": 0,
-        "width": 815.6401098901099,
-        "height": 718
+        "x": 189.5,
+        "y": 18,
+        "width": 707,
+        "height": 728
       },
-      "scale": 0.9862637362637363
+      "scale": 1
     },
-    "773de0b0-468b-4fbb-965c-36c47d7a4c94": {
+    "f631c866-c36b-443f-a8c0-a895176b7610": {
       "position": {
-        "x": 414,
-        "y": 364,
-        "z": 3013.822771698396
+        "x": 543,
+        "y": 382,
+        "z": 5000
       },
       "rotation": {
         "x": 0,
@@ -1200,29 +1175,54 @@
         "w": 1
       },
       "viewCenter": {
-        "x": 374.2603490174048,
-        "y": 808.3213254841643,
-        "z": 9.220050110115139
+        "x": 428.80234835298126,
+        "y": 659.8267214479052,
+        "z": -178.65010368546064
       },
       "contentRect": {
-        "x": 0,
-        "y": 0,
-        "width": 816.6263736263736,
-        "height": 718
+        "x": 151.5,
+        "y": 36,
+        "width": 707,
+        "height": 728
       },
-      "scale": 0.9862637362637363
+      "scale": 1
+    },
+    "773de0b0-468b-4fbb-965c-36c47d7a4c94": {
+      "position": {
+        "x": 433.07331399280594,
+        "y": 814.9751784221712,
+        "z": 23.244125830052145
+      },
+      "rotation": {
+        "x": -0.1012377572458486,
+        "y": 0.5301670223595103,
+        "z": 0.06394311957090087,
+        "w": 0.8393956887963046
+      },
+      "viewCenter": {
+        "x": 386.46429756621717,
+        "y": 802.3406297271067,
+        "z": 1.0661272242348012
+      },
+      "contentRect": {
+        "x": -191.57981134958806,
+        "y": -563.0322596330698,
+        "width": 707,
+        "height": 728
+      },
+      "scale": 0.35355339059327384
     },
     "19323c5d-5d36-438a-86ee-8288c690e5b0": {
       "position": {
-        "x": 32.65988615984831,
-        "y": 32.659886159848305,
-        "z": 32.6598861598483
+        "x": 59.766666666666666,
+        "y": 127.23333333333335,
+        "z": 5000
       },
       "rotation": {
-        "x": -0.27984814233312133,
-        "y": 0.3647051996310009,
-        "z": 0.11591689595929512,
-        "w": 0.8804762392171493
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
       },
       "viewCenter": {
         "x": 0,
@@ -1230,24 +1230,24 @@
         "z": 0
       },
       "contentRect": {
-        "x": 0,
-        "y": 0,
-        "width": 328,
-        "height": 692
+        "x": 164,
+        "y": 346,
+        "width": 318,
+        "height": 670.9024390243902
       },
-      "scale": 1
+      "scale": 0.9695121951219512
     },
     "9e293cde-e27b-4902-808b-e884f3e9da32": {
       "position": {
-        "x": 20.720258056029046,
-        "y": 20.72025805602904,
-        "z": 20.720258056029035
+        "x": 164.00000000000003,
+        "y": 346,
+        "z": 5000
       },
       "rotation": {
-        "x": -0.15122339243091582,
-        "y": 0.1970781619830922,
-        "z": 0.06263878009295416,
-        "w": 0.9666271602223464
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
       },
       "viewCenter": {
         "x": 0,
@@ -1257,35 +1257,35 @@
       "contentRect": {
         "x": 0,
         "y": 0,
-        "width": 328,
-        "height": 692
+        "width": 318,
+        "height": 670.9024390243902
       },
-      "scale": 1
+      "scale": 0.9695121951219512
     },
     "be14c61f-22d8-4bb9-b444-ad9f29740469": {
       "position": {
-        "x": 422.89747291648416,
-        "y": 834.7090541978248,
-        "z": 116.23115624388421
+        "x": 391.5,
+        "y": 364,
+        "z": 5000
       },
       "rotation": {
-        "x": -0.10769293488123756,
-        "y": 0.21039442221684093,
-        "z": 0.02332534036642414,
-        "w": 0.9713868165532707
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
       },
       "viewCenter": {
-        "x": 374.2603490174048,
-        "y": 808.3213254841643,
-        "z": 9.220050110115139
-      },
-      "contentRect": {
         "x": 0,
         "y": 0,
-        "width": 328,
-        "height": 692
+        "z": 0
       },
-      "scale": 1
+      "contentRect": {
+        "x": 230.28551532033424,
+        "y": 23.876757931924736,
+        "width": 772.2445054945055,
+        "height": 718
+      },
+      "scale": 0.9862637362637363
     }
   },
   "camera-uuids": [
@@ -1329,12 +1329,12 @@
     "03c1c065-f61b-4dfe-b086-93897b893c11",
     "7b74d860-8f78-42b8-a75a-5875ab0c5428",
     "895345bc-ea53-4a24-8f42-c415d0faee52",
-    "f631c866-c36b-443f-a8c0-a895176b7610",
-    "61f3d9f8-e63d-4508-bbf0-72254266e890",
-    "67c4d4d8-20c3-4295-bcd6-7629b4ae56b4",
-    "81b8ee31-5423-4299-bf1c-b770379a441f",
     "46b5ec40-b31e-48d8-b7ab-2b9c3db10ea3",
     "6a3f318c-4d9d-46e4-b3a7-60451b683572",
+    "81b8ee31-5423-4299-bf1c-b770379a441f",
+    "67c4d4d8-20c3-4295-bcd6-7629b4ae56b4",
+    "61f3d9f8-e63d-4508-bbf0-72254266e890",
+    "f631c866-c36b-443f-a8c0-a895176b7610",
     "773de0b0-468b-4fbb-965c-36c47d7a4c94",
     "19323c5d-5d36-438a-86ee-8288c690e5b0",
     "9e293cde-e27b-4902-808b-e884f3e9da32",

Some files were not shown because too many files changed in this diff