1

1

assets/fbx/mat/skyBox/rain.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "8878afae-862a-4a1b-ae1a-c997b15c41f3",
-  "files": [],
-  "subMetas": {},
-  "userData": {
-    "compressionType": {},
-    "isRemoteBundle": {}
-  }
-}

assets/fbx/mat/skyBox/rain/back.png.meta

@@ -1,42 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "72264881-d762-4296-8662-65f4268f0f38",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "72264881-d762-4296-8662-65f4268f0f38@6c48a",
-      "displayName": "back",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "repeat",
-        "wrapModeT": "repeat",
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "72264881-d762-4296-8662-65f4268f0f38",
-        "visible": false
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "hasAlpha": true,
-    "type": "texture",
-    "redirect": "72264881-d762-4296-8662-65f4268f0f38@6c48a",
-    "fixAlphaTransparencyArtifacts": false
-  }
-}

assets/fbx/mat/skyBox/rain/bottom.png.meta

@@ -1,42 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "e84618f5-baca-4fce-89af-359523043b6f",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "e84618f5-baca-4fce-89af-359523043b6f@6c48a",
-      "displayName": "bottom",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "repeat",
-        "wrapModeT": "repeat",
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "e84618f5-baca-4fce-89af-359523043b6f",
-        "visible": false
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "hasAlpha": true,
-    "type": "texture",
-    "redirect": "e84618f5-baca-4fce-89af-359523043b6f@6c48a",
-    "fixAlphaTransparencyArtifacts": false
-  }
-}

assets/fbx/mat/skyBox/rain/front.png.meta

@@ -1,42 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "1f9443e8-7da4-44aa-8236-a7be02ca8b04",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "1f9443e8-7da4-44aa-8236-a7be02ca8b04@6c48a",
-      "displayName": "front",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "repeat",
-        "wrapModeT": "repeat",
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "1f9443e8-7da4-44aa-8236-a7be02ca8b04",
-        "visible": false
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "hasAlpha": true,
-    "type": "texture",
-    "redirect": "1f9443e8-7da4-44aa-8236-a7be02ca8b04@6c48a",
-    "fixAlphaTransparencyArtifacts": false
-  }
-}

assets/fbx/mat/skyBox/rain/left.png.meta

@@ -1,42 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "8f232275-1fd3-4e9f-afbf-327e023155a4",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "8f232275-1fd3-4e9f-afbf-327e023155a4@6c48a",
-      "displayName": "left",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "repeat",
-        "wrapModeT": "repeat",
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "8f232275-1fd3-4e9f-afbf-327e023155a4",
-        "visible": false
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "hasAlpha": true,
-    "type": "texture",
-    "redirect": "8f232275-1fd3-4e9f-afbf-327e023155a4@6c48a",
-    "fixAlphaTransparencyArtifacts": false
-  }
-}

assets/fbx/mat/skyBox/rain/rain.cubemap.meta

@@ -1,24 +0,0 @@
-{
-  "ver": "1.0.4",
-  "importer": "texture-cube",
-  "imported": true,
-  "uuid": "0f82c3da-4033-43ba-a8b8-d3b1f9e35a8f",
-  "files": [
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {
-    "wrapModeS": "repeat",
-    "wrapModeT": "repeat",
-    "minfilter": "linear",
-    "magfilter": "linear",
-    "mipfilter": "none",
-    "anisotropy": 0,
-    "front": "1f9443e8-7da4-44aa-8236-a7be02ca8b04",
-    "bottom": "e84618f5-baca-4fce-89af-359523043b6f",
-    "top": "188bfc99-3ac0-4bcf-b8f3-04341c7cd0f1",
-    "left": "8f232275-1fd3-4e9f-afbf-327e023155a4",
-    "right": "78d6a912-07c9-497e-b63c-23839544903a",
-    "back": "72264881-d762-4296-8662-65f4268f0f38"
-  }
-}

assets/fbx/mat/skyBox/rain/right.png.meta

@@ -1,42 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "78d6a912-07c9-497e-b63c-23839544903a",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "78d6a912-07c9-497e-b63c-23839544903a@6c48a",
-      "displayName": "right",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "repeat",
-        "wrapModeT": "repeat",
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "78d6a912-07c9-497e-b63c-23839544903a",
-        "visible": false
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "hasAlpha": true,
-    "type": "texture",
-    "redirect": "78d6a912-07c9-497e-b63c-23839544903a@6c48a",
-    "fixAlphaTransparencyArtifacts": false
-  }
-}

