Skip to content

Commit 5f6eb10

Browse files
chromeechromee
authored
Merge pull request #91 from denx-jp/_chorome/fix-network-attack
弾のネットワーク同期処理のバグ修正・エーテル吸収処理のネットワーク対応
2 parents 5502ecc + ec95d19 commit 5f6eb10

21 files changed

+281
-192
lines changed

‎Assets/SSP/Prefabs/Objects/Ether.prefab

+58-2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ GameObject:
2424
- component: {fileID: 135898202585162862}
2525
- component: {fileID: 23069619562125160}
2626
- component: {fileID: 54270739398327058}
27+
- component: {fileID: 114603879454852254}
28+
- component: {fileID: 114680341605803520}
2729
- component: {fileID: 114295420870100116}
2830
m_Layer: 11
2931
m_Name: Ether
@@ -110,10 +112,64 @@ MonoBehaviour:
110112
m_Script: {fileID: 11500000, guid: 42a62efc95a5e804da51189260cc52a5, type: 3}
111113
m_Name:
112114
m_EditorClassIdentifier:
115+
rigid: {fileID: 54270739398327058}
113116
etherValue: 0
114117
floatHeight: 1
115-
trackingSpeed: 8
118+
trackingSpeed: 12
116119
popEtherInitValue: 50
120+
--- !u!114 &114603879454852254
121+
MonoBehaviour:
122+
m_ObjectHideFlags: 1
123+
m_PrefabParentObject: {fileID: 0}
124+
m_PrefabInternal: {fileID: 100100000}
125+
m_GameObject: {fileID: 1768416262091988}
126+
m_Enabled: 1
127+
m_EditorHideFlags: 0
128+
m_Script: {fileID: 372142912, guid: dc443db3e92b4983b9738c1131f555cb, type: 3}
129+
m_Name:
130+
m_EditorClassIdentifier:
131+
m_SceneId:
132+
m_Value: 0
133+
m_AssetId:
134+
i0: 163
135+
i1: 131
136+
i2: 109
137+
i3: 25
138+
i4: 182
139+
i5: 61
140+
i6: 27
141+
i7: 196
142+
i8: 42
143+
i9: 80
144+
i10: 214
145+
i11: 94
146+
i12: 145
147+
i13: 232
148+
i14: 56
149+
i15: 195
150+
m_ServerOnly: 0
151+
m_LocalPlayerAuthority: 1
152+
--- !u!114 &114680341605803520
153+
MonoBehaviour:
154+
m_ObjectHideFlags: 1
155+
m_PrefabParentObject: {fileID: 0}
156+
m_PrefabInternal: {fileID: 100100000}
157+
m_GameObject: {fileID: 1768416262091988}
158+
m_Enabled: 1
159+
m_EditorHideFlags: 0
160+
m_Script: {fileID: -1768714887, guid: dc443db3e92b4983b9738c1131f555cb, type: 3}
161+
m_Name:
162+
m_EditorClassIdentifier:
163+
m_TransformSyncMode: 3
164+
m_SendInterval: 0
165+
m_SyncRotationAxis: 7
166+
m_RotationSyncCompression: 0
167+
m_SyncSpin: 0
168+
m_MovementTheshold: 0.001
169+
m_VelocityThreshold: 0.0001
170+
m_SnapThreshold: 5
171+
m_InterpolateRotation: 1
172+
m_InterpolateMovement: 1
117173
--- !u!135 &135168888094169298
118174
SphereCollider:
119175
m_ObjectHideFlags: 1
@@ -136,5 +192,5 @@ SphereCollider:
136192
m_IsTrigger: 1
137193
m_Enabled: 1
138194
serializedVersion: 2
139-
m_Radius: 5
195+
m_Radius: 15
140196
m_Center: {x: 0, y: 0, z: 0}

‎Assets/SSP/Prefabs/Players/NetWorkPlayer.prefab

