From d3a9565d1d617d19bb6e375fd016f4fc2e8c4cad Mon Sep 17 00:00:00 2001 From: aevien Date: Sun, 12 May 2024 09:07:18 +1000 Subject: [PATCH] Third party license Some fixes in room and lobbies demo and missing scripts ref --- .../Scenes/Client/Client.unity | 236 +++- .../Scenes/Client/Client.unity | 257 +++- .../{UIButton.prefab => Button.prefab} | 2 +- ...IButton.prefab.meta => Button.prefab.meta} | 0 ...nWithIcon.prefab => ButtonWithIcon.prefab} | 2 +- ...prefab.meta => ButtonWithIcon.prefab.meta} | 0 .../Shared/Prefabs/UI/GamesListView.prefab | 1205 ++++++----------- .../Bridges/SqlSugar/Plugins/LICENSE.txt | 21 + .../Bridges/SqlSugar/Plugins/LICENSE.txt.meta | 7 + .../THIRD PARTY LICENSES.txt | 11 +- 10 files changed, 907 insertions(+), 834 deletions(-) rename Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/{UIButton.prefab => Button.prefab} (99%) rename Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/{UIButton.prefab.meta => Button.prefab.meta} (100%) rename Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/{UIButtonWithIcon.prefab => ButtonWithIcon.prefab} (99%) rename Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/{UIButtonWithIcon.prefab.meta => ButtonWithIcon.prefab.meta} (100%) create mode 100644 Assets/MasterServerToolkit/Bridges/SqlSugar/Plugins/LICENSE.txt create mode 100644 Assets/MasterServerToolkit/Bridges/SqlSugar/Plugins/LICENSE.txt.meta diff --git a/Assets/MasterServerToolkit/Bridges/FishNet/BasicRoomsAndLobbies/Scenes/Client/Client.unity b/Assets/MasterServerToolkit/Bridges/FishNet/BasicRoomsAndLobbies/Scenes/Client/Client.unity index 688ddeb4..3647f16c 100644 --- a/Assets/MasterServerToolkit/Bridges/FishNet/BasicRoomsAndLobbies/Scenes/Client/Client.unity +++ b/Assets/MasterServerToolkit/Bridges/FishNet/BasicRoomsAndLobbies/Scenes/Client/Client.unity @@ -105,7 +105,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -118,7 +118,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -129,6 +129,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1919906331} m_Modifications: - target: {fileID: 192162616222404208, guid: d2a62c3519b48fe40a37aa32c7fe124f, @@ -307,6 +308,33 @@ PrefabInstance: value: MenuView objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8249671915748336638, guid: d2a62c3519b48fe40a37aa32c7fe124f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 772302512} + - targetCorrespondingSourceObject: {fileID: 8249671915748336638, guid: d2a62c3519b48fe40a37aa32c7fe124f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 867986846} + - targetCorrespondingSourceObject: {fileID: 8249671915748336638, guid: d2a62c3519b48fe40a37aa32c7fe124f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1898883022} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8249671917318911622, guid: d2a62c3519b48fe40a37aa32c7fe124f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 24947290} + - targetCorrespondingSourceObject: {fileID: 8249671917318911622, guid: d2a62c3519b48fe40a37aa32c7fe124f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 24947289} + - targetCorrespondingSourceObject: {fileID: 8249671915748336639, guid: d2a62c3519b48fe40a37aa32c7fe124f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 24947288} m_SourcePrefab: {fileID: 100100000, guid: d2a62c3519b48fe40a37aa32c7fe124f, type: 3} --- !u!224 &24947284 stripped RectTransform: @@ -409,6 +437,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1919906331} m_Modifications: - target: {fileID: 775915179769032592, guid: 6806bba2cf0114648824a9808cd98024, @@ -722,6 +751,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6806bba2cf0114648824a9808cd98024, type: 3} --- !u!224 &76142418 stripped RectTransform: @@ -797,13 +829,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 178791788} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 3103.9978, y: 543.1653, z: -2735.25} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &225874500 GameObject: @@ -829,13 +861,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 225874500} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.01859665, y: -4.7438564, z: 5.4251614} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &225874502 MonoBehaviour: @@ -859,6 +891,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1182598396324832456, guid: 7eac22982fe8d5547be9015c7bdb378e, @@ -962,6 +995,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7eac22982fe8d5547be9015c7bdb378e, type: 3} --- !u!1 &472155954 GameObject: @@ -987,13 +1023,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 472155954} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &472155957 MonoBehaviour: @@ -1021,6 +1057,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1919906331} m_Modifications: - target: {fileID: 11209950923185052, guid: 93bf78af47bfec04f949149d89a5a870, @@ -1219,6 +1256,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 93bf78af47bfec04f949149d89a5a870, type: 3} --- !u!224 &644201642 stripped RectTransform: @@ -1231,6 +1271,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1919906331} m_Modifications: - target: {fileID: 145185036992845483, guid: e32bcaa6851ede046a2f98cd07af5fc4, @@ -1383,6 +1424,36 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1220396752658778692, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1220396752658778692, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1220396752658778692, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1220396752658778692, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1220396752658778692, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1220396752658778692, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1596460332324185924, guid: e32bcaa6851ede046a2f98cd07af5fc4, type: 3} propertyPath: m_AnchorMax.y @@ -1643,6 +1714,36 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4521254528489752079, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4521254528489752079, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4521254528489752079, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4521254528489752079, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4521254528489752079, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4521254528489752079, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4796067378878323843, guid: e32bcaa6851ede046a2f98cd07af5fc4, type: 3} propertyPath: m_AnchorMax.y @@ -2259,6 +2360,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e32bcaa6851ede046a2f98cd07af5fc4, type: 3} --- !u!224 &742297628 stripped RectTransform: @@ -2283,6 +2387,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 24947285} m_Modifications: - target: {fileID: 3658193353867674886, guid: 6f139267009e9a44cb68786e53bdb5dc, @@ -2530,13 +2635,27 @@ PrefabInstance: propertyPath: m_textInfo.characterCount value: 0 objectReference: {fileID: 0} + - target: {fileID: 6721385568205909569, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_text + value: Servers + objectReference: {fileID: 0} - target: {fileID: 9184578206818738323, guid: 6f139267009e9a44cb68786e53bdb5dc, type: 3} propertyPath: m_AnchoredPosition.y value: -0.000030517578 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6f139267009e9a44cb68786e53bdb5dc, type: 3} +--- !u!224 &772302512 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + m_PrefabInstance: {fileID: 772302511} + m_PrefabAsset: {fileID: 0} --- !u!1 &829177792 GameObject: m_ObjectHideFlags: 0 @@ -2597,13 +2716,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 829177792} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &840627750 GameObject: @@ -2689,13 +2808,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 840627750} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &840627754 MonoBehaviour: @@ -2748,6 +2867,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 24947285} m_Modifications: - target: {fileID: 3658193353867674886, guid: 6f139267009e9a44cb68786e53bdb5dc, @@ -2975,18 +3095,33 @@ PrefabInstance: propertyPath: m_textInfo.characterCount value: 0 objectReference: {fileID: 0} + - target: {fileID: 6721385568205909569, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_text + value: Sign out + objectReference: {fileID: 0} - target: {fileID: 9184578206818738323, guid: 6f139267009e9a44cb68786e53bdb5dc, type: 3} propertyPath: m_AnchoredPosition.y value: -0.000030517578 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6f139267009e9a44cb68786e53bdb5dc, type: 3} +--- !u!224 &867986846 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + m_PrefabInstance: {fileID: 867986845} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1043072637 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1919906331} m_Modifications: - target: {fileID: 2399383727513722221, guid: 332c57a2374b8544582abd08d466dbeb, @@ -3190,6 +3325,9 @@ PrefabInstance: value: objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 332c57a2374b8544582abd08d466dbeb, type: 3} --- !u!224 &1043072638 stripped RectTransform: @@ -3202,6 +3340,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1919906331} m_Modifications: - target: {fileID: 737710237089841081, guid: a1552ecf101b80b43bb9298bf85a9fda, @@ -3375,6 +3514,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a1552ecf101b80b43bb9298bf85a9fda, type: 3} --- !u!224 &1048701663 stripped RectTransform: @@ -3387,6 +3529,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1919906331} m_Modifications: - target: {fileID: 931275245582735279, guid: 59e4f62c32cfeb541a8d58ff9f8fdf1b, @@ -3715,6 +3858,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 59e4f62c32cfeb541a8d58ff9f8fdf1b, type: 3} --- !u!224 &1529182425 stripped RectTransform: @@ -3727,6 +3873,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1919906331} m_Modifications: - target: {fileID: 2374626101778073630, guid: 8ada41da18c269146b885553bc7b6d0f, @@ -3840,6 +3987,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8ada41da18c269146b885553bc7b6d0f, type: 3} --- !u!224 &1584705953 stripped RectTransform: @@ -3901,13 +4051,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1669626095} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -414.41418, y: -2566.0059, z: -9.90625} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1864705747 GameObject: @@ -3996,13 +4146,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1864705747} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &1864705750 MonoBehaviour: @@ -4016,19 +4166,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 + m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 m_LightLayerMask: 1 + m_RenderingLayers: 1 m_CustomShadowLayers: 0 m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 1 --- !u!1001 &1878733549 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1919906331} m_Modifications: - target: {fileID: 757970464299322744, guid: 486cd82c994506a4d9b252b2abc8c4a5, @@ -4317,6 +4471,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 486cd82c994506a4d9b252b2abc8c4a5, type: 3} --- !u!224 &1878733550 stripped RectTransform: @@ -4329,6 +4486,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 24947285} m_Modifications: - target: {fileID: 3658193353867674886, guid: 6f139267009e9a44cb68786e53bdb5dc, @@ -4556,13 +4714,27 @@ PrefabInstance: propertyPath: m_textInfo.characterCount value: 0 objectReference: {fileID: 0} + - target: {fileID: 6721385568205909569, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_text + value: Quit + objectReference: {fileID: 0} - target: {fileID: 9184578206818738323, guid: 6f139267009e9a44cb68786e53bdb5dc, type: 3} propertyPath: m_AnchoredPosition.y value: -0.000030517578 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6f139267009e9a44cb68786e53bdb5dc, type: 3} +--- !u!224 &1898883022 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + m_PrefabInstance: {fileID: 1898883021} + m_PrefabAsset: {fileID: 0} --- !u!224 &1913431610 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4465368499774140375, guid: 42ba4e1d050683c4cb8c16de9131ac83, @@ -4645,7 +4817,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -4672,7 +4846,6 @@ RectTransform: - {fileID: 1878733550} - {fileID: 1043072638} m_Father: {fileID: 0} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4720,9 +4893,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -4756,13 +4937,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2026876371} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2026876375 MonoBehaviour: @@ -4794,14 +4975,26 @@ MonoBehaviour: m_Dithering: 0 m_ClearDepth: 1 m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 --- !u!1001 &4465368497929390573 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1919906331} m_Modifications: - target: {fileID: 532061940266574293, guid: 42ba4e1d050683c4cb8c16de9131ac83, @@ -4985,4 +5178,21 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 42ba4e1d050683c4cb8c16de9131ac83, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 2026876374} + - {fileID: 1864705749} + - {fileID: 829177795} + - {fileID: 178791790} + - {fileID: 840627753} + - {fileID: 225874501} + - {fileID: 1669626097} + - {fileID: 1919906331} + - {fileID: 472155956} + - {fileID: 277505142} diff --git a/Assets/MasterServerToolkit/Bridges/Mirror/BasicRoomsAndLobbies/Scenes/Client/Client.unity b/Assets/MasterServerToolkit/Bridges/Mirror/BasicRoomsAndLobbies/Scenes/Client/Client.unity index 4c391280..7f6110c2 100644 --- a/Assets/MasterServerToolkit/Bridges/Mirror/BasicRoomsAndLobbies/Scenes/Client/Client.unity +++ b/Assets/MasterServerToolkit/Bridges/Mirror/BasicRoomsAndLobbies/Scenes/Client/Client.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -128,6 +128,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1919906331} m_Modifications: - target: {fileID: 192162616222404208, guid: d2a62c3519b48fe40a37aa32c7fe124f, @@ -306,6 +307,33 @@ PrefabInstance: value: MenuView objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8249671915748336638, guid: d2a62c3519b48fe40a37aa32c7fe124f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2064571003} + - targetCorrespondingSourceObject: {fileID: 8249671915748336638, guid: d2a62c3519b48fe40a37aa32c7fe124f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1430949017} + - targetCorrespondingSourceObject: {fileID: 8249671915748336638, guid: d2a62c3519b48fe40a37aa32c7fe124f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 344990503} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8249671917318911622, guid: d2a62c3519b48fe40a37aa32c7fe124f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 24947290} + - targetCorrespondingSourceObject: {fileID: 8249671917318911622, guid: d2a62c3519b48fe40a37aa32c7fe124f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 24947289} + - targetCorrespondingSourceObject: {fileID: 8249671915748336639, guid: d2a62c3519b48fe40a37aa32c7fe124f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 24947288} m_SourcePrefab: {fileID: 100100000, guid: d2a62c3519b48fe40a37aa32c7fe124f, type: 3} --- !u!224 &24947284 stripped RectTransform: @@ -376,6 +404,7 @@ MonoBehaviour: ignoreHideAll: 0 useRaycastBlock: 1 blockInput: 0 + unlockCursor: 0 logLevel: 3 titleLable: {fileID: 0} OnShowEvent: @@ -407,6 +436,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1919906331} m_Modifications: - target: {fileID: 931275245582735279, guid: 59e4f62c32cfeb541a8d58ff9f8fdf1b, @@ -740,6 +770,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 59e4f62c32cfeb541a8d58ff9f8fdf1b, type: 3} --- !u!224 &107399132 stripped RectTransform: @@ -784,6 +817,9 @@ MonoBehaviour: maxAttemptsToConnect: 5 waitAndConnect: 0.2 connectOnStart: 1 + useSecure: 0 + service: mst + password: mst OnConnectedEvent: m_PersistentCalls: m_Calls: [] @@ -800,13 +836,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 178791788} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 3103.9978, y: 543.1653, z: -2735.25} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &225874500 GameObject: @@ -832,13 +868,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 225874500} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.01859665, y: -4.7438564, z: 5.4251614} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &225874502 MonoBehaviour: @@ -857,6 +893,12 @@ MonoBehaviour: resolutionMultiplier: 1 screenshoKey: 107 format: 3 +--- !u!224 &344990503 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + m_PrefabInstance: {fileID: 1898883021} + m_PrefabAsset: {fileID: 0} --- !u!1 &472155954 GameObject: m_ObjectHideFlags: 0 @@ -886,15 +928,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: aab5ad002bb1a8b4bbdfa6d7b201a512, type: 3} m_Name: m_EditorClassIdentifier: - logLevel: 3 - isGlobal: 1 - roomConnectionTimeout: 10 - autoStartInEditor: 0 - autoStartDelay: 1 - signInAsGuest: 1 - username: qwerty - password: qwerty12345 - offlineRoomScene: Client --- !u!4 &472155956 Transform: m_ObjectHideFlags: 0 @@ -902,19 +935,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 472155954} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &644201641 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1919906331} m_Modifications: - target: {fileID: 11209950923185052, guid: 93bf78af47bfec04f949149d89a5a870, @@ -1113,6 +1147,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 93bf78af47bfec04f949149d89a5a870, type: 3} --- !u!224 &644201642 stripped RectTransform: @@ -1125,6 +1162,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 24947285} m_Modifications: - target: {fileID: 3658193353867674886, guid: 6f139267009e9a44cb68786e53bdb5dc, @@ -1372,12 +1410,20 @@ PrefabInstance: propertyPath: m_textInfo.characterCount value: 0 objectReference: {fileID: 0} + - target: {fileID: 6721385568205909569, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_text + value: Servers + objectReference: {fileID: 0} - target: {fileID: 9184578206818738323, guid: 6f139267009e9a44cb68786e53bdb5dc, type: 3} propertyPath: m_AnchoredPosition.y value: -0.000030517578 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6f139267009e9a44cb68786e53bdb5dc, type: 3} --- !u!1 &829177792 GameObject: @@ -1439,13 +1485,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 829177792} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &840627750 GameObject: @@ -1531,13 +1577,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 840627750} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &840627754 MonoBehaviour: @@ -1590,6 +1636,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 24947285} m_Modifications: - target: {fileID: 3658193353867674886, guid: 6f139267009e9a44cb68786e53bdb5dc, @@ -1817,18 +1864,27 @@ PrefabInstance: propertyPath: m_textInfo.characterCount value: 0 objectReference: {fileID: 0} + - target: {fileID: 6721385568205909569, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_text + value: Sign out + objectReference: {fileID: 0} - target: {fileID: 9184578206818738323, guid: 6f139267009e9a44cb68786e53bdb5dc, type: 3} propertyPath: m_AnchoredPosition.y value: -0.000030517578 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6f139267009e9a44cb68786e53bdb5dc, type: 3} --- !u!1001 &1043072637 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1919906331} m_Modifications: - target: {fileID: 2399383727513722221, guid: 332c57a2374b8544582abd08d466dbeb, @@ -2032,6 +2088,9 @@ PrefabInstance: value: objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 332c57a2374b8544582abd08d466dbeb, type: 3} --- !u!224 &1043072638 stripped RectTransform: @@ -2044,6 +2103,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 643701551274921288, guid: 3114b2bf90808704bae88ad10a2aafd1, @@ -2132,12 +2192,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3114b2bf90808704bae88ad10a2aafd1, type: 3} --- !u!1001 &1196553766 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1919906331} m_Modifications: - target: {fileID: 145185036992845483, guid: e32bcaa6851ede046a2f98cd07af5fc4, @@ -2290,6 +2354,36 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1220396752658778692, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1220396752658778692, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1220396752658778692, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1220396752658778692, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1220396752658778692, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1220396752658778692, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1596460332324185924, guid: e32bcaa6851ede046a2f98cd07af5fc4, type: 3} propertyPath: m_AnchorMax.y @@ -2550,6 +2644,36 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4521254528489752079, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4521254528489752079, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4521254528489752079, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4521254528489752079, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4521254528489752079, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4521254528489752079, guid: e32bcaa6851ede046a2f98cd07af5fc4, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4796067378878323843, guid: e32bcaa6851ede046a2f98cd07af5fc4, type: 3} propertyPath: m_AnchorMax.y @@ -3161,6 +3285,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e32bcaa6851ede046a2f98cd07af5fc4, type: 3} --- !u!114 &1196553767 stripped MonoBehaviour: @@ -3186,11 +3313,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 298741313924256674} m_PrefabAsset: {fileID: 0} +--- !u!224 &1430949017 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + m_PrefabInstance: {fileID: 867986845} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1584705952 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1919906331} m_Modifications: - target: {fileID: 2374626101778073630, guid: 8ada41da18c269146b885553bc7b6d0f, @@ -3304,6 +3438,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8ada41da18c269146b885553bc7b6d0f, type: 3} --- !u!224 &1584705953 stripped RectTransform: @@ -3316,6 +3453,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1919906331} m_Modifications: - target: {fileID: 737710237089841081, guid: a1552ecf101b80b43bb9298bf85a9fda, @@ -3401,12 +3539,12 @@ PrefabInstance: - target: {fileID: 737710237089841081, guid: a1552ecf101b80b43bb9298bf85a9fda, type: 3} propertyPath: m_AnchoredPosition.x - value: -2000 + value: -6145 objectReference: {fileID: 0} - target: {fileID: 737710237089841081, guid: a1552ecf101b80b43bb9298bf85a9fda, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 22 objectReference: {fileID: 0} - target: {fileID: 737710237089841081, guid: a1552ecf101b80b43bb9298bf85a9fda, type: 3} @@ -3489,6 +3627,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a1552ecf101b80b43bb9298bf85a9fda, type: 3} --- !u!224 &1647318171 stripped RectTransform: @@ -3550,13 +3691,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1669626095} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -414.41418, y: -2566.0059, z: -9.90625} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1864705747 GameObject: @@ -3645,13 +3786,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1864705747} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &1864705750 MonoBehaviour: @@ -3665,19 +3806,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 + m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 m_LightLayerMask: 1 + m_RenderingLayers: 1 m_CustomShadowLayers: 0 m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 1 --- !u!1001 &1878733549 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1919906331} m_Modifications: - target: {fileID: 757970464299322744, guid: 486cd82c994506a4d9b252b2abc8c4a5, @@ -3966,6 +4111,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 486cd82c994506a4d9b252b2abc8c4a5, type: 3} --- !u!224 &1878733550 stripped RectTransform: @@ -3978,6 +4126,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 24947285} m_Modifications: - target: {fileID: 3658193353867674886, guid: 6f139267009e9a44cb68786e53bdb5dc, @@ -4205,18 +4354,27 @@ PrefabInstance: propertyPath: m_textInfo.characterCount value: 0 objectReference: {fileID: 0} + - target: {fileID: 6721385568205909569, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_text + value: Quit + objectReference: {fileID: 0} - target: {fileID: 9184578206818738323, guid: 6f139267009e9a44cb68786e53bdb5dc, type: 3} propertyPath: m_AnchoredPosition.y value: -0.000030517578 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6f139267009e9a44cb68786e53bdb5dc, type: 3} --- !u!1001 &1907267011 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1919906331} m_Modifications: - target: {fileID: 775915179769032592, guid: 6806bba2cf0114648824a9808cd98024, @@ -4535,6 +4693,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6806bba2cf0114648824a9808cd98024, type: 3} --- !u!224 &1907267012 stripped RectTransform: @@ -4636,7 +4797,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -4664,7 +4827,6 @@ RectTransform: - {fileID: 1913431610} - {fileID: 107399132} m_Father: {fileID: 0} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4712,9 +4874,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -4748,13 +4918,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2026876371} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2026876375 MonoBehaviour: @@ -4786,14 +4956,32 @@ MonoBehaviour: m_Dithering: 0 m_ClearDepth: 1 m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 +--- !u!224 &2064571003 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + m_PrefabInstance: {fileID: 772302511} + m_PrefabAsset: {fileID: 0} --- !u!1001 &298741313924256674 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1919906331} m_Modifications: - target: {fileID: 206294512009859601, guid: 4e95c14fa2ac97645bbe41ebe05200f6, @@ -5027,12 +5215,16 @@ PrefabInstance: value: PasswordInputDialogBoxView objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e95c14fa2ac97645bbe41ebe05200f6, type: 3} --- !u!1001 &4465368497929390573 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1919906331} m_Modifications: - target: {fileID: 532061940266574293, guid: 42ba4e1d050683c4cb8c16de9131ac83, @@ -5216,4 +5408,21 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 42ba4e1d050683c4cb8c16de9131ac83, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 2026876374} + - {fileID: 1864705749} + - {fileID: 829177795} + - {fileID: 178791790} + - {fileID: 840627753} + - {fileID: 225874501} + - {fileID: 1669626097} + - {fileID: 1919906331} + - {fileID: 472155956} + - {fileID: 1092388787} diff --git a/Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/UIButton.prefab b/Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/Button.prefab similarity index 99% rename from Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/UIButton.prefab rename to Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/Button.prefab index 27eb53e9..ecc4bcca 100644 --- a/Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/UIButton.prefab +++ b/Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/Button.prefab @@ -14,7 +14,7 @@ GameObject: - component: {fileID: 4180842736270822485} - component: {fileID: 4180842736270822484} m_Layer: 5 - m_Name: UIButton + m_Name: Button m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/UIButton.prefab.meta b/Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/Button.prefab.meta similarity index 100% rename from Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/UIButton.prefab.meta rename to Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/Button.prefab.meta diff --git a/Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/UIButtonWithIcon.prefab b/Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/ButtonWithIcon.prefab similarity index 99% rename from Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/UIButtonWithIcon.prefab rename to Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/ButtonWithIcon.prefab index a19ab0b1..2a28d8b4 100644 --- a/Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/UIButtonWithIcon.prefab +++ b/Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/ButtonWithIcon.prefab @@ -15,7 +15,7 @@ GameObject: - component: {fileID: 3658193353867674886} - component: {fileID: 4180842736270822484} m_Layer: 5 - m_Name: UIButtonWithIcon + m_Name: ButtonWithIcon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/UIButtonWithIcon.prefab.meta b/Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/ButtonWithIcon.prefab.meta similarity index 100% rename from Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/UIButtonWithIcon.prefab.meta rename to Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/ButtonWithIcon.prefab.meta diff --git a/Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/GamesListView.prefab b/Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/GamesListView.prefab index 8f7e2478..e8f6f788 100644 --- a/Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/GamesListView.prefab +++ b/Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/GamesListView.prefab @@ -32,7 +32,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3019322837800799152} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -156,162 +155,6 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!1 &1044115034237036075 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7725565070153098269} - - component: {fileID: 8035468258815222861} - - component: {fileID: 5262383426589436623} - - component: {fileID: 8844066394122474423} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7725565070153098269 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1044115034237036075} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3334285611408050393} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.00002670288} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8035468258815222861 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1044115034237036075} - m_CullTransparentMesh: 0 ---- !u!114 &5262383426589436623 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1044115034237036075} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Join - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: e73a58f6e2794ae7b1b7e50b7fb811b0, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 10 - m_fontSizeMax: 20 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 5, y: 5, z: 5, w: 5} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &8844066394122474423 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1044115034237036075} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: 45 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!1 &1112200537850348337 GameObject: m_ObjectHideFlags: 0 @@ -354,10 +197,9 @@ RectTransform: - {fileID: 7036455867138515773} - {fileID: 6122999064401402378} - {fileID: 9083283061475491909} - - {fileID: 5871549995040132900} - - {fileID: 3334285611408050393} + - {fileID: 1220396752658778692} + - {fileID: 4521254528489752079} m_Father: {fileID: 3295005238449551486} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -419,7 +261,6 @@ GameObject: - component: {fileID: 3019322837800799164} - component: {fileID: 3019322837800799165} - component: {fileID: 3019322837800799154} - - component: {fileID: 2388912451725607649} - component: {fileID: 3019322837800799155} m_Layer: 5 m_Name: createNewGameButton @@ -442,7 +283,6 @@ RectTransform: m_Children: - {fileID: 7824355062508889972} m_Father: {fileID: 3417764325996072515} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -556,22 +396,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &2388912451725607649 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3019322837800799153} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a0caa14608ae8d148b5cb724fcd55461, type: 3} - m_Name: - m_EditorClassIdentifier: - iconImage: {fileID: 0} - lableText: {fileID: 5666853100527233446} - iconValue: {fileID: 0} - lableValue: Create New Game --- !u!114 &3019322837800799155 MonoBehaviour: m_ObjectHideFlags: 0 @@ -626,7 +450,6 @@ RectTransform: - {fileID: 3019322837800799152} - {fileID: 8455087263268552971} m_Father: {fileID: 7718521320327659353} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -700,7 +523,6 @@ RectTransform: m_Children: - {fileID: 3816074071907012218} m_Father: {fileID: 9122386065816629338} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -794,7 +616,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!1 &3334285611408050392 +--- !u!1 &4506343696014171554 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -802,70 +624,68 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3334285611408050393} - - component: {fileID: 3334285611408050389} - - component: {fileID: 3334285611408050388} - - component: {fileID: 3334285611408050395} - - component: {fileID: 2775367672129896840} - - component: {fileID: 3334285611408050394} + - component: {fileID: 9122386065816629338} + - component: {fileID: 8451938638583986148} + - component: {fileID: 3884164824939198489} + - component: {fileID: 5353583171262073398} m_Layer: 5 - m_Name: Button (1) + m_Name: Scroll View m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3334285611408050393 +--- !u!224 &9122386065816629338 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3334285611408050392} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 4506343696014171554} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7725565070153098269} - m_Father: {fileID: 5232747758760812903} - m_RootOrder: 13 + - {fileID: 3295005238449551486} + - {fileID: 4669448388501901801} + - {fileID: 3132098905744926954} + m_Father: {fileID: 7718521320327659353} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!222 &3334285611408050389 + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.00012207031, y: 32.500008} + m_SizeDelta: {x: 0, y: -65} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8451938638583986148 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3334285611408050392} + m_GameObject: {fileID: 4506343696014171554} m_CullTransparentMesh: 0 ---- !u!114 &3334285611408050388 +--- !u!114 &3884164824939198489 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3334285611408050392} + m_GameObject: {fileID: 4506343696014171554} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.45098042, b: 0, a: 1} + m_Color: {r: 0.18039216, g: 0.22745098, b: 0.2901961, a: 0.9019608} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -5667121454029602559, guid: 416056e89e6001e4f8e71275cf669cce, - type: 3} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -875,214 +695,54 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &3334285611408050395 +--- !u!114 &5353583171262073398 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3334285611408050392} + m_GameObject: {fileID: 4506343696014171554} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} m_Name: m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 3334285611408050388} - m_OnClick: + m_Content: {fileID: 5232747758760812903} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 45 + m_Viewport: {fileID: 3295005238449551486} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 6403640130329988982} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!114 &2775367672129896840 -MonoBehaviour: +--- !u!1 &4630576353049228801 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3334285611408050392} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a0caa14608ae8d148b5cb724fcd55461, type: 3} - m_Name: - m_EditorClassIdentifier: - iconImage: {fileID: 0} - lableText: {fileID: 5262383426589436623} - iconValue: {fileID: 0} - lableValue: Join ---- !u!114 &3334285611408050394 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3334285611408050392} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: 45 - m_PreferredWidth: -1 - m_PreferredHeight: 45 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!1 &4506343696014171554 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9122386065816629338} - - component: {fileID: 8451938638583986148} - - component: {fileID: 3884164824939198489} - - component: {fileID: 5353583171262073398} - m_Layer: 5 - m_Name: Scroll View - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9122386065816629338 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4506343696014171554} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3295005238449551486} - - {fileID: 4669448388501901801} - - {fileID: 3132098905744926954} - m_Father: {fileID: 7718521320327659353} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.00012207031, y: 32.500008} - m_SizeDelta: {x: 0, y: -65} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8451938638583986148 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4506343696014171554} - m_CullTransparentMesh: 0 ---- !u!114 &3884164824939198489 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4506343696014171554} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.18039216, g: 0.22745098, b: 0.2901961, a: 0.9019608} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5353583171262073398 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4506343696014171554} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 5232747758760812903} - m_Horizontal: 0 - m_Vertical: 1 - m_MovementType: 1 - m_Elasticity: 0.1 - m_Inertia: 1 - m_DecelerationRate: 0.135 - m_ScrollSensitivity: 45 - m_Viewport: {fileID: 3295005238449551486} - m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 6403640130329988982} - m_HorizontalScrollbarVisibility: 2 - m_VerticalScrollbarVisibility: 2 - m_HorizontalScrollbarSpacing: -3 - m_VerticalScrollbarSpacing: -3 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &4630576353049228801 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3816074071907012218} - m_Layer: 5 - m_Name: Sliding Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3816074071907012218 -RectTransform: + serializedVersion: 6 + m_Component: + - component: {fileID: 3816074071907012218} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3816074071907012218 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1095,7 +755,6 @@ RectTransform: m_Children: - {fileID: 7890020956837372545} m_Father: {fileID: 4669448388501901801} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1135,7 +794,6 @@ RectTransform: m_Children: - {fileID: 5232747758760812903} m_Father: {fileID: 9122386065816629338} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1225,7 +883,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9122386065816629338} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1349,167 +1006,6 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!1 &5871549995040132901 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5871549995040132900} - - component: {fileID: 5871549995040132904} - - component: {fileID: 5871549995040132905} - - component: {fileID: 5871549995040132902} - - component: {fileID: 6465544763748370037} - - component: {fileID: 5871549995040132903} - m_Layer: 5 - m_Name: Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5871549995040132900 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5871549995040132901} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1443567483366155232} - m_Father: {fileID: 5232747758760812903} - m_RootOrder: 12 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!222 &5871549995040132904 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5871549995040132901} - m_CullTransparentMesh: 0 ---- !u!114 &5871549995040132905 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5871549995040132901} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.45098042, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: -5667121454029602559, guid: 416056e89e6001e4f8e71275cf669cce, - type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5871549995040132902 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5871549995040132901} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 5871549995040132905} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &6465544763748370037 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5871549995040132901} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a0caa14608ae8d148b5cb724fcd55461, type: 3} - m_Name: - m_EditorClassIdentifier: - iconImage: {fileID: 0} - lableText: {fileID: 3907313983781612850} - iconValue: {fileID: 0} - lableValue: 0 / 100 ---- !u!114 &5871549995040132903 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5871549995040132901} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: 45 - m_PreferredWidth: -1 - m_PreferredHeight: 45 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!1 &6155913952044915400 GameObject: m_ObjectHideFlags: 0 @@ -1542,7 +1038,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8455087263745422394} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1698,7 +1193,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8455087263268552971} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1853,7 +1347,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3816074071907012218} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1861,199 +1354,43 @@ RectTransform: m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8484451432203797900 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7373343672545843007} - m_CullTransparentMesh: 0 ---- !u!114 &4772888119183690003 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7373343672545843007} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.4509804, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8161469835275657686 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1443567483366155232} - - component: {fileID: 1206291023012537264} - - component: {fileID: 3907313983781612850} - - component: {fileID: 396953395704878154} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1443567483366155232 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8161469835275657686} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5871549995040132900} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.00002670288} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1206291023012537264 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8161469835275657686} - m_CullTransparentMesh: 0 ---- !u!114 &3907313983781612850 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8161469835275657686} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: 0 / 100 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: e73a58f6e2794ae7b1b7e50b7fb811b0, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 10 - m_fontSizeMax: 20 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 5, y: 5, z: 5, w: 5} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &396953395704878154 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7373343672545843007} + m_CullTransparentMesh: 0 +--- !u!114 &4772888119183690003 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8161469835275657686} + m_GameObject: {fileID: 7373343672545843007} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: 45 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.4509804, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8455087263268552970 GameObject: m_ObjectHideFlags: 0 @@ -2066,7 +1403,6 @@ GameObject: - component: {fileID: 8455087263268552967} - component: {fileID: 8455087263268552966} - component: {fileID: 8455087263268552969} - - component: {fileID: 9049794583600744538} - component: {fileID: 8455087263268552968} m_Layer: 5 m_Name: cancelButton @@ -2089,7 +1425,6 @@ RectTransform: m_Children: - {fileID: 3469454478846275023} m_Father: {fileID: 3417764325996072515} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2203,22 +1538,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &9049794583600744538 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8455087263268552970} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a0caa14608ae8d148b5cb724fcd55461, type: 3} - m_Name: - m_EditorClassIdentifier: - iconImage: {fileID: 0} - lableText: {fileID: 1302947465101910813} - iconValue: {fileID: 0} - lableValue: Cancel --- !u!114 &8455087263268552968 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2251,7 +1570,6 @@ GameObject: - component: {fileID: 8455087263745422390} - component: {fileID: 8455087263745422391} - component: {fileID: 8455087263745422392} - - component: {fileID: 9049794583129636203} - component: {fileID: 8455087263745422393} m_Layer: 5 m_Name: updateButton @@ -2274,7 +1592,6 @@ RectTransform: m_Children: - {fileID: 3469454477444110590} m_Father: {fileID: 3417764325996072515} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2376,22 +1693,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &9049794583129636203 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8455087263745422395} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a0caa14608ae8d148b5cb724fcd55461, type: 3} - m_Name: - m_EditorClassIdentifier: - iconImage: {fileID: 0} - lableText: {fileID: 1302947463687165484} - iconValue: {fileID: 0} - lableValue: Update List --- !u!114 &8455087263745422393 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2417,6 +1718,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5232747758760812903} m_Modifications: - target: {fileID: 2193082278679815174, guid: 2a8fae66de296f446b1f0303ec49dc27, @@ -2545,6 +1847,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2a8fae66de296f446b1f0303ec49dc27, type: 3} --- !u!224 &9083283061475491909 stripped RectTransform: @@ -2552,11 +1857,141 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 34699955398770791} m_PrefabAsset: {fileID: 0} +--- !u!1001 &341129361001531992 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5232747758760812903} + m_Modifications: + - target: {fileID: 4180842736270822486, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_Name + value: Button (1) + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6721385568205909569, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_text + value: Join + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6f139267009e9a44cb68786e53bdb5dc, type: 3} +--- !u!224 &4521254528489752079 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + m_PrefabInstance: {fileID: 341129361001531992} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1828754850861194407 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 192162616222404211, guid: d2a62c3519b48fe40a37aa32c7fe124f, @@ -2742,14 +2177,34 @@ PrefabInstance: - target: {fileID: 8249671917318911619, guid: d2a62c3519b48fe40a37aa32c7fe124f, type: 3} propertyPath: m_PresetInfoIsWorld - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8249671917318911622, guid: d2a62c3519b48fe40a37aa32c7fe124f, type: 3} propertyPath: m_Name value: GamesListView objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 750807879677658912, guid: d2a62c3519b48fe40a37aa32c7fe124f, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8249671915748336638, guid: d2a62c3519b48fe40a37aa32c7fe124f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 9122386065816629338} + - targetCorrespondingSourceObject: {fileID: 8249671915748336638, guid: d2a62c3519b48fe40a37aa32c7fe124f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3417764325996072515} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8249671917318911622, guid: d2a62c3519b48fe40a37aa32c7fe124f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1325030862} + - targetCorrespondingSourceObject: {fileID: 8249671917318911622, guid: d2a62c3519b48fe40a37aa32c7fe124f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1325030861} m_SourcePrefab: {fileID: 100100000, guid: d2a62c3519b48fe40a37aa32c7fe124f, type: 3} --- !u!114 &763682963816965684 stripped MonoBehaviour: @@ -2806,6 +2261,7 @@ MonoBehaviour: ignoreHideAll: 0 useRaycastBlock: 1 blockInput: 0 + unlockCursor: 0 logLevel: 3 titleLable: {fileID: 763682963816965684} OnShowEvent: @@ -2824,7 +2280,7 @@ MonoBehaviour: type: 3} uiColLablePrefab: {fileID: 7682290395850015912, guid: b836d42b635c5184d972915d85663b3f, type: 3} - uiButtonPrefab: {fileID: 3658193353867674886, guid: 6f139267009e9a44cb68786e53bdb5dc, + buttonPrefab: {fileID: 4180842736270822485, guid: 6f139267009e9a44cb68786e53bdb5dc, type: 3} listContainer: {fileID: 5232747758760812903} statusInfoText: {fileID: 668352418143069752} @@ -2836,6 +2292,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5232747758760812903} m_Modifications: - target: {fileID: 2193082278679815174, guid: 2a8fae66de296f446b1f0303ec49dc27, @@ -2964,6 +2421,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2a8fae66de296f446b1f0303ec49dc27, type: 3} --- !u!224 &7036455867138515773 stripped RectTransform: @@ -2976,6 +2436,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5232747758760812903} m_Modifications: - target: {fileID: 2193082278679815174, guid: 2a8fae66de296f446b1f0303ec49dc27, @@ -3104,6 +2565,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2a8fae66de296f446b1f0303ec49dc27, type: 3} --- !u!224 &6122999064401402378 stripped RectTransform: @@ -3111,11 +2575,141 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 3065906294853737000} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3092545984647235091 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5232747758760812903} + m_Modifications: + - target: {fileID: 4180842736270822486, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_Name + value: Button + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6721385568205909569, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + propertyPath: m_text + value: 0/100 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6f139267009e9a44cb68786e53bdb5dc, type: 3} +--- !u!224 &1220396752658778692 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4180842736270822487, guid: 6f139267009e9a44cb68786e53bdb5dc, + type: 3} + m_PrefabInstance: {fileID: 3092545984647235091} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3108218162436299415 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5232747758760812903} m_Modifications: - target: {fileID: 640881047755526344, guid: b836d42b635c5184d972915d85663b3f, @@ -3244,6 +2838,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b836d42b635c5184d972915d85663b3f, type: 3} --- !u!224 &6795928010355590037 stripped RectTransform: @@ -3256,6 +2853,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5232747758760812903} m_Modifications: - target: {fileID: 640881047755526344, guid: b836d42b635c5184d972915d85663b3f, @@ -3384,6 +2982,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b836d42b635c5184d972915d85663b3f, type: 3} --- !u!224 &5513020923884740335 stripped RectTransform: @@ -3396,6 +2997,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5232747758760812903} m_Modifications: - target: {fileID: 640881047755526344, guid: b836d42b635c5184d972915d85663b3f, @@ -3524,6 +3126,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b836d42b635c5184d972915d85663b3f, type: 3} --- !u!224 &5328315042877947666 stripped RectTransform: @@ -3536,6 +3141,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5232747758760812903} m_Modifications: - target: {fileID: 2193082278679815174, guid: 2a8fae66de296f446b1f0303ec49dc27, @@ -3664,6 +3270,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2a8fae66de296f446b1f0303ec49dc27, type: 3} --- !u!224 &3503986699660209419 stripped RectTransform: @@ -3676,6 +3285,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5232747758760812903} m_Modifications: - target: {fileID: 640881047755526344, guid: b836d42b635c5184d972915d85663b3f, @@ -3804,6 +3414,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b836d42b635c5184d972915d85663b3f, type: 3} --- !u!224 &3111189862112480796 stripped RectTransform: @@ -3816,6 +3429,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5232747758760812903} m_Modifications: - target: {fileID: 2193082278679815174, guid: 2a8fae66de296f446b1f0303ec49dc27, @@ -3944,6 +3558,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2a8fae66de296f446b1f0303ec49dc27, type: 3} --- !u!224 &1596460332324185924 stripped RectTransform: @@ -3956,6 +3573,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5232747758760812903} m_Modifications: - target: {fileID: 640881047755526344, guid: b836d42b635c5184d972915d85663b3f, @@ -4074,6 +3692,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b836d42b635c5184d972915d85663b3f, type: 3} --- !u!224 &478065311274025537 stripped RectTransform: @@ -4086,6 +3707,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5232747758760812903} m_Modifications: - target: {fileID: 640881047755526344, guid: b836d42b635c5184d972915d85663b3f, @@ -4214,6 +3836,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b836d42b635c5184d972915d85663b3f, type: 3} --- !u!224 &145185036992845483 stripped RectTransform: @@ -4226,6 +3851,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5232747758760812903} m_Modifications: - target: {fileID: 640881047755526344, guid: b836d42b635c5184d972915d85663b3f, @@ -4354,6 +3980,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b836d42b635c5184d972915d85663b3f, type: 3} --- !u!224 &778400539227221277 stripped RectTransform: diff --git a/Assets/MasterServerToolkit/Bridges/SqlSugar/Plugins/LICENSE.txt b/Assets/MasterServerToolkit/Bridges/SqlSugar/Plugins/LICENSE.txt new file mode 100644 index 00000000..ac88778b --- /dev/null +++ b/Assets/MasterServerToolkit/Bridges/SqlSugar/Plugins/LICENSE.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2022 jacktang + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/Assets/MasterServerToolkit/Bridges/SqlSugar/Plugins/LICENSE.txt.meta b/Assets/MasterServerToolkit/Bridges/SqlSugar/Plugins/LICENSE.txt.meta new file mode 100644 index 00000000..e0401b89 --- /dev/null +++ b/Assets/MasterServerToolkit/Bridges/SqlSugar/Plugins/LICENSE.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a06f69b7e26c4714cbc6868898406886 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MasterServerToolkit/THIRD PARTY LICENSES.txt b/Assets/MasterServerToolkit/THIRD PARTY LICENSES.txt index 71f4adf8..b67cf23e 100644 --- a/Assets/MasterServerToolkit/THIRD PARTY LICENSES.txt +++ b/Assets/MasterServerToolkit/THIRD PARTY LICENSES.txt @@ -1,14 +1,11 @@ WebSockets Sharp https://github.com/sta/websocket-sharp path "Assets\MasterServerToolkit\Networking\Plugins\WebSocketSharp" -LiteDB https://www.litedb.org/ +LiteDB https://www.litedb.org path "Assets\MasterServerToolkit\Bridges\LiteDB\Plugins" -MongoDB https://www.mongodb.com/ +MongoDB https://www.mongodb.com path "Assets\MasterServerToolkit\Bridges\MongoDB\Plugins" -Linq2Db https://linq2db.github.io/ -path "Assets\MasterServerToolkit\Bridges\Linq2Db\Plugins" - -MySQL.Data https://www.nuget.org/packages/linq2db.MySql -path "Assets\MasterServerToolkit\Bridges\Linq2Db\Plugins" \ No newline at end of file +SqlSugar https://github.com/DotNetNext/SqlSugar +path "Assets\MasterServerToolkit\Bridges\SqlSugar\Plugins" \ No newline at end of file