Skip to content

Commit 374c934

Browse files
authored
fix it (#1295)
1 parent 88903c2 commit 374c934

File tree

2 files changed

+12
-22
lines changed

2 files changed

+12
-22
lines changed

Assets/Content/WorldObjects/Furniture/Generic/NukeCart.prefab

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ MeshCollider:
113113
m_IsTrigger: 0
114114
m_Enabled: 1
115115
serializedVersion: 4
116-
m_Convex: 0
116+
m_Convex: 1
117117
m_CookingOptions: 30
118-
m_Mesh: {fileID: 4300000, guid: bad6ca84c39067346bef31493e4dd0ce, type: 2}
118+
m_Mesh: {fileID: 756681063864955725, guid: 7fc5df50928c6254ab6a553fe9207656, type: 3}
119119
--- !u!1 &2658310835758749969
120120
GameObject:
121121
m_ObjectHideFlags: 0
@@ -215,7 +215,7 @@ MeshCollider:
215215
serializedVersion: 4
216216
m_Convex: 0
217217
m_CookingOptions: 30
218-
m_Mesh: {fileID: 4300000, guid: 3c20103bab91e1641aadc6ae9baccbf9, type: 2}
218+
m_Mesh: {fileID: 756681063864955725, guid: 7fc5df50928c6254ab6a553fe9207656, type: 3}
219219
--- !u!114 &1871071288925904272
220220
MonoBehaviour:
221221
m_ObjectHideFlags: 0
@@ -230,32 +230,22 @@ MonoBehaviour:
230230
m_EditorClassIdentifier:
231231
<IsNested>k__BackingField: 0
232232
<ComponentIndex>k__BackingField: 0
233+
<PredictedSpawn>k__BackingField: {fileID: 0}
233234
_networkBehaviours:
234235
- {fileID: 135671415768211417}
235236
<ParentNetworkObject>k__BackingField: {fileID: 0}
236237
<ChildNetworkObjects>k__BackingField: []
238+
SerializedTransformProperties:
239+
Position: {x: 0, y: 0, z: 0}
240+
Rotation: {x: 0, y: 0, z: 0, w: 0}
241+
LocalScale: {x: 0, y: 0, z: 0}
237242
_isNetworked: 1
238243
_isGlobal: 0
244+
_initializeOrder: 0
239245
_defaultDespawnType: 0
240246
NetworkObserver: {fileID: 0}
241-
<PrefabId>k__BackingField: -1
247+
<PrefabId>k__BackingField: 65535
248+
<SpawnableCollectionId>k__BackingField: 0
242249
_scenePathHash: 0
243250
<SceneId>k__BackingField: 0
244251
<AssetPathHash>k__BackingField: 708179046754819001
245-
_sceneNetworkObjects:
246-
- {fileID: 1871071288925904272}
247-
- {fileID: 0}
248-
- {fileID: 0}
249-
- {fileID: 0}
250-
- {fileID: 0}
251-
- {fileID: 0}
252-
- {fileID: 0}
253-
- {fileID: 0}
254-
- {fileID: 0}
255-
- {fileID: 0}
256-
- {fileID: 0}
257-
- {fileID: 0}
258-
- {fileID: 0}
259-
- {fileID: 0}
260-
- {fileID: 0}
261-
- {fileID: 0}

Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/NukeDetonateInteraction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public override bool Start(InteractionEvent interactionEvent, InteractionReferen
5555
nuke.Detonate();
5656
PlayerSystem playerSystem = Subsystems.Get<PlayerSystem>();
5757

58-
new NukeDetonateEvent(nuke, playerSystem.GetCkey(source.GetComponentInTree<Entity>().Owner)).Invoke(this);
58+
new NukeDetonateEvent(nuke, playerSystem.GetCkey(source.GetComponentInParent<Entity>().Owner)).Invoke(this);
5959
}
6060
return false;
6161
}

0 commit comments

Comments
 (0)