1

1

assets/data/csv/levels.csv

@@ -2,7 +2,7 @@ ID,关卡名称,名字多语言,关卡任务,任务多语言,地图,玩家点位
 敌人类型_属性",敌人射击精准度
 number,string,string,string,string,string,number,number,string,string,string,string,number
 id,name,name_lang,task,task_lang,map,point,coefficient,reward_1,reward_2,unlock,dispose,precision
-1,任务1,Task1,击杀所有敌军,Kill all the enemy troops,map1,1,0,1001_150,1001_30,100016|1/10,10001_4|10002_1|20003_1,0.2
+1,任务1,Task1,击杀所有敌军,Kill all the enemy troops,map1,1,0,1001_150,1001_30,100016|1/10,10001_5|10002_5|10003_5,0.2
 2,任务2,Task2,击杀所有敌军,Kill all the enemy troops,map1,2,0,1001_200,1001_30,100016|2/10,10001_4|10002_3,0.2
 3,任务3,Task3,击杀所有敌军,Kill all the enemy troops,map1,3,0,1001_250,1001_30,100016|3/10,10001_4|10002_2|10003_1,0.2
 4,任务4,Task4,击杀所有敌军,Kill all the enemy troops,map1,4,0,1001_300,1001_30,100016|4/10,10001_5|10002_3|10003_1,0.2

assets/prefabs/effects/Material/blood-001.mtl

@@ -0,0 +1,45 @@
+{
+  "__type__": "cc.Material",
+  "_name": "",
+  "_objFlags": 0,
+  "__editorExtras__": {},
+  "_native": "",
+  "_effectAsset": {
+    "__uuid__": "d1346436-ac96-4271-b863-1f4fdead95b0",
+    "__expectedType__": "cc.EffectAsset"
+  },
+  "_techIdx": 4,
+  "_defines": [
+    {},
+    {}
+  ],
+  "_states": [
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    }
+  ],
+  "_props": [
+    {
+      "mainTexture": {
+        "__uuid__": "b5b27ab1-e740-4398-b407-848fc2b2c897@6c48a",
+        "__expectedType__": "cc.Texture2D"
+      }
+    },
+    {}
+  ]
+}

assets/prefabs/effects/Material/blood-001.mtl.meta

@@ -0,0 +1 @@
+{"ver":"1.0.21","importer":"material","imported":true,"uuid":"97f3ee31-409f-4172-b7b5-9dc0488c06e7","files":[".json"],"subMetas":{},"userData":{}}

assets/prefabs/effects/Material/blood.mtl

@@ -0,0 +1,45 @@
+{
+  "__type__": "cc.Material",
+  "_name": "",
+  "_objFlags": 0,
+  "__editorExtras__": {},
+  "_native": "",
+  "_effectAsset": {
+    "__uuid__": "d1346436-ac96-4271-b863-1f4fdead95b0",
+    "__expectedType__": "cc.EffectAsset"
+  },
+  "_techIdx": 4,
+  "_defines": [
+    {},
+    {}
+  ],
+  "_states": [
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    }
+  ],
+  "_props": [
+    {
+      "mainTexture": {
+        "__uuid__": "3a581f40-89ac-488e-9ebc-05e6e6f99b68@6c48a",
+        "__expectedType__": "cc.Texture2D"
+      }
+    },
+    {}
+  ]
+}

assets/prefabs/effects/Material/blood.mtl.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "1.0.21",
+  "importer": "material",
+  "imported": true,
+  "uuid": "a0c4e2a7-f075-45da-9abc-809afb1526f8",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

assets/prefabs/effects/Prefabs/blood.prefab.meta

@@ -2,7 +2,7 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "5863ff8c-cded-4bbf-9cdf-eaeb087c9ba0",
+  "uuid": "9b27dc8f-19c9-40db-bd55-da0a52926e6b",
   "files": [
     ".json"
   ],

assets/prefabs/effects/Textrue/blood1.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "3a581f40-89ac-488e-9ebc-05e6e6f99b68",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "3a581f40-89ac-488e-9ebc-05e6e6f99b68@6c48a",
+      "displayName": "blood1",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "3a581f40-89ac-488e-9ebc-05e6e6f99b68",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "3a581f40-89ac-488e-9ebc-05e6e6f99b68@f9941",
+      "displayName": "blood1",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 188,
+        "height": 248,
+        "rawWidth": 188,
+        "rawHeight": 248,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -94,
+            -124,
+            0,
+            94,
+            -124,
+            0,
+            -94,
+            124,
+            0,
+            94,
+            124,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            248,
+            188,
+            248,
+            0,
+            0,
+            188,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -94,
+            -124,
+            0
+          ],
+          "maxPos": [
+            94,
+            124,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "3a581f40-89ac-488e-9ebc-05e6e6f99b68@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "3a581f40-89ac-488e-9ebc-05e6e6f99b68@6c48a"
+  }
+}

assets/prefabs/enemy/enemy/tank.prefab

@@ -22,23 +22,23 @@
         "__id__": 2
       },
       {
-        "__id__": 59
+        "__id__": 68
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 89
+        "__id__": 98
       },
       {
-        "__id__": 91
+        "__id__": 100
       },
       {
-        "__id__": 93
+        "__id__": 102
       }
     ],
     "_prefab": {
-      "__id__": 95
+      "__id__": 104
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -94,11 +94,11 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 58
+      "__id__": 67
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -0.203,
+      "x": -0.612,
       "y": 0,
       "z": -0.382
     },
@@ -234,7 +234,7 @@
       "__type__": "cc.Vec3",
       "x": 0.525,
       "y": 2.145,