+2-2
Original file line numberDiff line numberDiff line change
@@ -5301,7 +5301,6 @@ MonoBehaviour:
53015301
playerKillLogNotifier: {fileID: 114856490275401810}
53025302
playerCameraController: {fileID: 114079660245503310}
53035303
playerInventoryManager: {fileID: 114084645704703300}
5304-
devIsLocalPlayerCharacter: 0
53055304
--- !u!114 &114453876016800092
53065305
MonoBehaviour:
53075306
m_ObjectHideFlags: 1
@@ -5408,7 +5407,8 @@ MonoBehaviour:
54085407
m_EditorClassIdentifier:
54095408
etherObject: {fileID: 1768416262091988, guid: a3836d19b63d1bc42a50d65e91e838c3,
54105409
type: 2}
5411-
emitPower: 1
5410+
emitPower: 3
5411+
emitDirectionRange: {x: 45, y: 10, z: 45}
54125412
--- !u!114 &114774096608856190
54135413
MonoBehaviour:
54145414
m_ObjectHideFlags: 1

‎Assets/SSP/Prefabs/Weapons/Bullet.prefab

+2-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ MonoBehaviour:
165165
i14: 20
166166
i15: 143
167167
m_ServerOnly: 0
168-
m_LocalPlayerAuthority: 0
168+
m_LocalPlayerAuthority: 1
169169
--- !u!114 &114615027804808878
170170
MonoBehaviour:
171171
m_ObjectHideFlags: 1
@@ -181,6 +181,7 @@ MonoBehaviour:
181181
shootPlayerTeamId: 0
182182
damageAmount: 100
183183
deathTime: 5
184+
isShooterLocalPlayer: 0
184185
--- !u!135 &135769969068720922
185186
SphereCollider:
186187
m_ObjectHideFlags: 1

‎Assets/SSP/Prefabs/Weapons/HandGun.prefab

+22-5
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ GameObject:
5656
- component: {fileID: 65139783768924182}
5757
- component: {fileID: 23128071150024078}
5858
- component: {fileID: 114397692148794256}
59+
- component: {fileID: 114476576303947814}
5960
- component: {fileID: 114275136129540490}
6061
- component: {fileID: 114611022078819548}
6162
m_Layer: 0
@@ -219,12 +220,8 @@ MonoBehaviour:
219220
m_Script: {fileID: 11500000, guid: 5bfaf207992cbd94ba0d1fc7b912847e, type: 3}
220221
m_Name:
221222
m_EditorClassIdentifier:
222-
coolTime: 1
223-
bulletSpeed: 10
224-
bullet: {fileID: 54890028688491532, guid: d364dda7de5cd074fa642a49f756148f, type: 2}
223+
model: {fileID: 114476576303947814}
225224
muzzle: {fileID: 1722006071851656}
226-
bulletDamageAmount: 50
227-
bulletDeathTime: 5
228225
--- !u!114 &114397692148794256
229226
MonoBehaviour:
230227
m_ObjectHideFlags: 1
@@ -257,6 +254,26 @@ MonoBehaviour:
257254
i15: 25
258255
m_ServerOnly: 0
259256
m_LocalPlayerAuthority: 1
257+
--- !u!114 &114476576303947814
258+
MonoBehaviour:
259+
m_ObjectHideFlags: 1
260+
m_PrefabParentObject: {fileID: 0}
261+
m_PrefabInternal: {fileID: 100100000}
262+
m_GameObject: {fileID: 1996856847404154}
263+
m_Enabled: 1
264+
m_EditorHideFlags: 0
265+
m_Script: {fileID: 11500000, guid: 166ae1beae32a0f4f9c812d74eb6cff7, type: 3}
266+
m_Name:
267+
m_EditorClassIdentifier:
268+
name: HandGun
269+
damageAmount: 100
270+
isOwnerLocalPlayer: 0
271+
playerId: 0
272+
teamId: 0
273+
bullet: {fileID: 1302414001687628, guid: d364dda7de5cd074fa642a49f756148f, type: 2}
274+
bulletVelocity: 10
275+
bulletDeathTime: 5
276+
coolTime: 0.5
260277
--- !u!114 &114611022078819548
261278
MonoBehaviour:
262279
m_ObjectHideFlags: 1

‎Assets/SSP/Scenes/Dev/Network/ChoromeNetwork.unity

