关卡调整

assets/module_aliens/FBX/Model/gun donghua.fbx.meta

@@ -202,6 +202,98 @@
       "scenes": [
         "e444abad-cc59-49e7-b1d3-3991fb889333@281d6"
       ]
+    },
+    "materials": {
+      "e444abad-cc59-49e7-b1d3-3991fb889333@dd992": {
+        "__type__": "cc.Material",
+        "_name": "",
+        "_objFlags": 0,
+        "__editorExtras__": {},
+        "_native": "",
+        "_effectAsset": {
+          "__uuid__": "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+          "__expectedType__": "cc.EffectAsset"
+        },
+        "_techIdx": 0,
+        "_defines": [
+          {
+            "DCC_APP_NAME": 2,
+            "USE_ALBEDO_MAP": true,
+            "HAS_EXPORTED_METALLIC": true
+          },
+          {},
+          {},
+          {}
+        ],
+        "_states": [
+          {
+            "rasterizerState": {},
+            "depthStencilState": {},
+            "blendState": {
+              "targets": [
+                {}
+              ]
+            }
+          },
+          {
+            "rasterizerState": {},
+            "depthStencilState": {},
+            "blendState": {
+              "targets": [
+                {}
+              ]
+            }
+          },
+          {
+            "rasterizerState": {},
+            "depthStencilState": {},
+            "blendState": {
+              "targets": [
+                {}
+              ]
+            }
+          },
+          {
+            "rasterizerState": {},
+            "depthStencilState": {},
+            "blendState": {
+              "targets": [
+                {}
+              ]
+            }
+          }
+        ],
+        "_props": [
+          {
+            "mainTexture": {
+              "__uuid__": "d10a1525-1eef-48e0-89d8-1d5bbef2f5bd@6c48a",
+              "__expectedType__": "cc.Texture2D"
+            },
+            "mainColor": {
+              "__type__": "cc.Color",
+              "r": 231,
+              "g": 231,
+              "b": 231,
+              "a": 255
+            },
+            "emissive": {
+              "__type__": "cc.Color",
+              "r": 255,
+              "g": 255,
+              "b": 255,
+              "a": 255
+            },
+            "emissiveScale": 0,
+            "shininessExponent": 50.53917885425676,
+            "specularFactor": 0.25,
+            "transparencyFactor": 0,
+            "metallic": 0.5527272820472717
+          },
+          {},
+          {},
+          {}
+        ]
+      }
     }
   }
 }

assets/module_aliens/FBX/Weapon/子弹.fbx.meta

@@ -125,6 +125,7 @@
         "_defines": [
           {
             "DCC_APP_NAME": 2,
+            "USE_ALBEDO_MAP": true,
             "HAS_EXPORTED_METALLIC": true
           },
           {},
@@ -171,6 +172,10 @@
         ],
         "_props": [
           {
+            "mainTexture": {
+              "__uuid__": "d10a1525-1eef-48e0-89d8-1d5bbef2f5bd@6c48a",
+              "__expectedType__": "cc.Texture2D"
+            },
             "emissive": {
               "__type__": "cc.Color",
               "r": 231,
@@ -202,6 +207,7 @@
         "_defines": [
           {
             "DCC_APP_NAME": 2,
+            "USE_ALBEDO_MAP": true,
             "HAS_EXPORTED_METALLIC": true
           },
           {},
@@ -248,6 +254,10 @@
         ],
         "_props": [
           {
+            "mainTexture": {
+              "__uuid__": "d10a1525-1eef-48e0-89d8-1d5bbef2f5bd@6c48a",
+              "__expectedType__": "cc.Texture2D"
+            },
             "emissive": {
               "__type__": "cc.Color",
               "r": 231,

assets/module_aliens/Materials/material_yellow.mtl

@@ -0,0 +1,92 @@
+{
+  "__type__": "cc.Material",
+  "_name": "",
+  "_objFlags": 0,
+  "__editorExtras__": {},
+  "_native": "",
+  "_effectAsset": {
+    "__uuid__": "c8f66d17-351a-48da-a12c-0212d28575c4",
+    "__expectedType__": "cc.EffectAsset"
+  },
+  "_techIdx": 0,
+  "_defines": [
+    {},
+    {},
+    {},
+    {},
+    {},
+    {}
+  ],
+  "_states": [
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    }
+  ],
+  "_props": [
+    {
+      "mainColor": {
+        "__type__": "cc.Color",
+        "r": 231,
+        "g": 206,
+        "b": 56,
+        "a": 255
+      }
+    },
+    {},
+    {},
+    {},
+    {},
+    {}
+  ]
+}

assets/module_aliens/Materials/material_yellow.mtl.meta

@@ -0,0 +1 @@
+{"ver":"1.0.21","importer":"material","imported":true,"uuid":"c45c4ff2-522c-4981-9d09-02759b7db80b","files":[".json"],"subMetas":{},"userData":{}}

assets/module_aliens/Prefabs/Levels/level_2.prefab

@@ -738,9 +738,9 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": -5.352663,
-      "y": 1.3569521436837704,
-      "z": -4.693791123218164
+      "x": 1.031,
+      "y": 0.77,
+      "z": -4.073
     }
   },
   {
@@ -759,10 +759,10 @@
     ],
     "value": {
       "__type__": "cc.Quat",
-      "x": -0.13380655819052384,
-      "y": 0.3504182017400379,
-      "z": 0.0506571040921491,
-      "w": 0.9256007490702896
+      "x": -0.12265449964857726,
+      "y": -0.3390941135866088,
+      "z": -0.04464258697054882,
+      "w": 0.9316534201490628
     }
   },
   {
@@ -781,9 +781,9 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": -16.451597187808854,
-      "y": 41.47178934940468,
-      "z": -9.994980551752842e-10
+      "x": -15,
+      "y": -40,
+      "z": 3.7761135455675605e-11
     }
   },
   {
@@ -15179,7 +15179,7 @@
       "__type__": "cc.Quat",
       "x": -0.3381020724773407,
       "y": -0.15928983688354492,
-      "z": 0.05817444249987602,
+      "z": 0.05817444995045662,
       "w": 0.925704836845398
     }
   },
