Skip to content

Commit 6bf81c7

Browse files
fixing networkmanager, adding pot to scene again
1 parent 36b77dc commit 6bf81c7

File tree

3 files changed

+69
-7
lines changed

3 files changed

+69
-7
lines changed

Assets/Prefabs/Game/StaticNetworkObjects/EntranceStaticNetworkObjects.prefab

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ Transform:
7070
- {fileID: 6678085809358300456}
7171
- {fileID: 4544943714861995960}
7272
- {fileID: 2531036117351469622}
73+
- {fileID: 3448874403637550577}
7374
m_Father: {fileID: 0}
7475
m_RootOrder: 0
7576
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2928,6 +2929,72 @@ Transform:
29282929
m_CorrespondingSourceObject: {fileID: 4505851899529102149, guid: 5640f51641faec24ca0d332b154499bf, type: 3}
29292930
m_PrefabInstance: {fileID: 3825672641581827681}
29302931
m_PrefabAsset: {fileID: 0}
2932+
--- !u!1001 &4189821711055942577
2933+
PrefabInstance:
2934+
m_ObjectHideFlags: 0
2935+
serializedVersion: 2
2936+
m_Modification:
2937+
m_TransformParent: {fileID: 6690190851420380261}
2938+
m_Modifications:
2939+
- target: {fileID: 1583543423304314432, guid: 4c1a321755b60c54099d0402be05fa2e, type: 3}
2940+
propertyPath: m_RootOrder
2941+
value: 42
2942+
objectReference: {fileID: 0}
2943+
- target: {fileID: 1583543423304314432, guid: 4c1a321755b60c54099d0402be05fa2e, type: 3}
2944+
propertyPath: m_LocalPosition.x
2945+
value: 5.96
2946+
objectReference: {fileID: 0}
2947+
- target: {fileID: 1583543423304314432, guid: 4c1a321755b60c54099d0402be05fa2e, type: 3}
2948+
propertyPath: m_LocalPosition.y
2949+
value: 0
2950+
objectReference: {fileID: 0}
2951+
- target: {fileID: 1583543423304314432, guid: 4c1a321755b60c54099d0402be05fa2e, type: 3}
2952+
propertyPath: m_LocalPosition.z
2953+
value: -5.22
2954+
objectReference: {fileID: 0}
2955+
- target: {fileID: 1583543423304314432, guid: 4c1a321755b60c54099d0402be05fa2e, type: 3}
2956+
propertyPath: m_LocalRotation.w
2957+
value: 1
2958+
objectReference: {fileID: 0}
2959+
- target: {fileID: 1583543423304314432, guid: 4c1a321755b60c54099d0402be05fa2e, type: 3}
2960+
propertyPath: m_LocalRotation.x
2961+
value: 0
2962+
objectReference: {fileID: 0}
2963+
- target: {fileID: 1583543423304314432, guid: 4c1a321755b60c54099d0402be05fa2e, type: 3}
2964+
propertyPath: m_LocalRotation.y
2965+
value: 0
2966+
objectReference: {fileID: 0}
2967+
- target: {fileID: 1583543423304314432, guid: 4c1a321755b60c54099d0402be05fa2e, type: 3}
2968+
propertyPath: m_LocalRotation.z
2969+
value: 0
2970+
objectReference: {fileID: 0}
2971+
- target: {fileID: 1583543423304314432, guid: 4c1a321755b60c54099d0402be05fa2e, type: 3}
2972+
propertyPath: m_LocalEulerAnglesHint.x
2973+
value: 0
2974+
objectReference: {fileID: 0}
2975+
- target: {fileID: 1583543423304314432, guid: 4c1a321755b60c54099d0402be05fa2e, type: 3}
2976+
propertyPath: m_LocalEulerAnglesHint.y
2977+
value: 0
2978+
objectReference: {fileID: 0}
2979+
- target: {fileID: 1583543423304314432, guid: 4c1a321755b60c54099d0402be05fa2e, type: 3}
2980+
propertyPath: m_LocalEulerAnglesHint.z
2981+
value: 0
2982+
objectReference: {fileID: 0}
2983+
- target: {fileID: 1583543423304314434, guid: 4c1a321755b60c54099d0402be05fa2e, type: 3}
2984+
propertyPath: m_Name
2985+
value: PickUpPot
2986+
objectReference: {fileID: 0}
2987+
- target: {fileID: 1583543423304314435, guid: 4c1a321755b60c54099d0402be05fa2e, type: 3}
2988+
propertyPath: GlobalObjectIdHash
2989+
value: 951099334
2990+
objectReference: {fileID: 0}
2991+
m_RemovedComponents: []
2992+
m_SourcePrefab: {fileID: 100100000, guid: 4c1a321755b60c54099d0402be05fa2e, type: 3}
2993+
--- !u!4 &3448874403637550577 stripped
2994+
Transform:
2995+
m_CorrespondingSourceObject: {fileID: 1583543423304314432, guid: 4c1a321755b60c54099d0402be05fa2e, type: 3}
2996+
m_PrefabInstance: {fileID: 4189821711055942577}
2997+
m_PrefabAsset: {fileID: 0}
29312998
--- !u!1001 &4634195514699874557
29322999
PrefabInstance:
29333000
m_ObjectHideFlags: 0

Assets/Prefabs/NetworkingManager.prefab

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,6 @@ MonoBehaviour:
147147
SourcePrefabToOverride: {fileID: 0}
148148
SourceHashToOverride: 0
149149
OverridingTargetPrefab: {fileID: 0}
150-
- Override: 0
151-
Prefab: {fileID: 576565557002701866, guid: 3af96a32a84bcf74d9538fa7af973c97, type: 3}
152-
SourcePrefabToOverride: {fileID: 0}
153-
SourceHashToOverride: 0
154-
OverridingTargetPrefab: {fileID: 0}
155150
- Override: 0
156151
Prefab: {fileID: 176558388678216176, guid: 98fafd094d0c0fa41abe5c3322251839, type: 3}
157152
SourcePrefabToOverride: {fileID: 0}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:57ac496744b0443b24010d960e533b4d87e8d4f80dd2392335230f5aaa340884
3-
size 32367
2+
oid sha256:2ffbd4b6d605e52c35ecb685419bb6c255eb41243672ddde8fdcb77fb9cae349
3+
size 32884

0 commit comments

Comments
 (0)