assets/fbx/mat/skyBox/rain/top.png.meta

@@ -1,42 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "188bfc99-3ac0-4bcf-b8f3-04341c7cd0f1",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "188bfc99-3ac0-4bcf-b8f3-04341c7cd0f1@6c48a",
-      "displayName": "top",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "repeat",
-        "wrapModeT": "repeat",
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "188bfc99-3ac0-4bcf-b8f3-04341c7cd0f1",
-        "visible": false
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "hasAlpha": true,
-    "type": "texture",
-    "redirect": "188bfc99-3ac0-4bcf-b8f3-04341c7cd0f1@6c48a",
-    "fixAlphaTransparencyArtifacts": false
-  }
-}

assets/scripts/game/GMap.ts

@@ -195,7 +195,8 @@ export class GMap extends BaseExp {
             let points: MPos[] = availablePoints.length > 0 ? availablePoints : standPosArr;
             let pos: Vec3 = Utils.randomArray(points)[0].pos;
             if(isAddRandom){
-                pos.x += Utils.getRandomFloat(-0.3,0.3);
+                pos.x += Utils.getRandomFloat(-0.5,0.5);
+                pos.z += Utils.getRandomFloat(-0.5,0.5);
             }
             return pos;
         }

assets/scripts/game/Game.ts

@@ -1,4 +1,4 @@
-import { _decorator,Camera,Color,DirectionalLight,director,Node, Scene, TextureCube} from 'cc';
+import { _decorator,Camera,Color,DirectionalLight,director,Node, ParticleSystem2D, Scene, TextureCube} from 'cc';
 import { GMap } from './GMap';
 import { Player } from './Player';
 import { Utils } from '../utils/Utils';

assets/scripts/game/Main.ts

@@ -171,7 +171,7 @@ export class Main extends BaseExp {
             uiMgr.hide(Constants.mainUIs.main,()=>{
                 uiMgr.show(Constants.popUIs.gunfightShootUI);
             });
-        },0.4)
+        },0.2)
     }
     
     /**

assets/scripts/items/player/Gun2.ts

@@ -95,7 +95,6 @@ export class Gun2 extends GunBase {
             ||Game.I.isGameOver){
            return;
         }
-        Game.I.player.shootUI.crossHairStability();
         audioMgr.playOneShot(this.data.gun_sound);
         this.playParticle(this.fireEffect);
         this.getBulleNode();

assets/scripts/ui/GunfightShootUI.ts

@@ -156,6 +156,7 @@ export class GunfightShootUI extends BaseExp {
 
     public show(...args: any[]){
         this.loadTaskData();
+        this.gunNumChange();
     }
 
     /**

profiles/v2/packages/reference-image.json

@@ -3,6 +3,6 @@
   "config": {
     "images": [],
     "sceneUUID": {},
-    "scene": "6fdfa45a-54d2-427e-9510-d0cbbbc63997"
+    "scene": "10795865-5525-41fc-8bf7-0e8d6983b214"
   }
 }

profiles/v2/packages/scene.json

@@ -5,7 +5,7 @@
     "__version__": "1.3.9"
   },
   "gizmos-infos": {
-    "is2D": true,
+    "is2D": false,
     "is3DIcon": false,
     "iconSize": 2,
     "gridVisible": true,