@@ -15208,9 +15208,9 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 0.00001198546431169234,
-      "y": 0.09503044404743832,
-      "z": -0.0070855670745118005
+      "x": 0.000011986755453108344,
+      "y": 0.09503044401503757,
+      "z": -0.007085567248338975
     }
   },
   {
@@ -18176,7 +18176,7 @@
     ],
     "value": {
       "__type__": "cc.Quat",
-      "x": 0.027973899617791176,
+      "x": 0.027973895892500877,
       "y": 0,
       "z": 0,
       "w": 0.9996086359024048
@@ -18207,9 +18207,9 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 0.0001220703125,
-      "y": 0.09484815596761109,
-      "z": -0.007028268011936234
+      "x": 0.00012207031244315658,
+      "y": 0.09484815602013441,
+      "z": -0.007028267304427516
     }
   },
   {

assets/module_aliens/Prefabs/Levels/level_3.prefab

@@ -738,9 +738,9 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": -5.352663,
-      "y": 1.3569521436837704,
-      "z": -4.693791123218164
+      "x": 0.183,
+      "y": 0.874,
+      "z": -3.634
     }
   },
   {
@@ -759,10 +759,10 @@
     ],
     "value": {
       "__type__": "cc.Quat",
-      "x": -0.13380655819052384,
-      "y": 0.3504182017400379,
-      "z": 0.0506571040921491,
-      "w": 0.9256007490702896
+      "x": -0.12940952255126037,
+      "y": -0.12940952255126037,
+      "z": -0.01703708685546585,
+      "w": 0.9829629131445341
     }
   },
   {
@@ -781,9 +781,9 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": -16.451597187808854,
-      "y": 41.47178934940468,
-      "z": -9.994980551752842e-10
+      "x": -15,
+      "y": -15,
+      "z": 0
     }
   },
   {
@@ -20388,9 +20388,9 @@
     "value": {
       "__type__": "cc.Quat",
       "x": 0,
-      "y": -6.914638474020407e-7,
+      "y": -6.493169981691693e-7,
       "z": 0,
-      "w": 0.9999999828857172
+      "w": 0.9999999407388694
     }
   },
   {
@@ -21273,10 +21273,10 @@
     ],
     "value": {
       "__type__": "cc.Quat",
-      "x": -6.73873390148833e-23,
-      "y": 2.928071786613936e-23,
-      "z": -9.885814373222779e-7,
-      "w": 0.9999999774481676
+      "x": -6.833857510453048e-23,
+      "y": 2.1309121041130444e-23,
+      "z": -9.611061460579329e-7,
+      "w": 1.0000000303426102
     }
   },
   {
@@ -24805,9 +24805,9 @@
     "value": {
       "__type__": "cc.Quat",
       "x": 0,
-      "y": -4.3858275633468224e-7,
+      "y": -3.9643590710181087e-7,
       "z": 0,
-      "w": 0.9999999828857216
+      "w": 0.9999999407388738
     }
   },
   {

assets/module_aliens/Prefabs/Levels/level_4.prefab

@@ -647,9 +647,9 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": -5.352663,
-      "y": 1.3569521436837704,
-      "z": -4.693791123218164
+      "x": 0.454,
+      "y": 1.859,
+      "z": -3.251
     }
   },
   {
@@ -668,10 +668,10 @@
     ],
     "value": {
       "__type__": "cc.Quat",
-      "x": -0.13380655819052384,
-      "y": 0.3504182017400379,
-      "z": 0.0506571040921491,
-      "w": 0.9256007490702896
+      "x": -0.18541309417693408,
+      "y": -0.44233460095527977,
+      "z": -0.09400769928306991,
+      "w": 0.872424574264717
     }
   },
   {
@@ -690,9 +690,9 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": -16.451597187808854,
-      "y": 41.47178934940468,
-      "z": -9.994980551752842e-10
+      "x": -23.996673021838514,
+      "y": -53.7716196996769,
+      "z": 3.1805546814635168e-15
     }
   },
   {
@@ -12136,10 +12136,10 @@
     ],
     "value": {
       "__type__": "cc.Quat",
-      "x": -5.901730770752067e-10,
+      "x": -5.901732436086604e-10,
       "y": 0.7071065902709961,
       "z": 0.7071069478988647,
-      "w": 5.901622524007166e-10
+      "w": 5.901623634230191e-10
     }
   },
   {
@@ -12167,8 +12167,8 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": -0.00015258808497264909,
-      "y": 0.09477903075083738,
+      "x": -0.0001525880850294925,
+      "y": 0.09477903075083915,
       "z": -0.006957963945751544
     }
   },
