Skip to content

Commit c5cf5d6

Browse files
committed
playerstate server request timeout
1 parent df23c60 commit c5cf5d6

File tree

3 files changed

+141
-121
lines changed

3 files changed

+141
-121
lines changed

l2-unity/Assets/Rendering/URP/UniversalRenderPipelineGlobalSettings.asset

+16-16
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,24 @@ MonoBehaviour:
3434
m_SettingsList:
3535
m_List:
3636
- rid: 1508332637135831040
37-
- rid: 4463062324232323537
38-
- rid: 4463062324232323538
37+
- rid: 8680220289346306130
38+
- rid: 8680220289346306131
3939
- rid: 1508332637135831043
40-
- rid: 4463062324232323539
40+
- rid: 8680220289346306132
4141
- rid: 1508332637135831045
4242
- rid: 1508332637135831046
4343
- rid: 1508332637135831047
4444
- rid: 1508332637135831048
45-
- rid: 4463062324232323540
45+
- rid: 8680220289346306133
4646
- rid: 1508332637135831050
4747
- rid: 4463062222631075946
4848
- rid: 1508332637135831052
4949
- rid: 1508332637135831053
50-
- rid: 4463062324232323541
51-
- rid: 4463062324232323542
50+
- rid: 8680220289346306134
51+
- rid: 8680220289346306135
5252
- rid: 1508332637135831056
53-
- rid: 4463062324232323543
54-
- rid: 4463062324232323544
53+
- rid: 8680220289346306136
54+
- rid: 8680220289346306137
5555
- rid: 1508332637135831059
5656
- rid: 1508332637135831060
5757
m_RuntimeSettings:
@@ -182,7 +182,7 @@ MonoBehaviour:
182182
m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
183183
m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
184184
m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
185-
- rid: 4463062324232323537
185+
- rid: 8680220289346306130
186186
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
187187
data:
188188
m_Version: 0
@@ -197,7 +197,7 @@ MonoBehaviour:
197197
m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
198198
m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
199199
m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
200-
- rid: 4463062324232323538
200+
- rid: 8680220289346306131
201201
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
202202
data:
203203
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
@@ -209,29 +209,29 @@ MonoBehaviour:
209209
m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
210210
m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
211211
m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
212-
- rid: 4463062324232323539
212+
- rid: 8680220289346306132
213213
type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
214214
data:
215215
m_Version: 0
216216
m_StripUnusedPostProcessingVariants: 0
217217
m_StripUnusedVariants: 1
218218
m_StripScreenCoordOverrideVariants: 1
219-
- rid: 4463062324232323540
219+
- rid: 8680220289346306133
220220
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
221221
data:
222222
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
223223
m_DefaultParticleMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2}
224224
m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2}
225225
m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
226226
m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
227-
- rid: 4463062324232323541
227+
- rid: 8680220289346306134
228228
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
229229
data:
230230
m_version: 0
231231
m_IncludeReferencedInScenes: 0
232232
m_IncludeAssetsByLabel: 0
233233
m_LabelToInclude:
234-
- rid: 4463062324232323542
234+
- rid: 8680220289346306135
235235
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
236236
data:
237237
m_Version: 1
@@ -244,7 +244,7 @@ MonoBehaviour:
244244
skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
245245
renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
246246
renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
247-
- rid: 4463062324232323543
247+
- rid: 8680220289346306136
248248
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
249249
data:
250250
m_Version: 1
@@ -254,7 +254,7 @@ MonoBehaviour:
254254
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
255255
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
256256
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
257-
- rid: 4463062324232323544
257+
- rid: 8680220289346306137
258258
type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
259259
data:
260260
m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}

l2-unity/Assets/Resources/Scenes/Menu.unity

