fix：修复一下从机激光武器没伤害问题

Assets/_MrCs/Prefabs/Bullets/ShotBullet.prefab

@@ -188,7 +188,7 @@ MonoBehaviour:
   hit_trigger: 0
   HitLayer:
     serializedVersion: 2
-    m_Bits: 1245256
+    m_Bits: 1052744
   team: 0
   score: 0
   ownerIndex: 0

Assets/_MrCs/Prefabs/Explosions/ShieldEx.prefab

@@ -1167,7 +1167,7 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
+  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 6553391524536060664}
@@ -2067,7 +2067,7 @@ Transform:
   m_GameObject: {fileID: 8652716887194496297}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: -14, z: 0}
+  m_LocalPosition: {x: 0, y: -3, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
   m_Children:

Assets/_MrCs/Prefabs/Guns/StunGun.prefab

@@ -570,7 +570,7 @@ MonoBehaviour:
   maxDistance: 50
   hitMask:
     serializedVersion: 2
-    m_Bits: 4168
+    m_Bits: 3149896
   score: 0
 --- !u!1001 &3486794081135586198
 PrefabInstance:

Assets/_MrCs/Scenes/Zhejiang_Shaoxing_Shengzhou.unity

@@ -697,8 +697,8 @@ Transform:
   m_GameObject: {fileID: 65957045}
   serializedVersion: 2
   m_LocalRotation: {x: 0.48301557, y: -0.51642615, z: 0.51642615, w: 0.48301557}
-  m_LocalPosition: {x: 129.6, y: 88.59601, z: 39.700005}
-  m_LocalScale: {x: -10.678001, y: -10.677998, z: -3.8974712}
+  m_LocalPosition: {x: 114.9, y: 91.36, z: 39.7}
+  m_LocalScale: {x: -10.678001, y: -10.677998, z: -5.3395357}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 548992805}
@@ -6276,7 +6276,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &548992805
 Transform:
   m_ObjectHideFlags: 0
@@ -6299,7 +6299,6 @@ Transform:
   - {fileID: 2142990640}
   - {fileID: 417178824}
   - {fileID: 667627624}
-  - {fileID: 717558918}
   m_Father: {fileID: 139518431}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &556395203
@@ -7957,112 +7956,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 715529569}
   m_CullTransparentMesh: 1
---- !u!1 &717558917
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 717558918}
-  - component: {fileID: 717558921}
-  - component: {fileID: 717558920}
-  - component: {fileID: 717558919}
-  m_Layer: 3
-  m_Name: model__20
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &717558918
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 717558917}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.7071068, y: -0.000000010477379, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 71.7, y: 93.196, z: 78.9}
-  m_LocalScale: {x: 25.4, y: 25.400003, z: 25.400007}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 548992805}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!64 &717558919
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 717558917}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 0
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 5
-  m_Convex: 1
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 7160634504894769224, guid: 18934c948f06e9c45a4eab65974bbc88, type: 3}
---- !u!23 &717558920
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 717558917}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 15878c114a5793a44b88c10812983ff2, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!33 &717558921
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 717558917}
-  m_Mesh: {fileID: 7160634504894769224, guid: 18934c948f06e9c45a4eab65974bbc88, type: 3}
 --- !u!1001 &719317923
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -8507,7 +8400,7 @@ PrefabInstance:
     - target: {fileID: 2179332219663919851, guid: 58c236a0ed476f340bb7659a8f39c07a,
         type: 3}
       propertyPath: m_LocalScale.y
-      value: 0.67
+      value: 0.78229195
       objectReference: {fileID: 0}
     - target: {fileID: 2179332219663919851, guid: 58c236a0ed476f340bb7659a8f39c07a,
         type: 3}