@@ -12199,8 +12199,8 @@
     "value": {
       "__type__": "cc.Quat",
       "x": 0.0000020651955930928168,
-      "y": -7.621627135523437e-8,
-      "z": -2.4442598014872125e-7,
+      "y": -7.621627139448649e-8,
+      "z": -2.444259800309643e-7,
       "w": 0.9999999828851599
     }
   },
@@ -12745,7 +12745,7 @@
     ],
     "value": {
       "__type__": "cc.Quat",
-      "x": 7.382780498055297e-10,
+      "x": 7.382782163389834e-10,
       "y": 0.7071064114570618,
       "z": 0.7071071267127991,
       "w": -7.38248129295016e-10
@@ -12776,7 +12776,7 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 1.9002754925168125e-10,
+      "x": 1.8997070583282044e-10,
       "y": 0.09100007798950306,
       "z": 0.0050049719178559835
     }
@@ -12808,8 +12808,8 @@
     "value": {
       "__type__": "cc.Quat",
       "x": 8.429369705575951e-7,
-      "y": 1.1357641094116543e-9,
-      "z": -3.235103609298995e-10,
+      "y": 1.1357641879162531e-9,
+      "z": -3.235104394345489e-10,
       "w": 0.9999999828854301
     }
   },
@@ -17027,10 +17027,10 @@
     ],
     "value": {
       "__type__": "cc.Quat",
-      "x": -1.1455095672019411e-7,
-      "y": 1.401077266427464e-7,
-      "z": 4.89258361019429e-7,
-      "w": 1.0000000066593184
+      "x": -1.2587370135097586e-7,
+      "y": 1.5788087281976004e-7,
+      "z": 5.070315045319074e-7,
+      "w": 0.9999999953365759
     }
   },
   {
@@ -21580,8 +21580,8 @@
     "value": {
       "__type__": "cc.Quat",
       "x": -0.0000014329928495482314,
-      "y": -2.0949379671502597e-8,
-      "z": -1.3554347084444692e-7,
+      "y": -2.0949369622910868e-8,
+      "z": -1.3554345074726345e-7,
       "w": 0.9999999828857287
     }
   },
@@ -22185,10 +22185,10 @@
     ],
     "value": {
       "__type__": "cc.Quat",
-      "x": 0.01720212772488594,
+      "x": 0.017202123999595642,
       "y": -0.01720212958753109,
-      "z": 0.7068973183631897,
-      "w": 0.7068976163864136
+      "z": 0.7068971991539001,
+      "w": 0.7068977355957031
     }
   },
   {
@@ -22216,9 +22216,9 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 0.00014734106446212536,
-      "y": 0.09500123164485785,
-      "z": -0.007012575617437733
+      "x": 0.00014729309839367488,
+      "y": 0.09500123185461007,
+      "z": -0.007012574194959598
     }
   },
   {
@@ -22283,10 +22283,10 @@
     ],
     "value": {
       "__type__": "cc.Quat",
-      "x": -2.2187078086224887e-8,
-      "y": -1.2585663672695646e-8,
-      "z": 0.0000015756379632588511,
-      "w": 1.0000000272285523
+      "x": -1.4127887210807488e-8,
+      "y": -1.9176968756029478e-8,
+      "z": 0.0000017442396189238534,
+      "w": 1.0000000272279619
     }
   },
   {

assets/module_aliens/Prefabs/bullet.prefab

@@ -25,7 +25,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 14
+      "__id__": 17
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -111,6 +111,12 @@
       },
       {
         "__id__": 13
+      },
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 16
       }
     ],
     "removedComponents": []
@@ -229,6 +235,40 @@
       "z": 0
     }
   },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 15
+    },
+    "propertyPath": [
+      "_materials",
+      "0"
+    ],
+    "value": {
+      "__uuid__": "c45c4ff2-522c-4981-9d09-02759b7db80b",
+      "__expectedType__": "cc.Material"
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "54DFVr9KZe5Zi3TQ2zyT7e"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 15
+    },
+    "propertyPath": [
+      "_materials",
+      "1"
+    ],
+    "value": {
+      "__uuid__": "c45c4ff2-522c-4981-9d09-02759b7db80b",
+      "__expectedType__": "cc.Material"
+    }
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {