1

1

assets/prefabs/enemy/enemy/generalPistol.prefab

@@ -29065,8 +29065,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 35.521531222997254,
-      "height": 33.9
+      "width": 33.12153122299725,
+      "height": 31.5
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -29118,7 +29118,7 @@
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 0,
-    "_enableOutline": true,
+    "_enableOutline": false,
     "_outlineColor": {
       "__type__": "cc.Color",
       "r": 255,

assets/prefabs/enemy/enemy/scatterCaptain.prefab

@@ -29065,8 +29065,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 36.12153122299725,
-      "height": 34.5
+      "width": 33.12153122299725,
+      "height": 31.5
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -29118,7 +29118,7 @@
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 0,
-    "_enableOutline": true,
+    "_enableOutline": false,
     "_outlineColor": {
       "__type__": "cc.Color",
       "r": 255,

assets/prefabs/enemy/enemy/shieldSoldier.prefab

@@ -29124,8 +29124,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 36.12153122299725,
-      "height": 34.5
+      "width": 33.12153122299725,
+      "height": 31.5
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -29177,7 +29177,7 @@
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 0,
-    "_enableOutline": true,
+    "_enableOutline": false,
     "_outlineColor": {
       "__type__": "cc.Color",
       "r": 255,

assets/prefabs/enemy/enemy/snipeCaptain.prefab

@@ -29065,8 +29065,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 36.12153122299725,
-      "height": 34.5
+      "width": 33.12153122299725,
+      "height": 31.5
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -29118,7 +29118,7 @@
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 0,
-    "_enableOutline": true,
+    "_enableOutline": false,
     "_outlineColor": {
       "__type__": "cc.Color",
       "r": 255,

assets/prefabs/enemy/enemy/sniperSoldier.prefab

@@ -29065,8 +29065,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 36.12153122299725,
-      "height": 34.5
+      "width": 33.12153122299725,
+      "height": 31.5
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -29118,7 +29118,7 @@
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 0,
-    "_enableOutline": true,
+    "_enableOutline": false,
     "_outlineColor": {
       "__type__": "cc.Color",
       "r": 255,

assets/prefabs/enemy/enemy/soldierPistol.prefab

@@ -29061,8 +29061,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 36.12153122299725,
-      "height": 34.5
+      "width": 33.12153122299725,
+      "height": 31.5
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -29114,7 +29114,7 @@
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 0,
-    "_enableOutline": true,
+    "_enableOutline": false,
     "_outlineColor": {
       "__type__": "cc.Color",
       "r": 255,

assets/prefabs/enemy/enemy/tank.prefab

@@ -1362,8 +1362,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 36.12153122299725,
-      "height": 34.5
+      "width": 33.12153122299725,
+      "height": 31.5
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1415,7 +1415,7 @@
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 0,
-    "_enableOutline": true,
+    "_enableOutline": false,
     "_outlineColor": {
       "__type__": "cc.Color",
       "r": 255,

assets/scripts/game/Enemy.ts

@@ -378,7 +378,6 @@ export class Enemy extends BaseExp {
         const n = PoolManager.getNode(this.hurt_num, this.hurt_num.parent);
         let label:Label = n.getComponent(Label);
         label.color = Utils.hexColor(this.isShotHead ? "#F51414" : "#FFFFFF");
-        label.outlineColor = Utils.hexColor(this.isShotHead ? "#FFFFFF" : "#F51414");
         label.string = hpStr;
         const oPos: Vec3 = this.hpBar.node.position.clone();
         n.position = oPos;

assets/scripts/game/GMap.ts

@@ -45,7 +45,7 @@ export class GMap extends BaseExp {
         console.log("GGGGGGG = " + pwww);*/
         //区域隐藏
         const nodes:Node[] = this.ambush_points.children.flatMap(child => child.children);
-        [this.enemy_born_area,this.miidle_inline,this.miidle_outline,this.doors,this.sundries]
+        [this.enemy_born_area,this.miidle_inline,this.miidle_outline,this.sundries]
         .concat(nodes).forEach(e => {
             e.active = false;
         });

assets/scripts/ui/GunfightShootUI.ts

@@ -322,11 +322,13 @@ export class GunfightShootUI extends BaseExp {
         //是步枪直接连续开火
         if(!this.isRifleGun()){
            Game.I.player.shoot();
-        }
-        this.scheduleOnce(()=>{
-            //检查是否在秒内完成放大 已经在update里开镜完成时调用 Game.I.player.shoot();
+           this.scheduleOnce(()=>{
+                //检查是否在秒内完成放大 已经在update里开镜完成时调用 Game.I.player.shoot();
+                this.isScopeOpen = false;
+            },0.6)
+        }else{
             this.isScopeOpen = false;
-        },0.6)
+        }
     }
 
     /**

profiles/v2/packages/reference-image.json

@@ -3,6 +3,6 @@
   "config": {
     "images": [],
     "sceneUUID": {},
-    "scene": "19486281-e3c1-4739-9220-c9ac2a1c94cb"
+    "scene": "b824d4a8-95d2-4112-8d63-f7df26c184ee"
   }
 }