-      "z": 4.925
+      "z": 0.91
     },
     "_lrot": {
       "__type__": "cc.Quat",
@@ -638,43 +638,43 @@
         "__id__": 39
       },
       {
-        "__id__": 40
+        "__id__": 41
       },
       {
-        "__id__": 41
+        "__id__": 43
       },
       {
-        "__id__": 42
+        "__id__": 45
       },
       {
-        "__id__": 44
+        "__id__": 47
       },
       {
-        "__id__": 46
+        "__id__": 49
       },
       {
-        "__id__": 47
+        "__id__": 51
       },
       {
-        "__id__": 48
+        "__id__": 53
       },
       {
-        "__id__": 49
+        "__id__": 55
       },
       {
-        "__id__": 50
+        "__id__": 57
       },
       {
-        "__id__": 51
+        "__id__": 59
       },
       {
-        "__id__": 53
+        "__id__": 61
       },
       {
-        "__id__": 55
+        "__id__": 63
       },
       {
-        "__id__": 57
+        "__id__": 65
       }
     ],
     "removedComponents": []
@@ -698,7 +698,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 38
+      "__id__": 40
     },
     "propertyPath": [
       "_lpos"
@@ -710,10 +710,16 @@
       "z": 0
     }
   },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "3cYuC9cp9d66h6cErBCj7a"
+    ]
+  },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 38
+      "__id__": 42
     },
     "propertyPath": [
       "_lrot"
@@ -726,10 +732,16 @@
       "w": 0.7071067811865476
     }
   },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "3cYuC9cp9d66h6cErBCj7a"
+    ]
+  },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 38
+      "__id__": 44
     },
     "propertyPath": [
       "_euler"
@@ -737,14 +749,20 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -90,
+      "y": -89.99999999999999,
       "z": 0
     }
   },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "3cYuC9cp9d66h6cErBCj7a"
+    ]
+  },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 43
+      "__id__": 46
     },
     "propertyPath": [
       "playOnLoad"
@@ -760,7 +778,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 45
+      "__id__": 48
     },
     "propertyPath": [
       "_lscale"
@@ -781,7 +799,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 45
+      "__id__": 50
     },
     "propertyPath": [
       "_lrot"
@@ -794,10 +812,16 @@
       "w": 0.7071067811865476
     }
   },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "29H7a4gaZZpICa3gp+bocT"
+    ]
+  },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 45
+      "__id__": 52
     },
     "propertyPath": [
       "_euler"
@@ -809,40 +833,64 @@
       "z": 0
     }
   },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "29H7a4gaZZpICa3gp+bocT"
+    ]
+  },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 38
+      "__id__": 54
     },
     "propertyPath": [
       "_active"
     ],
     "value": false
   },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "3cYuC9cp9d66h6cErBCj7a"
+    ]
+  },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 38
+      "__id__": 56
     },
     "propertyPath": [
       "_layer"
     ],
     "value": 8388608
   },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "3cYuC9cp9d66h6cErBCj7a"
+    ]
+  },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 45
+      "__id__": 58
     },
     "propertyPath": [
       "_layer"
     ],
     "value": 8388608
   },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "29H7a4gaZZpICa3gp+bocT"
+    ]
+  },
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 52
+      "__id__": 60
     },
     "propertyPath": [
       "_layer"
@@ -858,7 +906,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 54
+      "__id__": 62
     },
     "propertyPath": [
       "_layer"
@@ -874,7 +922,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 56
+      "__id__": 64
     },
     "propertyPath": [
       "_layer"
@@ -890,7 +938,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 45
+      "__id__": 66
     },
     "propertyPath": [
       "_lpos"
@@ -902,6 +950,12 @@
       "z": 0
     }
   },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "29H7a4gaZZpICa3gp+bocT"
+    ]
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -925,29 +979,29 @@
     },
     "_children": [
       {
-        "__id__": 60
+        "__id__": 69
       },
       {
-        "__id__": 64
+        "__id__": 73
       },
       {
-        "__id__": 74
+        "__id__": 83
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 82
+        "__id__": 91
       },
       {
-        "__id__": 84
+        "__id__": 93
       },
       {
-        "__id__": 86
+        "__id__": 95
       }
     ],
     "_prefab": {
-      "__id__": 88
+      "__id__": 97
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -984,17 +1038,17 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 59
+      "__id__": 68
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 61
+        "__id__": 70
       }
     ],
     "_prefab": {
-      "__id__": 63
+      "__id__": 72
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1031,11 +1085,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 60
+      "__id__": 69
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 62
+      "__id__": 71
     },
     "_projection": 0,
     "_priority": 8,
@@ -1096,31 +1150,31 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 59
+      "__id__": 68
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 65
+        "__id__": 74
       },
       {
-        "__id__": 67
+        "__id__": 76
       },
       {
-        "__id__": 69
+        "__id__": 78
       },
       {
-        "__id__": 71
+        "__id__": 80
       }
     ],
     "_prefab": {
-      "__id__": 73
+      "__id__": 82
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0.01,
-      "y": 1.063,
+      "y": 0.998,
       "z": 0.002
     },
     "_lrot": {
@@ -1152,11 +1206,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 64
+      "__id__": 73
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 66
+      "__id__": 75
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1180,11 +1234,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 64
+      "__id__": 73
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 68
+      "__id__": 77
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1225,14 +1279,14 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 64
+      "__id__": 73
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 70
+      "__id__": 79
     },
     "_barSprite": {
-      "__id__": 67
+      "__id__": 76
     },
     "_mode": 0,
     "_totalLength": 0.65,