+104-104
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,42 @@ Transform:
368368
m_Children: []
369369
m_Father: {fileID: 0}
370370
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
371+
--- !u!21 &446534881
372+
Material:
373+
serializedVersion: 8
374+
m_ObjectHideFlags: 0
375+
m_CorrespondingSourceObject: {fileID: 0}
376+
m_PrefabInstance: {fileID: 0}
377+
m_PrefabAsset: {fileID: 0}
378+
m_Name: Height Fog Global
379+
m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3}
380+
m_Parent: {fileID: 0}
381+
m_ModifiedSerializedProperties: 0
382+
m_ValidKeywords: []
383+
m_InvalidKeywords: []
384+
m_LightmapFlags: 4
385+
m_EnableInstancingVariants: 0
386+
m_DoubleSidedGI: 0
387+
m_CustomRenderQueue: 3000
388+
stringTagMap: {}
389+
disabledShaderPasses: []
390+
m_LockedProperties:
391+
m_SavedProperties:
392+
serializedVersion: 3
393+
m_TexEnvs: []
394+
m_Ints: []
395+
m_Floats:
396+
- _AdvancedCat: 1
397+
- _Banner: 1
398+
- _DirectionalCat: 1
399+
- _FogCat: 1
400+
- _HeightFogGlobal: 1
401+
- _IsHeightFogShader: 1
402+
- _NoiseCat: 1
403+
- _SkyboxCat: 1
404+
m_Colors: []
405+
m_BuildTextureStacks: []
406+
m_AllowLocking: 1
371407
--- !u!1001 &461980325
372408
PrefabInstance:
373409
m_ObjectHideFlags: 0
@@ -386,7 +422,7 @@ PrefabInstance:
386422
objectReference: {fileID: 0}
387423
- target: {fileID: 842763773635486120, guid: 2bc6245aea0342f4f8c76719bfe12012, type: 3}
388424
propertyPath: _enableLogs
389-
value: 1
425+
value: 0
390426
objectReference: {fileID: 0}
391427
- target: {fileID: 842763773635486120, guid: 2bc6245aea0342f4f8c76719bfe12012, type: 3}
392428
propertyPath: _protocolVersion
@@ -481,7 +517,27 @@ Transform:
481517
m_CorrespondingSourceObject: {fileID: 4565256171594102790, guid: a21ed0f290fe2a74b95fff92dfe8ddfd, type: 3}
482518
m_PrefabInstance: {fileID: 3866200442312394226}
483519
m_PrefabAsset: {fileID: 0}
484-
--- !u!21 &576320036
520+
--- !u!4 &577923690 stripped
521+
Transform:
522+
m_CorrespondingSourceObject: {fileID: 366637757882526997, guid: fb229ea28f4fa39459067629d99bca80, type: 3}
523+
m_PrefabInstance: {fileID: 583370724813813285}
524+
m_PrefabAsset: {fileID: 0}
525+
--- !u!4 &624066251 stripped
526+
Transform:
527+
m_CorrespondingSourceObject: {fileID: 5598476727830390111, guid: bdf1b8af6b09ee64a929728eda6b68fe, type: 3}
528+
m_PrefabInstance: {fileID: 8664614382163988692}
529+
m_PrefabAsset: {fileID: 0}
530+
--- !u!4 &634312724 stripped
531+
Transform:
532+
m_CorrespondingSourceObject: {fileID: 6632448577686294183, guid: 157a50d9f4ee1044aa6cb9189f2c7945, type: 3}
533+
m_PrefabInstance: {fileID: 3390961517074599752}
534+
m_PrefabAsset: {fileID: 0}
535+
--- !u!4 &691130325 stripped
536+
Transform:
537+
m_CorrespondingSourceObject: {fileID: 8789962366350326871, guid: 8da1883c4b37daf4b9a43afc824ae22e, type: 3}
538+
m_PrefabInstance: {fileID: 493211367756249381}
539+
m_PrefabAsset: {fileID: 0}
540+
--- !u!21 &729467973
485541
Material:
486542
serializedVersion: 8
487543
m_ObjectHideFlags: 0
@@ -517,26 +573,6 @@ Material:
517573
m_Colors: []
518574
m_BuildTextureStacks: []
519575
m_AllowLocking: 1
520-
--- !u!4 &577923690 stripped
521-
Transform:
522-
m_CorrespondingSourceObject: {fileID: 366637757882526997, guid: fb229ea28f4fa39459067629d99bca80, type: 3}
523-
m_PrefabInstance: {fileID: 583370724813813285}
524-
m_PrefabAsset: {fileID: 0}
525-
--- !u!4 &624066251 stripped
526-
Transform:
527-
m_CorrespondingSourceObject: {fileID: 5598476727830390111, guid: bdf1b8af6b09ee64a929728eda6b68fe, type: 3}
528-
m_PrefabInstance: {fileID: 8664614382163988692}
529-
m_PrefabAsset: {fileID: 0}
530-
--- !u!4 &634312724 stripped
531-
Transform:
532-
m_CorrespondingSourceObject: {fileID: 6632448577686294183, guid: 157a50d9f4ee1044aa6cb9189f2c7945, type: 3}
533-
m_PrefabInstance: {fileID: 3390961517074599752}
534-
m_PrefabAsset: {fileID: 0}
535-
--- !u!4 &691130325 stripped
536-
Transform:
537-
m_CorrespondingSourceObject: {fileID: 8789962366350326871, guid: 8da1883c4b37daf4b9a43afc824ae22e, type: 3}
538-
m_PrefabInstance: {fileID: 493211367756249381}
539-
m_PrefabAsset: {fileID: 0}
540576
--- !u!21 &778444643
541577
Material:
542578
serializedVersion: 8
@@ -807,23 +843,28 @@ MonoBehaviour:
807843
m_Script: {fileID: 11500000, guid: 1177ba05ca36d984cbb3a06a41092902, type: 3}
808844
m_Name:
809845
m_EditorClassIdentifier:
810-
--- !u!21 &806792618
846+
--- !u!4 &824654748 stripped
847+
Transform:
848+
m_CorrespondingSourceObject: {fileID: 8326592605788386137, guid: 57c057987f4c13e40acdc20078da16ff, type: 3}
849+
m_PrefabInstance: {fileID: 8462581516990386245}
850+
m_PrefabAsset: {fileID: 0}
851+
--- !u!21 &850900095
811852
Material:
812853
serializedVersion: 8
813854
m_ObjectHideFlags: 0
814855
m_CorrespondingSourceObject: {fileID: 0}
815856
m_PrefabInstance: {fileID: 0}
816857
m_PrefabAsset: {fileID: 0}
817-
m_Name: Height Fog Global
818-
m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3}
858+
m_Name: Override
859+
m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3}
819860
m_Parent: {fileID: 0}
820861
m_ModifiedSerializedProperties: 0
821862
m_ValidKeywords: []
822863
m_InvalidKeywords: []
823864
m_LightmapFlags: 4
824865
m_EnableInstancingVariants: 0
825866
m_DoubleSidedGI: 0
826-
m_CustomRenderQueue: 3000
867+
m_CustomRenderQueue: -1
827868
stringTagMap: {}
828869
disabledShaderPasses: []
829870
m_LockedProperties:
@@ -835,19 +876,48 @@ Material:
835876
- _AdvancedCat: 1
836877
- _Banner: 1
837878
- _DirectionalCat: 1
879+
- _DirectionalFalloff: 2
880+
- _DirectionalIntensity: 1
881+
- _FarDistanceHeight: 0
882+
- _FarDistanceOffset: 0
883+
- _FogAxisMode: 1
884+
- _FogCameraMode: 0
838885
- _FogCat: 1
839-
- _HeightFogGlobal: 1
886+
- _FogColorDuo: 1
887+
- _FogDistanceEnd: 100
888+
- _FogDistanceFalloff: 2
889+
- _FogDistanceStart: 0
890+
- _FogHeightEnd: 100
891+
- _FogHeightFalloff: 2
892+
- _FogHeightStart: 0
893+
- _FogIntensity: 1
894+
- _FogLayersMode: 0
895+
- _IsHeightFogPreset: 1
840896
- _IsHeightFogShader: 1
897+
- _JitterIntensity: 1
841898
- _NoiseCat: 1
899+
- _NoiseDistanceEnd: 50
900+
- _NoiseIntensity: 1
901+
- _NoiseMax: 1
902+
- _NoiseMin: 0
903+
- _NoiseModeBlend: 1
904+
- _NoiseScale: 30
842905
- _SkyboxCat: 1
843-
m_Colors: []
906+
- _SkyboxFogBottom: 0
907+
- _SkyboxFogFalloff: 1
908+
- _SkyboxFogFill: 1
909+
- _SkyboxFogHeight: 1
910+
- _SkyboxFogIntensity: 1
911+
- _SkyboxFogOffset: 0
912+
m_Colors:
913+
- _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1}
914+
- _DirectionalDir: {r: 0, g: 0, b: 0, a: 0}
915+
- _FogAxisOption: {r: 0, g: 0, b: 0, a: 0}
916+
- _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1}
917+
- _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1}
918+
- _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0}
844919
m_BuildTextureStacks: []
845920
m_AllowLocking: 1
846-
--- !u!4 &824654748 stripped
847-
Transform:
848-
m_CorrespondingSourceObject: {fileID: 8326592605788386137, guid: 57c057987f4c13e40acdc20078da16ff, type: 3}
849-
m_PrefabInstance: {fileID: 8462581516990386245}
850-
m_PrefabAsset: {fileID: 0}
851921
--- !u!4 &854671649 stripped
852922
Transform:
853923
m_CorrespondingSourceObject: {fileID: 4198530239212260665, guid: 472ea1e499a899e42a701bffe6a26a7f, type: 3}
@@ -1130,7 +1200,7 @@ PrefabInstance:
11301200
- target: {fileID: 14083907825353274, guid: 8742fc349ac4f354d9cfb98ebb79a0e3, type: 3}
11311201
propertyPath: 'm_Materials.Array.data[0]'
11321202
value:
1133-
objectReference: {fileID: 576320036}
1203+
objectReference: {fileID: 729467973}
11341204
- target: {fileID: 2134954596300280144, guid: 8742fc349ac4f354d9cfb98ebb79a0e3, type: 3}
11351205
propertyPath: m_Name
11361206
value: Height Fog Global
@@ -1397,76 +1467,6 @@ Transform:
13971467
m_CorrespondingSourceObject: {fileID: 7970840853338567417, guid: d5772e7de650d9b4c93729a090eefef6, type: 3}
13981468
m_PrefabInstance: {fileID: 4374905327095023860}
13991469
m_PrefabAsset: {fileID: 0}
1400-
--- !u!21 &1417090423
1401-
Material:
1402-
serializedVersion: 8
1403-
m_ObjectHideFlags: 0
1404-
m_CorrespondingSourceObject: {fileID: 0}
1405-
m_PrefabInstance: {fileID: 0}
1406-
m_PrefabAsset: {fileID: 0}
1407-
m_Name: Override
1408-
m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3}
1409-
m_Parent: {fileID: 0}
1410-
m_ModifiedSerializedProperties: 0
1411-
m_ValidKeywords: []
1412-
m_InvalidKeywords: []
1413-
m_LightmapFlags: 4
1414-
m_EnableInstancingVariants: 0
1415-
m_DoubleSidedGI: 0
1416-
m_CustomRenderQueue: -1
1417-
stringTagMap: {}
1418-
disabledShaderPasses: []
1419-
m_LockedProperties:
1420-
m_SavedProperties:
1421-
serializedVersion: 3
1422-
m_TexEnvs: []
1423-
m_Ints: []
1424-
m_Floats:
1425-
- _AdvancedCat: 1
1426-
- _Banner: 1
1427-
- _DirectionalCat: 1
1428-
- _DirectionalFalloff: 2
1429-
- _DirectionalIntensity: 1
1430-
- _FarDistanceHeight: 0
1431-
- _FarDistanceOffset: 0
1432-
- _FogAxisMode: 1
1433-
- _FogCameraMode: 0
1434-
- _FogCat: 1
1435-
- _FogColorDuo: 1
1436-
- _FogDistanceEnd: 100
1437-
- _FogDistanceFalloff: 2
1438-
- _FogDistanceStart: 0
1439-
- _FogHeightEnd: 100
1440-
- _FogHeightFalloff: 2
1441-
- _FogHeightStart: 0
1442-
- _FogIntensity: 1
1443-
- _FogLayersMode: 0
1444-
- _IsHeightFogPreset: 1
1445-
- _IsHeightFogShader: 1
1446-
- _JitterIntensity: 1
1447-
- _NoiseCat: 1
1448-
- _NoiseDistanceEnd: 50
1449-
- _NoiseIntensity: 1
1450-
- _NoiseMax: 1
1451-
- _NoiseMin: 0
1452-
- _NoiseModeBlend: 1
1453-
- _NoiseScale: 30
1454-
- _SkyboxCat: 1
1455-
- _SkyboxFogBottom: 0
1456-
- _SkyboxFogFalloff: 1
1457-
- _SkyboxFogFill: 1
1458-
- _SkyboxFogHeight: 1
1459-
- _SkyboxFogIntensity: 1
1460-
- _SkyboxFogOffset: 0
1461-
m_Colors:
1462-
- _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1}
1463-
- _DirectionalDir: {r: 0, g: 0, b: 0, a: 0}
1464-
- _FogAxisOption: {r: 0, g: 0, b: 0, a: 0}
1465-
- _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1}
1466-
- _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1}
1467-
- _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0}
1468-
m_BuildTextureStacks: []
1469-
m_AllowLocking: 1
14701470
--- !u!4 &1453875285 stripped
14711471
Transform:
14721472
m_CorrespondingSourceObject: {fileID: 5344243551557665710, guid: d4330641f80b3ed41b9bb1306ccec21c, type: 3}

0 commit comments

Comments
 (0)