+22-16
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ GameObject:
119119
- component: {fileID: 43770265}
120120
- component: {fileID: 43770264}
121121
- component: {fileID: 43770263}
122-
m_Layer: 0
122+
m_Layer: 10
123123
m_Name: Plane
124124
m_TagString: Untagged
125125
m_Icon: {fileID: 0}
@@ -200,7 +200,7 @@ GameObject:
200200
serializedVersion: 5
201201
m_Component:
202202
- component: {fileID: 94639461}
203-
m_Layer: 0
203+
m_Layer: 10
204204
m_Name: Respawn
205205
m_TagString: Respawn
206206
m_Icon: {fileID: 0}
@@ -228,7 +228,7 @@ GameObject:
228228
serializedVersion: 5
229229
m_Component:
230230
- component: {fileID: 138473471}
231-
m_Layer: 0
231+
m_Layer: 10
232232
m_Name: Respawn
233233
m_TagString: Respawn
234234
m_Icon: {fileID: 0}
@@ -259,7 +259,7 @@ GameObject:
259259
- component: {fileID: 174368325}
260260
- component: {fileID: 174368324}
261261
- component: {fileID: 174368323}
262-
m_Layer: 0
262+
m_Layer: 10
263263
m_Name: Cube (3)
264264
m_TagString: Untagged
265265
m_Icon: {fileID: 0}
@@ -374,7 +374,7 @@ GameObject:
374374
m_Component:
375375
- component: {fileID: 330529887}
376376
- component: {fileID: 330529888}
377-
m_Layer: 0
377+
m_Layer: 10
378378
m_Name: Directional Light
379379
m_TagString: Untagged
380380
m_Icon: {fileID: 0}
@@ -452,7 +452,7 @@ GameObject:
452452
serializedVersion: 5
453453
m_Component:
454454
- component: {fileID: 385727235}
455-
m_Layer: 0
455+
m_Layer: 10
456456
m_Name: Respawn
457457
m_TagString: Respawn
458458
m_Icon: {fileID: 0}
@@ -483,7 +483,7 @@ GameObject:
483483
- component: {fileID: 575532417}
484484
- component: {fileID: 575532416}
485485
- component: {fileID: 575532415}
486-
m_Layer: 0
486+
m_Layer: 10
487487
m_Name: Cube (5)
488488
m_TagString: Untagged
489489
m_Icon: {fileID: 0}
@@ -565,7 +565,7 @@ GameObject:
565565
- component: {fileID: 651837427}
566566
- component: {fileID: 651837426}
567567
- component: {fileID: 651837425}
568-
m_Layer: 0
568+
m_Layer: 10
569569
m_Name: Cube (1)
570570
m_TagString: Untagged
571571
m_Icon: {fileID: 0}
@@ -647,7 +647,7 @@ GameObject:
647647
- component: {fileID: 705963242}
648648
- component: {fileID: 705963241}
649649
- component: {fileID: 705963240}
650-
m_Layer: 0
650+
m_Layer: 10
651651
m_Name: Cube (4)
652652
m_TagString: Untagged
653653
m_Icon: {fileID: 0}
@@ -823,7 +823,7 @@ GameObject:
823823
- component: {fileID: 769789130}
824824
- component: {fileID: 769789129}
825825
- component: {fileID: 769789128}
826-
m_Layer: 0
826+
m_Layer: 10
827827
m_Name: Cube
828828
m_TagString: Untagged
829829
m_Icon: {fileID: 0}
@@ -904,7 +904,7 @@ Prefab:
904904
- target: {fileID: 114491952814685390, guid: 4b96ec7211a0c86479da90e2a1b9e672,
905905
type: 2}
906906
propertyPath: m_SpawnPrefabs.Array.size
907-
value: 3
907+
value: 4
908908
objectReference: {fileID: 0}
909909
- target: {fileID: 4486474136715742, guid: 4b96ec7211a0c86479da90e2a1b9e672, type: 2}
910910
propertyPath: m_LocalPosition.x
@@ -950,6 +950,12 @@ Prefab:
950950
value:
951951
objectReference: {fileID: 1302414001687628, guid: d364dda7de5cd074fa642a49f756148f,
952952
type: 2}
953+
- target: {fileID: 114491952814685390, guid: 4b96ec7211a0c86479da90e2a1b9e672,
954+
type: 2}
955+
propertyPath: m_SpawnPrefabs.Array.data[3]
956+
value:
957+
objectReference: {fileID: 1768416262091988, guid: a3836d19b63d1bc42a50d65e91e838c3,
958+
type: 2}
953959
m_RemovedComponents: []
954960
m_ParentPrefab: {fileID: 100100000, guid: 4b96ec7211a0c86479da90e2a1b9e672, type: 2}
955961
m_IsPrefabParent: 0
@@ -1244,7 +1250,7 @@ GameObject:
12441250
m_Component:
12451251
- component: {fileID: 1248679843}
12461252
- component: {fileID: 1248679844}
1247-
m_Layer: 0
1253+
m_Layer: 10
12481254
m_Name: Directional Light
12491255
m_TagString: Untagged
12501256
m_Icon: {fileID: 0}
@@ -1324,7 +1330,7 @@ GameObject:
13241330
- component: {fileID: 1482952402}
13251331
- component: {fileID: 1482952404}
13261332
- component: {fileID: 1482952403}
1327-
m_Layer: 0
1333+
m_Layer: 10
13281334
m_Name: EventSystem
13291335
m_TagString: Untagged
13301336
m_Icon: {fileID: 0}
@@ -1399,7 +1405,7 @@ GameObject:
13991405
- component: {fileID: 1520923266}
14001406
- component: {fileID: 1520923265}
14011407
- component: {fileID: 1520923264}
1402-
m_Layer: 0
1408+
m_Layer: 10
14031409
m_Name: Cube (6)
14041410
m_TagString: Untagged
14051411
m_Icon: {fileID: 0}
@@ -1616,7 +1622,7 @@ GameObject:
16161622
- component: {fileID: 1798377973}
16171623
- component: {fileID: 1798377972}
16181624
- component: {fileID: 1798377971}
1619-
m_Layer: 0
1625+
m_Layer: 10
16201626
m_Name: Cube (2)
16211627
m_TagString: Untagged
16221628
m_Icon: {fileID: 0}
@@ -1746,7 +1752,7 @@ GameObject:
17461752
serializedVersion: 5
17471753
m_Component:
17481754
- component: {fileID: 2125324024}
1749-
m_Layer: 0
1755+
m_Layer: 10
17501756
m_Name: Env
17511757
m_TagString: Untagged
17521758
m_Icon: {fileID: 0}