@@ -1250,11 +1304,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 64
+      "__id__": 73
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 72
+      "__id__": 81
     },
     "_alignFlags": 18,
     "_target": {
@@ -1265,7 +1319,7 @@
     "_top": 1597.868,
     "_bottom": 2.0320000000000507,
     "_horizontalCenter": 0.01,
-    "_verticalCenter": 1.063,
+    "_verticalCenter": 0.998,
     "_isAbsLeft": true,
     "_isAbsRight": true,
     "_isAbsTop": true,
@@ -1301,28 +1355,28 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 59
+      "__id__": 68
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 75
+        "__id__": 84
       },
       {
-        "__id__": 77
+        "__id__": 86
       },
       {
-        "__id__": 79
+        "__id__": 88
       }
     ],
     "_prefab": {
-      "__id__": 81
+      "__id__": 90
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0.018,
-      "y": 1.158,
+      "y": 1.093,
       "z": 0
     },
     "_lrot": {
@@ -1354,11 +1408,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 74
+      "__id__": 83
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 76
+      "__id__": 85
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1382,11 +1436,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 74
+      "__id__": 83
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 78
+      "__id__": 87
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1450,11 +1504,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 74
+      "__id__": 83
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 80
+      "__id__": 89
     },
     "_opacity": 255,
     "_id": ""
@@ -1482,11 +1536,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 68
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 83
+      "__id__": 92
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1510,14 +1564,14 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 68
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 94
     },
     "_cameraComponent": {
-      "__id__": 61
+      "__id__": 70
     },
     "_alignCanvasWithScreen": true,
     "_id": ""
@@ -1532,11 +1586,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 68
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 87
+      "__id__": 96
     },
     "_alignFlags": 45,
     "_target": null,
@@ -1585,7 +1639,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 90
+      "__id__": 99
     },
     "_opacity": 255,
     "_id": ""
@@ -1604,7 +1658,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 92
+      "__id__": 101
     },
     "_id": ""
   },
@@ -1622,7 +1676,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 94
+      "__id__": 103
     },
     "_contentSize": {
       "__type__": "cc.Size",

assets/prefabs/enemy/gun/tank_pao.prefab

@@ -41,7 +41,7 @@
       "__type__": "cc.Vec3",
       "x": 0.525,
       "y": 2.145,
-      "z": 4.925
+      "z": 0.91
     },
     "_lrot": {
       "__type__": "cc.Quat",
@@ -84,7 +84,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": -0.694,
-      "z": 1.775
+      "z": 0.163
     },
     "_lrot": {
       "__type__": "cc.Quat",
@@ -117,7 +117,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "96GAVzqzZCYJjftvRVEnU3",
+    "fileId": "61lG55iV1A1qC54CCa8bbV",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -146,9 +146,9 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -0.015,
+      "x": -0.594,
       "y": -0.006,
-      "z": 0.045
+      "z": -2.034
     },
     "_lrot": {
       "__type__": "cc.Quat",
@@ -394,7 +394,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "a4R2KabyNEb4HKiZihzl9D"
+    "fileId": "4c+HZPKBBGT4BAYQth/TAC"
   },
   {
     "__type__": "cc.GradientRange",
@@ -974,7 +974,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "f2V/E/IrpEQr1BSaJQhmNe",
+    "fileId": "46WNOJB3FOa5ibYZOdjcjn",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -1150,7 +1150,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "3cYj18E0hF66bZvuxiEHgX"
+    "fileId": "c9w1duKQBAuKByBxpL25gC"
   },
   {
     "__type__": "cc.GradientRange",
@@ -1736,7 +1736,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "45CD5TcRRMAaHm0bR086XC",
+    "fileId": "44VnuHdD5HqKOFQ94/Vvd9",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -1749,7 +1749,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "ea8F/OsBtNbrR1g776srhH",
+    "fileId": "d8AoVvvm9F8IjVBB4+A1HG",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -1770,7 +1770,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "11oCTFNG1FM6q0ubz37AJT"
+    "fileId": "0eZjBBFUxBFIF89op0PZz3"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1780,7 +1780,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "e3ZNRTMIlF3KHgXoOtKbb9",
+    "fileId": "ccDpM1NjBHJ5y4TEAjwHKG",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -1805,9 +1805,9 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -0.015,
+      "x": -0.594,
       "y": -0.006,
-      "z": 0.045
+      "z": -2.034
     },
     "_lrot": {
       "__type__": "cc.Quat",
@@ -2054,7 +2054,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "258E9YR7dAepB4zRAdK2p/"
+    "fileId": "61yKy+i4lJ64jFAQYm6bCT"
   },
   {
     "__type__": "cc.GradientRange",
@@ -2680,7 +2680,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "61t75/OC1DhYRqALd8mMm8",
+    "fileId": "d1xL8PgI9MDIeZZynHGegj",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -2801,7 +2801,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "b0RZNAcQ1AarvP7paJp6JA"
+    "fileId": "1cOD+yAgpDKarsdTUM9Frm"
   },
   {
     "__type__": "cc.GradientRange",
@@ -3275,7 +3275,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "d2nWqJgbFEXIiN43pUOxnu",
+    "fileId": "a7wXkXVSVPWr0lHKHn6c17",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3288,7 +3288,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "c3sidvt1xHTLjDNmhbhbsD",
+    "fileId": "9ap7FYjP5K9pGRAI96s1eE",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3318,7 +3318,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "75yv+XB6VKCaC4bEVP4lxj"
+    "fileId": "06zGhP959KLqdvoYL9pKvA"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3328,7 +3328,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "380FqOuA1E2oF1DS67W7qq",
+    "fileId": "97mK+GpcBH34aC7fUfA75A",
     "targetOverrides": null
   }
 ]

assets/scripts/game/Enemy.ts

@@ -200,7 +200,7 @@ export class Enemy extends BaseExp {
         let gunPos:Node = this.enemyNode.getChildByName("gun_pos");
         const mainWeaponID:number = this.data.weapon_id_1;
         let mData:any = userIns.enemyWeaponTable.find(e=>e.gun_id == mainWeaponID);
-        let gunNode:Node = await ResUtil.loadRes(`enemy/gun/${mData.gun_prb_name}`,this.enemyNode) as Node;
+        let gunNode:Node = await ResUtil.loadRes(`enemy/gun/${mData.gun_prb_name}`) as Node;
         this.gun = gunNode.getComponent(GunBase);
         gunNode.active = true;
         gunNode.parent = gunPos.parent;
@@ -258,7 +258,7 @@ export class Enemy extends BaseExp {
             ResUtil.playParticle(
                 `effects/Prefabs/HeavySmoke`, 
                 0, 
-                new Vec3(0.18,0.18,0.18),
+                new Vec3(0.2,0.2,0.2),
                 (heavySmoke) => { 
                     heavySmoke.parent = this.node.parent; 
                     heavySmoke.worldPosition = this.node.worldPosition.clone();
@@ -383,6 +383,7 @@ export class Enemy extends BaseExp {
                     }
                 }
             );
+            this.node.active = false;
             recycleTime = 3;
         }
         this.isDead = true;
@@ -411,16 +412,12 @@ export class Enemy extends BaseExp {
             ResUtil.playParticle(
                 `effects/Prefabs/blood`, 
                 1, 
-                new Vec3(0.1,0.1,0.1),
+                new Vec3(0.35,0.35,0.35),
                 (blood) => { 
                     blood.active = true;
                     blood.setParent(this.raycastResults.collider.node.parent);
                     blood.worldPosition = this.raycastResults.hitPoint.add(this.raycastResults.hitNormal.multiplyScalar(0.01));
                     blood.forward = this.raycastResults.hitNormal.multiplyScalar(-1);
-                    /*blood.active = true;
-                    blood.parent = this.enemyNode.parent; 
-                    const targetPos: Vec3 = this.enemyNode.worldPosition.clone();
-                    blood.worldPosition = new Vec3(targetPos.x,targetPos.y - 0.2,targetPos.z);*/
                 }
             );
         }

assets/scripts/game/Player.ts

@@ -123,8 +123,11 @@ export class Player extends BaseExp {
     public reloadMagazine(data:any){
         if(!data || this.isReloadMagazine)return;
         this.isReloadMagazine = true; 
-        const factor: number = 130;
-        let time: number = data.reloadingSpeed / factor;
+        //基准速度值 基准时间3秒
+        const baseSpeed = 450; 
+        const baseTime = 3;
+        //时间 = (基准速度 / 当前速度) * 基准时间
+        let time: number = (baseSpeed / data.reloadingSpeed) * baseTime;
         //换弹匣动画
         ResUtil.playSkeletalAnim(this.player_skeletal,PAnimType.reload,time);
         this.shootUI.reloadMagazineing(time,()=>{

assets/scripts/game/Sundries.ts

@@ -1,4 +1,4 @@
-import { _decorator, Animation, Collider, Enum, Node, RigidBody, Vec3 } from 'cc';
+import { _decorator, Animation, AnimationState, Collider, Enum, native, Node, PhysicsRayResult, RigidBody, Vec3 } from 'cc';
 import { BaseExp } from '../core/base/BaseExp';
 import { PoolManager } from '../core/manager/PoolManager';
 import { userIns } from '../data/UserData';
@@ -41,7 +41,8 @@ export class Sundries extends BaseExp {
     private static explosionQueue: { 
         target: Enemy | Sundries, 
         damage: number, 
-        source: any }[] = [];
+        source: any,
+        explosionTarget:any}[] = [];
     //标记是否正在处理爆炸队列
     private static isProcessingQueue = false;
 
@@ -84,8 +85,9 @@ export class Sundries extends BaseExp {
      * 杂物被打掉血
      * @param hp 血
      * @param pData 玩家数据
+     * @param target 这儿指的是谁打的我
      */
-    public subHP(hp: number, pData:any){
+    public subHP(hp: number, pData:any,target:Node){
         if(!this.node
             ||Game.I.isPause
             ||this.isDead
@@ -100,7 +102,7 @@ export class Sundries extends BaseExp {
         if(this.totalHp <= 0 
             && !this.isDead){
             this.isDead = true;
-            this.scrap();
+            this.scrap(target);
         }
     }
     
@@ -108,35 +110,47 @@ export class Sundries extends BaseExp {
      * 军车冒浓烟
      */
     public milityaryTruckHeavySmoke(){
-        if(this.obstacleType == ObstacleType.MILITARY_TRUCK){
-            if(this.heavySmoke)return;
-            //血量过低冒浓烟
-            if(this.totalHp < this.data.hp  * 0.3){
-                ResUtil.playParticle(
-                    `effects/Prefabs/HeavySmoke`, 
-                    0, 
-                    new Vec3(0.18,0.18,0.18),
-                    (heavySmoke) => { 
-                        heavySmoke.parent = this.node.parent; 
-                        heavySmoke.worldPosition = this.node.worldPosition.clone();
-                        heavySmoke.active = true;
-                        this.heavySmoke = heavySmoke;
-                    }
-                );
-            }
+        if(this.obstacleType != ObstacleType.MILITARY_TRUCK)return;
+        if(this.heavySmoke)return;
+        //血量过低冒浓烟
+        if(this.totalHp < this.data.hp  * 0.3){
+            ResUtil.playParticle(
+                `effects/Prefabs/HeavySmoke`, 
+                0, 
+                new Vec3(0.18,0.18,0.18),
+                (heavySmoke) => { 
+                    heavySmoke.parent = this.node.parent; 
+                    heavySmoke.worldPosition = this.node.worldPosition.clone();
+                    heavySmoke.active = true;
+                    this.heavySmoke = heavySmoke;
+                }
+            );
         }
     }
 
     /**
      * 杂物被打报废
      */
-    public scrap(){
+    public scrap(target:Node){
         switch (this.obstacleType) {
             case ObstacleType.SANDBAG_PILE:{//沙袋堆
                     //沙袋掀开的动画
                     let anim:Animation = this.node.getComponent(Animation);
                     if(!anim)return;
-                    anim.getState(sandbge_take).repeatCount = 1;
+                    //参考物位置坐标 用于计算查沙袋旋开的的方向
+                    let refePos: Vec3 = target.worldPosition.clone();
+                    let selfPos: Vec3 = this.node.worldPosition.clone();
+                    //计算方向向量
+                    let direction = new Vec3();
+                    Vec3.subtract(direction, refePos, selfPos).normalize();
+                    //根据方向调整沙袋的旋转
+                    let relativeAngle = Math.atan2(direction.x, direction.z) * 180 / Math.PI;
+                    const initialRotation = this.node.eulerAngles.y;
+                    this.node.setRotationFromEuler(0, initialRotation + relativeAngle - 85, 0);
+                    //播放动画
+                    let animState:AnimationState = anim.getState(sandbge_take);
+                    animState.speed = 1;
+                    animState.repeatCount = 1;
                     anim.play(sandbge_take);
                 }
                 break;
@@ -263,7 +277,8 @@ export class Sundries extends BaseExp {
                         Sundries.explosionQueue.push({
                             target: e,
                             damage: damage,
-                            source: this.data
+                            source: this.data,
+                            explosionTarget: this.node
                         });
                         if(!Sundries.isProcessingQueue) {
                             this.processExplosionQueue();
@@ -274,8 +289,8 @@ export class Sundries extends BaseExp {
         })
     }
 
-     /**
-     * 处理爆炸队列（新增方法）
+    /**
+     * 处理爆炸队列
      */
     private processExplosionQueue() {
         if (Sundries.explosionQueue.length == 0) {
@@ -285,7 +300,7 @@ export class Sundries extends BaseExp {
         Sundries.isProcessingQueue = true;
         const explosion = Sundries.explosionQueue.shift()!;
         //触发当前爆炸
-        explosion.target.subHP(explosion.damage, explosion.source);
+        explosion.target.subHP(explosion.damage, explosion.source,explosion.explosionTarget);
         //添加0.2秒延迟后处理下一个爆炸
         this.scheduleOnce(()=>{
             this.processExplosionQueue();

assets/scripts/items/player/Bullet1.ts

@@ -130,7 +130,7 @@ export class Bullet1 extends BulletBase {
                     }
                 }else if(cls instanceof Sundries){
                     const sundrie: Sundries = cls as Sundries;
-                    sundrie.subHP(attack,this.gunBase.data);
+                    sundrie.subHP(attack,this.gunBase.data,Game.I.player.node);
                 }
             }
             //自动回收了子弹

assets/scripts/items/player/Bullet2.ts

@@ -129,7 +129,7 @@ export class Bullet2 extends BulletBase {
                     }
                 }else if(cls instanceof Sundries){
                     const sundrie: Sundries = cls as Sundries;
-                    sundrie.subHP(attack,this.gunBase.data);
+                    sundrie.subHP(attack,this.gunBase.data,Game.I.player.node);
                 }
             }
             //自动回收了子弹

assets/scripts/items/player/Bullet3.ts

@@ -127,7 +127,7 @@ export class Bullet3 extends BulletBase {
                     }
                 }else if(cls instanceof Sundries){
                     const sundrie: Sundries = cls as Sundries;
-                    sundrie.subHP(attack,this.gunBase.data);
+                    sundrie.subHP(attack,this.gunBase.data,Game.I.player.node);
                 }
             }
             //自动回收了子弹

assets/scripts/ui/GunfightShootUI.ts

@@ -518,6 +518,13 @@ export class GunfightShootUI extends BaseExp {
         }
     }
 
+    /**
+     * //基准速度值 基准时间3秒
+        const baseSpeed = 450; 
+        const baseTime = 3;
+        //时间 = (基准速度 / 当前速度) * 基准时间
+        let time: number = (baseSpeed / data.reloadingSpeed) * baseTime;
+     */
     /**
      * 每帧更新，处理视野渐变和检查 2 秒时间限制
      * @param deltaTime - 上一帧到当前帧的时间间隔

assets/scripts/ui/TossBoomerangUI.ts

@@ -76,7 +76,7 @@ export class TossBoomerangUI extends BaseExp {
            target_plate = event.target;
         }else{
            //获取靶心
-           let r:number = Utils.getRandomInt(0,this.content.children.length);
+           let r:number = Utils.getRandomInt(0,this.content.children.length - 1);
            target_plate = this.content.children[r];
         }
         audioMgr.playOneShot(Constants.audios.dart);

profiles/v2/packages/reference-image.json

@@ -3,6 +3,6 @@
   "config": {
     "images": [],
     "sceneUUID": {},
-    "scene": "10795865-5525-41fc-8bf7-0e8d6983b214"
+    "scene": "2a6d10bc-9c1e-4420-ae90-e9ba997eea5f"
   }
 }

profiles/v2/packages/scene.json

@@ -92,31 +92,6 @@
       },
       "scale": 1
     },
-    "28a9f61c-c9ee-4b56-acdd-86ed85c7d066": {
-      "position": {
-        "x": 4.786734125253588,
-        "y": 5.071690514704862,
-        "z": 5.734445036302532
-      },
-      "rotation": {
-        "x": -0.23490526580384027,
-        "y": 0.36251289587051955,
-        "z": 0.09494742203308758,
-        "w": 0.8968773068120677
-      },
-      "viewCenter": {
-        "x": -0.12900000000000006,
-        "y": 1.093,
-        "z": 0.647
-      },
-      "contentRect": {
-        "x": 0,
-        "y": 0,
-        "width": 1120,
-        "height": 950
-      },
-      "scale": 1
-    },
     "a2423517-560c-435d-97c6-1e8ab247f69f": {
       "position": {
         "x": 4,
@@ -342,31 +317,6 @@
       },
       "scale": 1
     },
-    "dd6c53c6-4cf3-4691-9db1-5959a144930a": {
-      "position": {
-        "x": -0.15699999999998226,
-        "y": 0.9830000000000005,
-        "z": 8.960285523974562
-      },
-      "rotation": {
-        "x": 0,
-        "y": 0,
-        "z": 0,
-        "w": 1
-      },
-      "viewCenter": {
-        "x": -0.157,
-        "y": 0.983,
-        "z": 0.24
-      },
-      "contentRect": {
-        "x": 0,
-        "y": 0,
-        "width": 1322,
-        "height": 950
-      },
-      "scale": 1
-    },
     "94719fcd-0e99-4a54-9b20-bc0a31782638": {
       "position": {
         "x": 0.22000000000002728,
@@ -392,31 +342,6 @@
       },
       "scale": 1
     },
-    "f4a95669-6998-4e14-855c-0d5242a730f4": {
-      "position": {
-        "x": 4,
-        "y": 0.64,
-        "z": 6.320285523974251
-      },
-      "rotation": {
-        "x": 0,
-        "y": 0,
-        "z": 0,
-        "w": 1
-      },
-      "viewCenter": {
-        "x": 4,
-        "y": 0.64,
-        "z": -2.4
-      },
-      "contentRect": {
-        "x": 0,
-        "y": 0,
-        "width": 1322,
-        "height": 950
-      },
-      "scale": 1
-    },
     "7e326685-ca67-4439-866a-c9458fd31e3a": {
       "position": {
         "x": 7.174389352417258,
@@ -767,31 +692,6 @@
       },
       "scale": 0.6745512671698497
     },
-    "6cd0f89e-0f4d-4300-9dca-c0d0eb842b99": {
-      "position": {
-        "x": 358.9300315587462,
-        "y": 801.5182752761111,
-        "z": 9.083267664309048
-      },
-      "rotation": {
-        "x": -0.043221163147808474,
-        "y": -0.075887101510299,
-        "z": -0.0032925266634503173,
-        "w": 0.9961737991679397
-      },
-      "viewCenter": {
-        "x": 360.2460000000001,
-        "y": 800.7630000000001,
-        "z": 0.496
-      },
-      "contentRect": {
-        "x": -1254.6204312067482,
-        "y": -631.0852101688064,
-        "width": 1168,
-        "height": 960
-      },
-      "scale": 0.6745512671698497
-    },
     "579247ec-5b8a-472e-bcb6-3e024b1a3564": {
       "position": {
         "x": 360.0000000000001,
@@ -1092,11 +992,11 @@
       },
       "scale": 1
     },
-    "19e8fe53-474f-4461-a8d9-43df1cbc342b": {
+    "f79acc7f-362d-4f94-8d88-fcb435e33b12": {
       "position": {
         "x": 0,
         "y": 0,
-        "z": 8.720285523354619
+        "z": 28.800856570063864
       },
       "rotation": {
         "x": 0,
@@ -1107,7 +1007,7 @@
       "viewCenter": {
         "x": 0,
         "y": 0,
-        "z": 0
+        "z": 2.64
       },
       "contentRect": {
         "x": 0,
@@ -1117,11 +1017,11 @@
       },
       "scale": 1
     },
-    "bb029c41-795e-4cc9-a143-8705fe3268fb": {
+    "24fa125d-82fa-4b02-888f-390a9c63f1b5": {
       "position": {
         "x": 0,
         "y": 0,
-        "z": 8.720285523354619
+        "z": 43.14724608216419
       },
       "rotation": {
         "x": 0,
@@ -1142,11 +1042,11 @@
       },
       "scale": 1
     },
-    "f79acc7f-362d-4f94-8d88-fcb435e33b12": {
+    "24d88106-b48c-41ec-b461-8bda34954648": {
       "position": {
         "x": 0,
         "y": 0,
-        "z": 28.800856570063864
+        "z": 26.160856570063864
       },
       "rotation": {
         "x": 0,
@@ -1157,7 +1057,7 @@
       "viewCenter": {
         "x": 0,
         "y": 0,
-        "z": 2.64
+        "z": 0
       },
       "contentRect": {
         "x": 0,
@@ -1167,17 +1067,67 @@
       },
       "scale": 1
     },
-    "24fa125d-82fa-4b02-888f-390a9c63f1b5": {
+    "b824d4a8-95d2-4112-8d63-f7df26c184ee": {
       "position": {
+        "x": 715.8393654910127,
+        "y": 1621.6286715997805,
+        "z": 27.57258722523319
+      },
+      "rotation": {
+        "x": -0.2846542466175249,
+        "y": -0.07026697588572546,
+        "z": -0.02092626361970454,
+        "w": 0.9558224748735525
+      },
+      "viewCenter": {
+        "x": 720.3194368331041,
+        "y": 1601.60578966767,
+        "z": -2.733330505217628
+      },
+      "contentRect": {
         "x": 0,
         "y": 0,
-        "z": 43.14724608216419
+        "width": 1168,
+        "height": 960
+      },
+      "scale": 1
+    },
+    "eec55ad7-7716-4dec-ae04-01c7f735325e": {
+      "position": {
+        "x": 358.7617870743131,
+        "y": 800.7957869246702,
+        "z": 3.160358841454581
       },
       "rotation": {
+        "x": -0.05450017700573181,
+        "y": -0.18533800384357815,
+        "z": -0.0102954522840273,
+        "w": 0.9811083317859904
+      },
+      "viewCenter": {
+        "x": 360,
+        "y": 800.4175194740295,
+        "z": 0
+      },
+      "contentRect": {
         "x": 0,
         "y": 0,
-        "z": 0,
-        "w": 1
+        "width": 1168,
+        "height": 960
+      },
+      "scale": 1
+    },
+    "19486281-e3c1-4739-9220-c9ac2a1c94cb": {
+      "position": {
+        "x": -2.8410259762020718,
+        "y": 8.07315727582855,
+        "z": 8.135688107937888
+      },
+      "rotation": {
+        "x": -0.36239979059190763,
+        "y": -0.15548988977610456,
+        "z": -0.06145629360646724,
+        "w": 0.9169037081027168
       },
       "viewCenter": {
         "x": 0,
@@ -1187,16 +1137,16 @@
       "contentRect": {
         "x": 0,
         "y": 0,
-        "width": 1168,
+        "width": 1146,
         "height": 960
       },
       "scale": 1
     },
-    "24d88106-b48c-41ec-b461-8bda34954648": {
+    "bb029c41-795e-4cc9-a143-8705fe3268fb": {
       "position": {
         "x": 0,
         "y": 0,
-        "z": 26.160856570063864
+        "z": 8.720285523354619
       },
       "rotation": {
         "x": 0,
@@ -1212,139 +1162,188 @@
       "contentRect": {
         "x": 0,
         "y": 0,
-        "width": 1168,
+        "width": 1146,
         "height": 960
       },
       "scale": 1
     },
-    "b824d4a8-95d2-4112-8d63-f7df26c184ee": {
+    "19e8fe53-474f-4461-a8d9-43df1cbc342b": {
       "position": {
-        "x": 715.8393654910127,
-        "y": 1621.6286715997805,
-        "z": 27.57258722523319
+        "x": 0,
+        "y": 0,
+        "z": 7.486118790521129
       },
       "rotation": {
-        "x": -0.2846542466175249,
-        "y": -0.07026697588572546,
-        "z": -0.02092626361970454,
-        "w": 0.9558224748735525
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
       },
       "viewCenter": {
-        "x": 720.3194368331041,
-        "y": 1601.60578966767,
-        "z": -2.733330505217628
+        "x": 0,
+        "y": 0,
+        "z": 0
       },
       "contentRect": {
         "x": 0,
         "y": 0,
-        "width": 1168,
+        "width": 1146,
         "height": 960
       },
       "scale": 1
     },
-    "eec55ad7-7716-4dec-ae04-01c7f735325e": {
+    "28a9f61c-c9ee-4b56-acdd-86ed85c7d066": {
       "position": {
-        "x": 358.7617870743131,
-        "y": 800.7957869246702,
-        "z": 3.160358841454581
+        "x": 4.786734125253588,
+        "y": 5.071690514704869,
+        "z": 5.734445036302532
       },
       "rotation": {
-        "x": -0.05450017700573181,
-        "y": -0.18533800384357815,
-        "z": -0.0102954522840273,
-        "w": 0.9811083317859904
+        "x": -0.23490526580384027,
+        "y": 0.36251289587051955,
+        "z": 0.09494742203308758,
+        "w": 0.8968773068120677
       },
       "viewCenter": {
-        "x": 360,
-        "y": 800.4175194740295,
-        "z": 0
+        "x": -0.12900000000000006,
+        "y": 1.093,
+        "z": 0.647
       },
       "contentRect": {
         "x": 0,
         "y": 0,
-        "width": 1168,
+        "width": 1146,
         "height": 960
       },
       "scale": 1
     },
-    "5863ff8c-cded-4bbf-9cdf-eaeb087c9ba0": {
+    "f4a95669-6998-4e14-855c-0d5242a730f4": {
       "position": {
-        "x": 1.2373695042620056,
-        "y": 12.184405239893294,
-        "z": 1.220294517057926
+        "x": 2.3651250096453484,
+        "y": 16.317538896009005,
+        "z": 20.584236923597786
       },
       "rotation": {
-        "x": -0.3336487781467022,
-        "y": 0.050825656131721075,
-        "z": 0.018018220800622164,
-        "w": 0.9411538605558459
+        "x": -0.2941101513774997,
+        "y": -0.03392583303047346,
+        "z": -0.010446869964054178,
+        "w": 0.9551120979329321
       },
       "viewCenter": {
-        "x": 0.5079524119201959,
-        "y": 6.691835325660116,
-        "z": -5.513427043230154
+        "x": 4,
+        "y": 0.64,
+        "z": -2.4
       },
       "contentRect": {
         "x": 0,
         "y": 0,
-        "width": 1168,
+        "width": 1146,
         "height": 960
       },
       "scale": 1
     },
-    "19486281-e3c1-4739-9220-c9ac2a1c94cb": {
+    "dd6c53c6-4cf3-4691-9db1-5959a144930a": {
       "position": {
-        "x": -9.343397084590336,
-        "y": 26.550518997806208,
-        "z": 26.75616667555356
+        "x": -0.15699999999998226,
+        "y": 0.9830000000000005,
+        "z": 8.960285523974562
       },
       "rotation": {
-        "x": -0.36239979059190763,
-        "y": -0.15548988977610456,
-        "z": -0.06145629360646724,
-        "w": 0.9169037081027168
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
       },
       "viewCenter": {
+        "x": -0.157,
+        "y": 0.983,
+        "z": 0.24
+      },
+      "contentRect": {
         "x": 0,
         "y": 0,
-        "z": 0
+        "width": 1146,
+        "height": 960
+      },
+      "scale": 1
+    },
+    "6cd0f89e-0f4d-4300-9dca-c0d0eb842b99": {
+      "position": {
+        "x": 361.78309953426884,
+        "y": 806.5272192274899,
+        "z": 5.658528738240156
+      },
+      "rotation": {
+        "x": -0.3941078528578061,
+        "y": 0.13225858718170325,
+        "z": 0.05742547821460635,
+        "w": 0.9076833042886343
+      },
+      "viewCenter": {
+        "x": 360.2460000000001,
+        "y": 800.7630000000001,
+        "z": 0.496
       },
       "contentRect": {
         "x": 0,
         "y": 0,
-        "width": 1168,
+        "width": 1146,
         "height": 960
       },
       "scale": 1
     },
     "10795865-5525-41fc-8bf7-0e8d6983b214": {
       "position": {
-        "x": 93.2,
-        "y": 207.1111111111111,
-        "z": 1931.0844078905418
+        "x": 57.87676483299855,
+        "y": 430.0268517758352,
+        "z": 595.5925324720433
       },
       "rotation": {
+        "x": -0.30610219443726033,
+        "y": 0.04662940761255475,
+        "z": 0.016530607297774856,
+        "w": 0.9507123034487156
+      },
+      "viewCenter": {
         "x": 0,
         "y": 0,
-        "z": 0,
-        "w": 1
+        "z": 0
+      },
+      "contentRect": {
+        "x": 0,
+        "y": 0,
+        "width": 1146,
+        "height": 960
+      },
+      "scale": 1
+    },
+    "5863ff8c-cded-4bbf-9cdf-eaeb087c9ba0": {
+      "position": {
+        "x": 1.2373695042620056,
+        "y": 12.184405239893294,
+        "z": 1.220294517057937
+      },
+      "rotation": {
+        "x": -0.3336487781467022,
+        "y": 0.05082565613172107,
+        "z": 0.018018220800622167,
+        "w": 0.9411538605558459
       },
       "viewCenter": {
-        "x": 360,
-        "y": 800,
-        "z": 4.643324567305285
+        "x": 0.5079524119201959,
+        "y": 6.691835325660116,
+        "z": -5.513427043230154
       },
       "contentRect": {
         "x": 0,
         "y": 0,
-        "width": 1168,
+        "width": 1146,
         "height": 960
       },
       "scale": 1
     }
   },
   "camera-uuids": [
-    "28a9f61c-c9ee-4b56-acdd-86ed85c7d066",
     "a2423517-560c-435d-97c6-1e8ab247f69f",
     "a7a6f4b2-2950-4fdd-9c62-87fc8c2ccbb5",
     "527b21f6-b110-4010-802c-6815045cbc9a",
@@ -1354,9 +1353,7 @@
     "7e43af95-a241-4a1f-9871-281159f7dee4",
     "e359a3d5-28b4-44a0-9f31-eee3017fe4a1",
     "645a2962-9d04-45c4-88ca-6701fe0cfbb7",
-    "dd6c53c6-4cf3-4691-9db1-5959a144930a",
     "94719fcd-0e99-4a54-9b20-bc0a31782638",
-    "f4a95669-6998-4e14-855c-0d5242a730f4",
     "7e326685-ca67-4439-866a-c9458fd31e3a",
     "4a024490-339a-46f9-880e-c57a1bfe4d6e",
     "196971a7-f6fb-4bf3-8588-e5336b5a4b5b",
@@ -1371,7 +1368,6 @@
     "2fc3a861-9311-45ca-ae38-a445fce124d2",
     "3d2435fb-6378-49fe-a51d-e87b2acd8c80",
     "064db746-b63b-43db-8bf3-bffa706231b2",
-    "6cd0f89e-0f4d-4300-9dca-c0d0eb842b99",
     "579247ec-5b8a-472e-bcb6-3e024b1a3564",
     "99b412e6-33d6-4baf-87f9-25502bc99057",
     "3eadf28d-4c41-4582-afff-c8441fa5470a",
@@ -1384,16 +1380,20 @@
     "6fdfa45a-54d2-427e-9510-d0cbbbc63997",
     "2a6d10bc-9c1e-4420-ae90-e9ba997eea5f",
     "c418bfb3-8f04-402d-95bc-ba0ae00f18d6",
-    "19e8fe53-474f-4461-a8d9-43df1cbc342b",
-    "bb029c41-795e-4cc9-a143-8705fe3268fb",
     "f79acc7f-362d-4f94-8d88-fcb435e33b12",
     "24fa125d-82fa-4b02-888f-390a9c63f1b5",
     "24d88106-b48c-41ec-b461-8bda34954648",
     "b824d4a8-95d2-4112-8d63-f7df26c184ee",
     "eec55ad7-7716-4dec-ae04-01c7f735325e",
-    "5863ff8c-cded-4bbf-9cdf-eaeb087c9ba0",
     "19486281-e3c1-4739-9220-c9ac2a1c94cb",
-    "10795865-5525-41fc-8bf7-0e8d6983b214"
+    "bb029c41-795e-4cc9-a143-8705fe3268fb",
+    "19e8fe53-474f-4461-a8d9-43df1cbc342b",
+    "28a9f61c-c9ee-4b56-acdd-86ed85c7d066",
+    "f4a95669-6998-4e14-855c-0d5242a730f4",
+    "dd6c53c6-4cf3-4691-9db1-5959a144930a",
+    "6cd0f89e-0f4d-4300-9dca-c0d0eb842b99",
+    "10795865-5525-41fc-8bf7-0e8d6983b214",
+    "5863ff8c-cded-4bbf-9cdf-eaeb087c9ba0"
   ],
   "camera": {
     "color": [