@@ -8517,17 +8410,17 @@ PrefabInstance:
     - target: {fileID: 2179332219663919851, guid: 58c236a0ed476f340bb7659a8f39c07a,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 126.1
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 2179332219663919851, guid: 58c236a0ed476f340bb7659a8f39c07a,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 81.296005
+      value: 81.34
       objectReference: {fileID: 0}
     - target: {fileID: 2179332219663919851, guid: 58c236a0ed476f340bb7659a8f39c07a,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 58.7
+      value: 62.6
       objectReference: {fileID: 0}
     - target: {fileID: 2179332219663919851, guid: 58c236a0ed476f340bb7659a8f39c07a,
         type: 3}
@@ -9653,6 +9546,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: "\u7ECD\u5174\u5D4A\u5DDE\u5E02\u5730\u5F62"
       objectReference: {fileID: 0}
+    - target: {fileID: 90447407957429846, guid: bd5bb05b679ac964f864c7233b064967,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3953044043284487985, guid: bd5bb05b679ac964f864c7233b064967,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -33515,7 +33413,7 @@ PrefabInstance:
     - target: {fileID: 1046574673875355793, guid: 856b9e071c6f7ac4ba6045c1167943f3,
         type: 3}
       propertyPath: m_LocalScale.y
-      value: 0.3
+      value: 0.555
       objectReference: {fileID: 0}
     - target: {fileID: 1046574673875355793, guid: 856b9e071c6f7ac4ba6045c1167943f3,
         type: 3}
@@ -33530,7 +33428,7 @@ PrefabInstance:
     - target: {fileID: 1046574673875355793, guid: 856b9e071c6f7ac4ba6045c1167943f3,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 80.896
+      value: 80.92
       objectReference: {fileID: 0}
     - target: {fileID: 1046574673875355793, guid: 856b9e071c6f7ac4ba6045c1167943f3,
         type: 3}
@@ -37035,7 +36933,7 @@ PrefabInstance:
     - target: {fileID: 3147950971015161589, guid: 6da08600f417ec54a902655c08c34dd9,
         type: 3}
       propertyPath: m_LocalScale.y
-      value: 0.3
+      value: 0.456
       objectReference: {fileID: 0}
     - target: {fileID: 3147950971015161589, guid: 6da08600f417ec54a902655c08c34dd9,
         type: 3}
@@ -37050,7 +36948,7 @@ PrefabInstance:
     - target: {fileID: 3147950971015161589, guid: 6da08600f417ec54a902655c08c34dd9,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 81.61601
+      value: 81.8
       objectReference: {fileID: 0}
     - target: {fileID: 3147950971015161589, guid: 6da08600f417ec54a902655c08c34dd9,
         type: 3}
@@ -37552,7 +37450,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1944202328
 Transform:
   m_ObjectHideFlags: 0
@@ -40581,7 +40479,7 @@ PrefabInstance:
     - target: {fileID: 6589073593167947975, guid: 3fc4491d53ea894439bfe466ea4be2f4,
         type: 3}
       propertyPath: m_LocalScale.y
-      value: 0.14820662
+      value: 0.24305886
       objectReference: {fileID: 0}
     - target: {fileID: 6589073593167947975, guid: 3fc4491d53ea894439bfe466ea4be2f4,
         type: 3}
@@ -40591,17 +40489,17 @@ PrefabInstance:
     - target: {fileID: 6589073593167947975, guid: 3fc4491d53ea894439bfe466ea4be2f4,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 91.3
+      value: 52
       objectReference: {fileID: 0}
     - target: {fileID: 6589073593167947975, guid: 3fc4491d53ea894439bfe466ea4be2f4,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 89.2
+      value: 94.06
       objectReference: {fileID: 0}
     - target: {fileID: 6589073593167947975, guid: 3fc4491d53ea894439bfe466ea4be2f4,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 60.1
+      value: 68
       objectReference: {fileID: 0}
     - target: {fileID: 6589073593167947975, guid: 3fc4491d53ea894439bfe466ea4be2f4,
         type: 3}

Assets/_MrCs/Scripts/Explosions/ShieldExplosion.cs

@@ -24,6 +24,7 @@ public class ShieldExplosion : Explosion
       base.OnSpawn(team,curDurationTime,id);
       if(!isServer)
          return;
+      transform.position=new Vector3(transform.position.x,0,transform.position.z);
       GunInfo info = GameManager.Ins.GunInfos[(GunType)type][1];
       hp=info.Hp;
       int index = 0;

Assets/_MrCs/Scripts/Guns/StunGun.cs

@@ -13,8 +13,7 @@ public class StunGun : Launcher
     [SyncVar] private float _curAtkTime;
 
     public int score;
-
-    private bool _isShot = false;
+    
     private RaycastHit _hit;
 
     private void Start()
@@ -57,17 +56,6 @@ public class StunGun : Launcher
             transform.position = GameLocal.Ins.self.RightHand.position;
             transform.rotation = GameLocal.Ins.self.RightHand.rotation;
         }
-
-        // 服务器持续伤害
-        if (isServer && _isShot)
-        {
-            _curAtkTime -= Time.deltaTime;
-            if (_curAtkTime <= 0)
-            {
-                ServerDealDamage();
-                _curAtkTime = 1;
-            }
-        }
     }
 
     // ================= 按键事件（客户端） ================
@@ -80,7 +68,7 @@ public class StunGun : Launcher
     [Command]
     private void CmdShoot()
     {
-        _isShot = true;
+       
 
         // 让所有客户端显示激光
         RpcShowLaser();
@@ -90,11 +78,15 @@ public class StunGun : Launcher
 
         if (Physics.Raycast(ray, out _hit, maxDistance, hitMask))
         {
-            
+            _curAtkTime -= Time.deltaTime;
+            if (_curAtkTime <= 0)
+            {
+                ServerDealDamage();
+                _curAtkTime = 1;
+            }
         }
         else
         {
-            _isShot = false;
             _curAtkTime = 0;
         }
     }
@@ -104,9 +96,7 @@ public class StunGun : Launcher
     [Command]
     private void CmdUpShoot()
     {
-        _isShot = false;
         _curAtkTime = 0;
-
         RpcHideLaser();
     }