‎Assets/SSP/Scenes/Dev/Network/Network.unity

+5-2
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,10 @@ MonoBehaviour:
272272
m_PlayerSpawnMethod: 0
273273
m_OfflineScene:
274274
m_OnlineScene:
275-
m_SpawnPrefabs: []
275+
m_SpawnPrefabs:
276+
- {fileID: 1189635630215696, guid: 402fefe12962e1948948a8a10b96076a, type: 2}
277+
- {fileID: 1302414001687628, guid: d364dda7de5cd074fa642a49f756148f, type: 2}
278+
- {fileID: 1996856847404154, guid: af79f1071f59bf4499627d3ec0cd7719, type: 2}
276279
m_CustomConfig: 0
277280
m_MaxConnections: 4
278281
m_ConnectionConfig:
@@ -842,7 +845,7 @@ GameObject:
842845
- component: {fileID: 849976549}
843846
m_Layer: 0
844847
m_Name: Respawner
845-
m_TagString: Untagged
848+
m_TagString: Respawn
846849
m_Icon: {fileID: 0}
847850
m_NavMeshLayer: 0
848851
m_StaticEditorFlags: 0

‎Assets/SSP/Scripts/Player/PlayerAvoider.cs

+2-9
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,14 @@ private void Start()
3434
CmdAvoiding();
3535
});
3636
}
37-
38-
#if ONLINE
37+
3938
[Command]
40-
#endif
4139
private void CmdAvoiding()
4240
{
4341
RpcAvoiding();
4442
}
45-
46-
#if ONLINE
43+
4744
[ClientRpc]
48-
#endif
4945
private void RpcAvoiding()
5046
{
5147
StartCoroutine(Avoiding());
@@ -57,11 +53,8 @@ private IEnumerator Avoiding()
5753
yield return new WaitForSeconds(avoidStartTime);
5854
SetLayer(LayerMap.Invincible);
5955
yield return new WaitForSeconds(avoidDuration);
60-
#if ONLINE
6156
SetLayer(playerModel.defaultLayer);
62-
#else
6357
SetLayer(LayerMap.LocalPlayer);
64-
#endif
6558
}
6659

6760
private void SetLayer(int layer)

0 commit comments

Comments
 (0)