Skip to content

Commit e6bb5d5

Browse files
Merge develop into feature/replace-guid-with-auth-playerid
2 parents 47b02ba + 891bcd8 commit e6bb5d5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+6983
-1955
lines changed
Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &4107926565600371331
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 4107926565600371334}
12+
- component: {fileID: 4107926565600371333}
13+
- component: {fileID: 4107926565600371332}
14+
- component: {fileID: 4107926565600371335}
15+
- component: {fileID: 4107926565600371449}
16+
m_Layer: 0
17+
m_Name: MenuCamera
18+
m_TagString: MainCamera
19+
m_Icon: {fileID: 0}
20+
m_NavMeshLayer: 0
21+
m_StaticEditorFlags: 0
22+
m_IsActive: 1
23+
--- !u!4 &4107926565600371334
24+
Transform:
25+
m_ObjectHideFlags: 0
26+
m_CorrespondingSourceObject: {fileID: 0}
27+
m_PrefabInstance: {fileID: 0}
28+
m_PrefabAsset: {fileID: 0}
29+
m_GameObject: {fileID: 4107926565600371331}
30+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
31+
m_LocalPosition: {x: 0, y: 1, z: -64}
32+
m_LocalScale: {x: 1, y: 1, z: 1}
33+
m_Children: []
34+
m_Father: {fileID: 0}
35+
m_RootOrder: 0
36+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
37+
--- !u!20 &4107926565600371333
38+
Camera:
39+
m_ObjectHideFlags: 0
40+
m_CorrespondingSourceObject: {fileID: 0}
41+
m_PrefabInstance: {fileID: 0}
42+
m_PrefabAsset: {fileID: 0}
43+
m_GameObject: {fileID: 4107926565600371331}
44+
m_Enabled: 1
45+
serializedVersion: 2
46+
m_ClearFlags: 2
47+
m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
48+
m_projectionMatrixMode: 1
49+
m_GateFitMode: 2
50+
m_FOVAxisMode: 0
51+
m_SensorSize: {x: 36, y: 24}
52+
m_LensShift: {x: 0, y: 0}
53+
m_FocalLength: 50
54+
m_NormalizedViewPortRect:
55+
serializedVersion: 2
56+
x: 0
57+
y: 0
58+
width: 1
59+
height: 1
60+
near clip plane: 0.3
61+
far clip plane: 1000
62+
field of view: 30
63+
orthographic: 0
64+
orthographic size: 5
65+
m_Depth: -1
66+
m_CullingMask:
67+
serializedVersion: 2
68+
m_Bits: 4294967295
69+
m_RenderingPath: -1
70+
m_TargetTexture: {fileID: 0}
71+
m_TargetDisplay: 0
72+
m_TargetEye: 3
73+
m_HDR: 1
74+
m_AllowMSAA: 1
75+
m_AllowDynamicResolution: 0
76+
m_ForceIntoRT: 0
77+
m_OcclusionCulling: 1
78+
m_StereoConvergence: 10
79+
m_StereoSeparation: 0.022
80+
--- !u!81 &4107926565600371332
81+
AudioListener:
82+
m_ObjectHideFlags: 0
83+
m_CorrespondingSourceObject: {fileID: 0}
84+
m_PrefabInstance: {fileID: 0}
85+
m_PrefabAsset: {fileID: 0}
86+
m_GameObject: {fileID: 4107926565600371331}
87+
m_Enabled: 1
88+
--- !u!114 &4107926565600371335
89+
MonoBehaviour:
90+
m_ObjectHideFlags: 0
91+
m_CorrespondingSourceObject: {fileID: 0}
92+
m_PrefabInstance: {fileID: 0}
93+
m_PrefabAsset: {fileID: 0}
94+
m_GameObject: {fileID: 4107926565600371331}
95+
m_Enabled: 1
96+
m_EditorHideFlags: 0
97+
m_Script: {fileID: 11500000, guid: c49b4cc203aa6414fae5c798d1d0e7d6, type: 3}
98+
m_Name:
99+
m_EditorClassIdentifier:
100+
m_EventMask:
101+
serializedVersion: 2
102+
m_Bits: 4294967295
103+
m_MaxRayIntersections: 0
104+
--- !u!114 &4107926565600371449
105+
MonoBehaviour:
106+
m_ObjectHideFlags: 0
107+
m_CorrespondingSourceObject: {fileID: 0}
108+
m_PrefabInstance: {fileID: 0}
109+
m_PrefabAsset: {fileID: 0}
110+
m_GameObject: {fileID: 4107926565600371331}
111+
m_Enabled: 1
112+
m_EditorHideFlags: 0
113+
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
114+
m_Name:
115+
m_EditorClassIdentifier:
116+
m_RenderShadows: 1
117+
m_RequiresDepthTextureOption: 2
118+
m_RequiresOpaqueTextureOption: 2
119+
m_CameraType: 0
120+
m_Cameras: []
121+
m_RendererIndex: -1
122+
m_VolumeLayerMask:
123+
serializedVersion: 2
124+
m_Bits: 1
125+
m_VolumeTrigger: {fileID: 0}
126+
m_VolumeFrameworkUpdateModeOption: 2
127+
m_RenderPostProcessing: 1
128+
m_Antialiasing: 0
129+
m_AntialiasingQuality: 1
130+
m_StopNaN: 0
131+
m_Dithering: 0
132+
m_ClearDepth: 1
133+
m_AllowXRRendering: 1
134+
m_RequiresDepthTexture: 0
135+
m_RequiresColorTexture: 0
136+
m_Version: 2

Assets/BossRoom/Prefabs/GameCam/MenuCamera.prefab.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/BossRoom/Prefabs/NetworkingManager.prefab

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ MonoBehaviour:
4545
m_EditorClassIdentifier:
4646
m_ProtocolType: 0
4747
m_MaxPacketQueueSize: 512
48-
m_MaxPayloadSize: 16000
49-
m_MaxSendQueueSize: 98304
48+
m_MaxPayloadSize: 32000
49+
m_MaxSendQueueSize: 50000000
5050
m_HeartbeatTimeoutMS: 500
5151
m_ConnectTimeoutMS: 1000
5252
m_MaxConnectAttempts: 60
53-
m_DisconnectTimeoutMS: 30000
53+
m_DisconnectTimeoutMS: 10000
5454
ConnectionData:
5555
Address: 127.0.0.1
5656
Port: 7777
@@ -99,13 +99,13 @@ MonoBehaviour:
9999
m_Name:
100100
m_EditorClassIdentifier:
101101
m_ProtocolType: 1
102-
m_MaxPacketQueueSize: 256
102+
m_MaxPacketQueueSize: 512
103103
m_MaxPayloadSize: 32000
104-
m_MaxSendQueueSize: 98304
104+
m_MaxSendQueueSize: 50000000
105105
m_HeartbeatTimeoutMS: 500
106106
m_ConnectTimeoutMS: 1000
107107
m_MaxConnectAttempts: 60
108-
m_DisconnectTimeoutMS: 30000
108+
m_DisconnectTimeoutMS: 10000
109109
ConnectionData:
110110
Address: 127.0.0.1
111111
Port: 7777

0 commit comments

Comments
 (0)