diff --git a/Assets/Resource/Dice/01_fire.png.meta b/Assets/Resource/Dice/01_fire.png.meta index 5e3f85b..0ffb0ac 100644 --- a/Assets/Resource/Dice/01_fire.png.meta +++ b/Assets/Resource/Dice/01_fire.png.meta @@ -3,7 +3,7 @@ guid: c5e7a64b6f8f1475683296844cb1ee32 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,7 +20,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - isReadable: 0 + isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -63,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -76,6 +77,54 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index d624916..940173d 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -602,6 +602,141 @@ MonoBehaviour: m_FirstSelected: {fileID: 0} m_sendNavigationEvents: 1 m_DragThreshold: 10 +--- !u!1 &420670441 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 420670442} + - component: {fileID: 420670444} + - component: {fileID: 420670443} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &420670442 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 420670441} + 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: 2079967622} + 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} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &420670443 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 420670441} + 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: up + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + 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: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &420670444 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 420670441} + m_CullTransparentMesh: 1 --- !u!1 &497353758 GameObject: m_ObjectHideFlags: 0 @@ -1016,6 +1151,7 @@ RectTransform: m_Children: - {fileID: 1466146358} - {fileID: 1912971680} + - {fileID: 916428258} m_Father: {fileID: 1013384290} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1408,6 +1544,58 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 910201757} m_CullTransparentMesh: 1 +--- !u!1 &916428256 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 916428258} + - component: {fileID: 916428259} + m_Layer: 0 + m_Name: test + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &916428258 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 916428256} + 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: 2079967622} + - {fileID: 2042607823} + - {fileID: 1540895735} + m_Father: {fileID: 583945691} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &916428259 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 916428256} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35cff7cbe2fa4ca08a61d912fad319c4, type: 3} + m_Name: + m_EditorClassIdentifier: + sampleImage: {fileID: 21300000, guid: 084c593aaf77047e3bfa8626260f95ea, type: 3} + btnUploadImage: {fileID: 2079967623} + btnDownloadImage: {fileID: 2042607824} + image: {fileID: 1540895736} + serverPath: http://127.0.0.1:3000 --- !u!1 &922189857 GameObject: m_ObjectHideFlags: 0 @@ -1467,7 +1655,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3432840878910967535, guid: 2e2ced5d8a6c34b2085c71657879cc15, type: 3} propertyPath: m_RootOrder - value: 13 + value: 12 objectReference: {fileID: 0} - target: {fileID: 3432840878910967535, guid: 2e2ced5d8a6c34b2085c71657879cc15, type: 3} propertyPath: m_LocalPosition.x @@ -1509,19 +1697,12 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7661625985247302100, guid: 2e2ced5d8a6c34b2085c71657879cc15, type: 3} + propertyPath: requestHandler + value: + objectReference: {fileID: 1206137632} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2e2ced5d8a6c34b2085c71657879cc15, type: 3} ---- !u!114 &924530221 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7661625985247302100, guid: 2e2ced5d8a6c34b2085c71657879cc15, type: 3} - m_PrefabInstance: {fileID: 924530220} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7300c990fdf293e498e987897572d45b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &925759004 GameObject: m_ObjectHideFlags: 0 @@ -2121,6 +2302,17 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1131538119} m_CullTransparentMesh: 1 +--- !u!114 &1143216757 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7661625985247302100, guid: 2e2ced5d8a6c34b2085c71657879cc15, type: 3} + m_PrefabInstance: {fileID: 924530220} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7300c990fdf293e498e987897572d45b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1166434724 GameObject: m_ObjectHideFlags: 0 @@ -2364,6 +2556,78 @@ MonoBehaviour: m_EditorClassIdentifier: slotId: 4 occupied: 0 +--- !u!114 &1206137632 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5632738139156600354, guid: 2e2ced5d8a6c34b2085c71657879cc15, type: 3} + m_PrefabInstance: {fileID: 924530220} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e14f3acd6cdd774fafd386fc8a0fd54, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &1213074556 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5316088670829884935, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} + propertyPath: m_Name + value: NetworkModuleTest + objectReference: {fileID: 0} + - target: {fileID: 5522496125743907318, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} + propertyPath: networkModule + value: + objectReference: {fileID: 1143216757} + - target: {fileID: 8063823062617214637, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 8063823062617214637, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8063823062617214637, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8063823062617214637, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8063823062617214637, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8063823062617214637, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8063823062617214637, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8063823062617214637, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8063823062617214637, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8063823062617214637, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8063823062617214637, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} --- !u!1 &1237742221 GameObject: m_ObjectHideFlags: 0 @@ -2712,7 +2976,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1466146357 +--- !u!1 &1445092305 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2720,34 +2984,169 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1466146358} + - component: {fileID: 1445092306} + - component: {fileID: 1445092308} + - component: {fileID: 1445092307} m_Layer: 5 - m_Name: bottomUI + m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1466146358 +--- !u!224 &1445092306 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1466146357} + m_GameObject: {fileID: 1445092305} 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: 729618701} - - {fileID: 1237742222} - m_Father: {fileID: 583945691} + m_Children: [] + m_Father: {fileID: 2042607823} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1445092307 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1445092305} + 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: down + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + 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: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1445092308 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1445092305} + m_CullTransparentMesh: 1 +--- !u!1 &1466146357 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1466146358} + m_Layer: 5 + m_Name: bottomUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1466146358 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1466146357} + 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: 729618701} + - {fileID: 1237742222} + m_Father: {fileID: 583945691} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 50} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1485285760 @@ -2915,6 +3314,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1512992333} m_CullTransparentMesh: 1 +--- !u!1 &1540895734 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1540895735} + - component: {fileID: 1540895737} + - component: {fileID: 1540895736} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1540895735 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1540895734} + 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: 916428258} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 200} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1540895736 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1540895734} + 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: 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_Sprite: {fileID: 0} + m_Type: 0 + 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!222 &1540895737 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1540895734} + m_CullTransparentMesh: 1 --- !u!1 &1551213701 GameObject: m_ObjectHideFlags: 0 @@ -3518,67 +3993,6 @@ MonoBehaviour: m_EditorClassIdentifier: slotId: 1 occupied: 0 ---- !u!1001 &1870363280 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 5316088670829884935, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} - propertyPath: m_Name - value: NetworkModuleTest - objectReference: {fileID: 0} - - target: {fileID: 5522496125743907318, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} - propertyPath: _networkModule - value: - objectReference: {fileID: 924530221} - - target: {fileID: 8063823062617214637, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 8063823062617214637, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8063823062617214637, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8063823062617214637, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8063823062617214637, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8063823062617214637, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8063823062617214637, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8063823062617214637, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8063823062617214637, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8063823062617214637, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8063823062617214637, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9e0532e23d9d741b5b934a1f47c3ec12, type: 3} --- !u!1 &1886811645 GameObject: m_ObjectHideFlags: 0 @@ -3875,6 +4289,128 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2042607822 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2042607823} + - component: {fileID: 2042607826} + - component: {fileID: 2042607825} + - component: {fileID: 2042607824} + m_Layer: 5 + m_Name: down + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2042607823 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2042607822} + 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: 1445092306} + m_Father: {fileID: 916428258} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 100, y: 200} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2042607824 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2042607822} + 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: 2042607825} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &2042607825 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2042607822} + 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: 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_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!222 &2042607826 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2042607822} + m_CullTransparentMesh: 1 --- !u!1 &2043322306 GameObject: m_ObjectHideFlags: 0 @@ -3921,3 +4457,125 @@ MonoBehaviour: m_EditorClassIdentifier: slotId: 0 occupied: 0 +--- !u!1 &2079967621 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2079967622} + - component: {fileID: 2079967625} + - component: {fileID: 2079967624} + - component: {fileID: 2079967623} + m_Layer: 5 + m_Name: up + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2079967622 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2079967621} + 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: 420670442} + m_Father: {fileID: 916428258} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -100, y: 200} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2079967623 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2079967621} + 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: 2079967624} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &2079967624 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2079967621} + 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: 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_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!222 &2079967625 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2079967621} + m_CullTransparentMesh: 1 diff --git a/Assets/Scripts/NetworkModule/Prefabs/NetworkModule.prefab b/Assets/Scripts/NetworkModule/Prefabs/NetworkModule.prefab index ae8c3b3..70780fe 100644 --- a/Assets/Scripts/NetworkModule/Prefabs/NetworkModule.prefab +++ b/Assets/Scripts/NetworkModule/Prefabs/NetworkModule.prefab @@ -45,7 +45,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7300c990fdf293e498e987897572d45b, type: 3} m_Name: m_EditorClassIdentifier: - _requestHandler: {fileID: 5632738139156600354} + networkCheckTic: 40 + networkTimeout: 3000 + requestHandler: {fileID: 5632738139156600354} --- !u!1001 &2552750793567811987 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/NetworkModule/Scripts/FileHandler.cs b/Assets/Scripts/NetworkModule/Scripts/FileHandler.cs new file mode 100644 index 0000000..db4fa54 --- /dev/null +++ b/Assets/Scripts/NetworkModule/Scripts/FileHandler.cs @@ -0,0 +1,23 @@ +using UnityEngine; + +public class FileHandler +{ + public byte[] FileToByteArray(FileSection section, object file) + { + switch (section) + { + case FileSection.Texture: + Texture2D source = (Texture2D)file; + Texture2D destination = new Texture2D(source.width, source.height); + Color[] pixels = source.GetPixels(0, 0, source.width, source.height); + destination.SetPixels(pixels); + destination.Apply(); + return destination.EncodeToPNG(); + default: + return null; + } + } + + public Sprite Texture2DToSprite(Texture2D texture2D) + => Sprite.Create(texture2D, new Rect(0, 0, texture2D.width, texture2D.height), Vector2.one * .5f); +} diff --git a/Assets/Scripts/NetworkModule/Scripts/FileHandler.cs.meta b/Assets/Scripts/NetworkModule/Scripts/FileHandler.cs.meta new file mode 100644 index 0000000..f0eb51f --- /dev/null +++ b/Assets/Scripts/NetworkModule/Scripts/FileHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d6a2161f979ea4650b41f69bf67d4fdc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/NetworkModule/Scripts/NetworkModule.cs b/Assets/Scripts/NetworkModule/Scripts/NetworkModule.cs index 21cf26e..4785b3d 100644 --- a/Assets/Scripts/NetworkModule/Scripts/NetworkModule.cs +++ b/Assets/Scripts/NetworkModule/Scripts/NetworkModule.cs @@ -2,17 +2,74 @@ using UnityEngine; using UnityEngine.Events; +public class FileForm +{ + public readonly FileSection Section; + public readonly string FileName; + public readonly object FileData; + + public FileForm(FileSection section, string fileName, object fileData) + { + Section = section; + FileName = fileName; + FileData = fileData; + } +} + +public class WebResponse +{ + public readonly int StatusCode; + public object Payload; + + public WebResponse(int statusCode) + { + StatusCode = statusCode; + } +} + +public enum FileSection +{ + None = 0, + Texture, +} + public partial class NetworkModule // IO { - public void RequestGet(string uri, UnityAction<(bool, string)> callback = null) - => _requestHandler.RequestGet(uri, callback); - public void RequestPost(string uri, UnityAction<(bool, string)> callback = null, params KeyValuePair[] data) - => _requestHandler.RequestPost(uri, callback, data); - public void RequestPost(string uri, UnityAction<(bool, string)> callback = null, Dictionary data = null) - => _requestHandler.RequestPost(uri, callback, data); + public void RequestGet(string uri, UnityAction callback = null, FileSection section = FileSection.None, params KeyValuePair[] data) + => requestHandler.RequestGet(uri, callback, section, data); + public void RequestGet(string uri, UnityAction callback = null, FileSection section = FileSection.None, Dictionary data = null) + => requestHandler.RequestGet(uri, callback, section, data); + public void RequestPost(string uri, UnityAction callback = null, params KeyValuePair[] data) + => requestHandler.RequestPost(uri, callback, data); + public void RequestPost(string uri, UnityAction callback = null, Dictionary data = null) + => requestHandler.RequestPost(uri, callback, data); } -public partial class NetworkModule: MonoBehaviour +public partial class NetworkModule // setting values { - [SerializeField] private RequestHandler _requestHandler; + public int networkCheckTic = 10; // almost 24 fps (little over) + public int networkTimeout = 5000; } + +public partial class NetworkModule: MonoBehaviour // SerializeField +{ + [SerializeField] private RequestHandler requestHandler; +} + +public partial class NetworkModule +{ + private void Awake() + { + InitRequestHandler(); + } +} + +public partial class NetworkModule +{ + private void InitRequestHandler() + { + if (!requestHandler) return; + requestHandler.networkCheckTic = networkCheckTic; + requestHandler.networkTimeout = networkTimeout; + } +} \ No newline at end of file diff --git a/Assets/Scripts/NetworkModule/Scripts/RequestBuilder.cs b/Assets/Scripts/NetworkModule/Scripts/RequestBuilder.cs new file mode 100644 index 0000000..7fc642a --- /dev/null +++ b/Assets/Scripts/NetworkModule/Scripts/RequestBuilder.cs @@ -0,0 +1,97 @@ +using System.Collections.Generic; +using System.Linq; +using System.Text; +using UnityEngine.Networking; + +public partial class RequestBuilder // IO +{ + public string QueryBuilder(KeyValuePair[] source) + { + if (source == null || !source.Any()) return null; + BuildQueryData(source); + + return _queryBuilder.ToString(); + } + + public List MultipartFormBuilder(KeyValuePair[] source) + { + if (source == null || !source.Any()) return null; + BuildMultipartFormDataList(source); + BuildMultipartFormFileList(source); + + return _formDataList; + } + + public UnityWebRequest RequestGetType(FileSection section, string uri) + { + switch (section) + { + case FileSection.Texture: + return UnityWebRequestTexture.GetTexture(uri); + default: + return UnityWebRequest.Get(uri); + } + } +} + +public partial class RequestBuilder +{ + private readonly List _formDataList = new(); + private readonly StringBuilder _queryBuilder = new(string.Empty); + + private void BuildMultipartFormDataList(IEnumerable> source) + { + foreach (var pair in source) + { + if (pair.Value is not string) continue; + if (0 < _queryBuilder.Length) _queryBuilder.Append("&"); + _queryBuilder.Append($"{pair.Key}={pair.Value}"); + } + + if (0 < _queryBuilder.Length) + { + _formDataList.Add(new MultipartFormDataSection(_queryBuilder.ToString())); + } + } + + private void BuildMultipartFormFileList(IEnumerable> source) + { + foreach (KeyValuePair pair in source) + { + if (pair.Value is not FileForm fileForm) continue; + _formDataList.Add(new MultipartFormFileSection( + fileForm.Section.ToString(), + new FileHandler().FileToByteArray(fileForm.Section, fileForm.FileData), + fileForm.FileName, + "multipart/form-data")); + } + } + + private void BuildQueryData(KeyValuePair[] source) + { + StringBuilder query = new StringBuilder(string.Empty); + + foreach (KeyValuePair pair in source) + { + if (0 < query.Length) + { + query.Append("&"); + } + query.Append(pair.Key); + query.Append("="); + query.Append(pair.Value); + } + + _queryBuilder.Append("?"); + _queryBuilder.Append(query); + } +} + +public partial class RequestBuilder +{ + private List SetMultipartForm() + => _formDataList.Any() ? _formDataList : null; + + private string SetQuery() + => 0 < _queryBuilder.Length ? _queryBuilder.ToString() : null; +} diff --git a/Assets/Scripts/NetworkModule/Scripts/RequestBuilder.cs.meta b/Assets/Scripts/NetworkModule/Scripts/RequestBuilder.cs.meta new file mode 100644 index 0000000..781d116 --- /dev/null +++ b/Assets/Scripts/NetworkModule/Scripts/RequestBuilder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 36a202a607959431ab4f8b110c168c8f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/NetworkModule/Scripts/RequestHandler.cs b/Assets/Scripts/NetworkModule/Scripts/RequestHandler.cs index 5752a23..46dc927 100644 --- a/Assets/Scripts/NetworkModule/Scripts/RequestHandler.cs +++ b/Assets/Scripts/NetworkModule/Scripts/RequestHandler.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using UnityEngine; using UnityEngine.Events; @@ -7,82 +8,93 @@ public partial class RequestHandler { - public void RequestGet(string uri, UnityAction<(bool, string)> callback = null) => _RequestGet(uri, callback); - public void RequestPost(string uri, UnityAction<(bool, string)> callback = null, params KeyValuePair[] data) => _RequestPost(uri, data, callback); - public void RequestPost(string uri, UnityAction<(bool, string)> callback = null, Dictionary data = null) => _RequestPost(uri, data, callback); + public void RequestGet(string uri, UnityAction callback = null, FileSection section = FileSection.None, params KeyValuePair[] data) + => _RequestGet(uri, data, section, callback); + public void RequestGet(string uri, UnityAction callback = null, FileSection section = FileSection.None, Dictionary data = null) + => _RequestGet(uri, data?.ToArray(), section, callback); + public void RequestPost(string uri, UnityAction callback = null, params KeyValuePair[] data) + => _RequestPost(uri, data, callback); + public void RequestPost(string uri, UnityAction callback = null, Dictionary data = null) + => _RequestPost(uri, data?.ToArray(), callback); + + public int networkCheckTic { get; set; } + public int networkTimeout { get; set; } } public partial class RequestHandler: MonoBehaviour { - private readonly Dictionary _requestResult = new(); + private readonly Dictionary _requestResult = new(); private int _requestId; - private const int Tic = 40; // almost 24 fps (little over) - private const int TimeOut = 3000; - private void _RequestGet(string uri, UnityAction<(bool, string)> callback) + private void _RequestGet(string uri, KeyValuePair[] data, FileSection section, UnityAction callback) { int requestId = _requestId++; - StartCoroutine(GetRequest(uri, requestId)); + string buildUri = $"{uri}{new RequestBuilder().QueryBuilder(data)}"; + StartCoroutine(GetRequest(buildUri, section, requestId)); WaitTaskAndRunCallback(requestId, callback); } - private void _RequestPost(string uri, IEnumerable> data, UnityAction<(bool, string)> callback) + private void _RequestPost(string uri, KeyValuePair[] data, UnityAction callback) { int requestId = _requestId++; - StartCoroutine(PostRequest(uri, data, requestId)); + StartCoroutine(PostRequest(uri, new RequestBuilder().MultipartFormBuilder(data), requestId)); WaitTaskAndRunCallback(requestId, callback); } - - private async void WaitTaskAndRunCallback(int requestId, UnityAction<(bool, string)> callback) + + private IEnumerator GetRequest(string uri, FileSection section, int requestId) { - while (!_requestResult.ContainsKey(requestId)) - { - await Task.Delay(Tic); - } + using UnityWebRequest webRequest = new RequestBuilder().RequestGetType(section, uri); + webRequest.timeout = networkTimeout; - callback?.Invoke(_requestResult[requestId]); - _requestResult.Remove(requestId); - } - - private IEnumerator GetRequest(string uri, int requestId) - { - using UnityWebRequest webRequest = UnityWebRequest.Get(uri); - webRequest.timeout = TimeOut; yield return webRequest.SendWebRequest(); - DisposeWebRequestResult(webRequest, requestId); + DisposeWebRequestResult(section, webRequest, requestId); } - private IEnumerator PostRequest(string uri, IEnumerable> data, int requestId) + private IEnumerator PostRequest(string uri, List form, int requestId) { - WWWForm form = ConvertToWWWForm(data); using UnityWebRequest webRequest = UnityWebRequest.Post(uri, form); + webRequest.timeout = networkTimeout; yield return webRequest.SendWebRequest(); - DisposeWebRequestResult(webRequest, requestId); + DisposeWebRequestResult(FileSection.None, webRequest, requestId); } - - private void DisposeWebRequestResult(UnityWebRequest webRequest, int requestId) + + private async void WaitTaskAndRunCallback(int requestId, UnityAction callback) { - (bool success, string payload) item = new () + while (!_requestResult.ContainsKey(requestId)) { - success = webRequest.result is UnityWebRequest.Result.Success - }; - - item.payload = item.success ? webRequest.downloadHandler.text : webRequest.error; - _requestResult.Add(requestId, item); + await Task.Delay(networkCheckTic); + } + + callback?.Invoke(_requestResult[requestId]); + _requestResult.Remove(requestId); } - private static WWWForm ConvertToWWWForm(IEnumerable> source) + private void DisposeWebRequestResult(FileSection section, UnityWebRequest webRequest, int requestId) { - WWWForm form = new WWWForm(); + WebResponse webResponse = new ((int)webRequest.responseCode); - if (source == null) return null; - - foreach (KeyValuePair element in source) + if (webResponse.StatusCode < 300) + { + SetPayload(section, webRequest, out webResponse.Payload); + } + else { - form.AddField(element.Key, element.Value); + webResponse.Payload = webRequest.error; } - return form; + _requestResult.Add(requestId, webResponse); } -} + private static void SetPayload(FileSection section, UnityWebRequest webRequest, out object payload) + { + switch (section) + { + case FileSection.Texture: + payload = ((DownloadHandlerTexture)webRequest.downloadHandler).texture; + break; + default: + payload = webRequest.downloadHandler.text; + break; + } + } +} diff --git a/Assets/Scripts/NetworkModule/TestObject/NetworkModuleTest.cs b/Assets/Scripts/NetworkModule/TestObject/NetworkModuleTest.cs index b8f29c1..8287d2e 100644 --- a/Assets/Scripts/NetworkModule/TestObject/NetworkModuleTest.cs +++ b/Assets/Scripts/NetworkModule/TestObject/NetworkModuleTest.cs @@ -1,15 +1,24 @@ using System.Collections; using System.Collections.Generic; -using System.Linq; -using UnityEditor; using UnityEngine; +internal struct RequestUrl +{ + public string requestType; + public string requestUrl; +} + + public class NetworkModuleTest : MonoBehaviour { - [SerializeField] private NetworkModule _networkModule; + [SerializeField] private NetworkModule networkModule; + [SerializeField] private Sprite sprite; + [SerializeField] private UnityEngine.UI.Image image; + [SerializeField] private Canvas canvas; private const string Uri0 = "naver0.com"; // wrong private const string Uri1 = "google.com"; // correct private const string Post0 = "https://jsonplaceholder.typicode.com/posts"; + private const string PostUpload = "http://localhost:3000/api/uploadimage"; private IEnumerator Start() { @@ -18,33 +27,80 @@ private IEnumerator Start() yield return null; NetReqGetTest(Uri1); yield return null; + NetReqGetQueryTest(Post0); + yield return null; NetReqPostTest(Post0); + yield return null; + NetReqPostUpload(PostUpload); } private void NetReqGetTest(string uri) { - _networkModule?.RequestGet(uri, PrintResult); + networkModule?.RequestGet(uri, PrintResult); } + private void NetReqGetQueryTest(string uri) + { + KeyValuePair pair = new("userId", "1"); + networkModule?.RequestGet(uri, PrintResult, FileSection.None, pair); + + Dictionary data = new() { { "userId", "1" }, {"id", "1"} }; + networkModule?.RequestGet(uri, PrintResult, FileSection.None, data); + } + + private void NetReqPostTest(string uri) { - if (_networkModule == null) + if (networkModule == null) { return; } - KeyValuePair pair = new("pair test key 0", "pair test value 0"); + KeyValuePair pair = new("pair test key 0", "pair test value 0"); + Dictionary data = new() { { "dic test key 0", "dic test value 0" } }; + } + + private void NetReqPostUpload(string uri) + { + if (networkModule == null) + { + return; + } - Dictionary data = new() { { "dic test key 0", "dic test value 0" } }; + KeyValuePair imgPair = new("image.png", new FileForm(FileSection.Texture, "image.png", sprite.texture)); + networkModule.RequestPost(uri, PrintResultAndDownload, imgPair); + } - _networkModule.RequestPost(uri, PrintResult, pair); - _networkModule.RequestPost(uri, PrintResult, data); - _networkModule.RequestPost(uri, PrintResult); + private void PrintResultAndDownload(WebResponse response) + { + Debug.Log($"statusCode = {response.StatusCode}"); + Debug.Log($"payload = {response.Payload}"); + + var req = JsonUtility.FromJson(response.Payload.ToString()); + var reqType = req.requestType; + var reqUrl = req.requestUrl; + + // networkModule.RequestGet(reqUrl, DrawImage, FileSection.Sprite); + networkModule.RequestGet(reqUrl, DrawImage, FileSection.Texture); } - private static void PrintResult((bool result, string payload) request) + private void DrawImage(WebResponse response) + { + Debug.Log($"request.statusCode in DrawImage: {response.StatusCode}"); + + if (response.StatusCode >= 300) + { + Debug.LogError($"request.statusCode in DrawImage: {response.StatusCode}"); + Debug.LogError($"request.payload in DrawImage: {response.Payload}"); + return; + } + + image.sprite = new FileHandler().Texture2DToSprite(response.Payload as Texture2D); + } + + private void PrintResult(WebResponse response) { - Debug.Log($"result = {request.result}"); - Debug.Log($"payload = {request.payload}"); + Debug.Log($"statusCode = {response.StatusCode}"); + Debug.Log($"payload = {response.Payload}"); } } diff --git a/Assets/Scripts/NetworkModule/TestObject/NetworkModuleTest.prefab b/Assets/Scripts/NetworkModule/TestObject/NetworkModuleTest.prefab index 1b61fd6..112f59d 100644 --- a/Assets/Scripts/NetworkModule/TestObject/NetworkModuleTest.prefab +++ b/Assets/Scripts/NetworkModule/TestObject/NetworkModuleTest.prefab @@ -1,5 +1,81 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &3374976550816570891 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2566145865323036429} + - component: {fileID: 1457725136249631811} + - component: {fileID: 8883561202207683947} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2566145865323036429 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3374976550816570891} + 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: 4523746418993939074} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 200} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1457725136249631811 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3374976550816570891} + m_CullTransparentMesh: 1 +--- !u!114 &8883561202207683947 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3374976550816570891} + 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: 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_Sprite: {fileID: 0} + m_Type: 0 + 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 &5316088670829884935 GameObject: m_ObjectHideFlags: 0 @@ -28,7 +104,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 4523746418993939074} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -44,4 +121,108 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0bbbe0d55566749c4ba14d30833efe55, type: 3} m_Name: m_EditorClassIdentifier: - _networkModule: {fileID: 0} + networkModule: {fileID: 0} + sprite: {fileID: 21300000, guid: 084c593aaf77047e3bfa8626260f95ea, type: 3} + image: {fileID: 8883561202207683947} + canvas: {fileID: 1683856704834123808} +--- !u!1 &5856383369109431582 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4523746418993939074} + - component: {fileID: 1683856704834123808} + - component: {fileID: 7679423430626018670} + - component: {fileID: 6623537368709146177} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4523746418993939074 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5856383369109431582} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2566145865323036429} + m_Father: {fileID: 8063823062617214637} + m_RootOrder: 0 + 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!223 &1683856704834123808 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5856383369109431582} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &7679423430626018670 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5856383369109431582} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &6623537368709146177 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5856383369109431582} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 diff --git a/Assets/Scripts/NetworkModule/TestObject/testFile.png b/Assets/Scripts/NetworkModule/TestObject/testFile.png new file mode 100644 index 0000000..a28a4ef Binary files /dev/null and b/Assets/Scripts/NetworkModule/TestObject/testFile.png differ diff --git a/Assets/Scripts/NetworkModule/TestObject/testFile.png.meta b/Assets/Scripts/NetworkModule/TestObject/testFile.png.meta new file mode 100644 index 0000000..21db2f1 --- /dev/null +++ b/Assets/Scripts/NetworkModule/TestObject/testFile.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 084c593aaf77047e3bfa8626260f95ea +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index aab6570..61df1e9 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -8,20 +8,20 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 + m_EditorHideFlags: 1 m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 x: 0 - y: 42.666668 - width: 2560 - height: 1349.3334 + y: 66 + width: 1728 + height: 977 m_ShowMode: 4 - m_Title: Hierarchy - m_RootView: {fileID: 2} - m_MinSize: {x: 875, y: 300} + m_Title: Game + m_RootView: {fileID: 6} + m_MinSize: {x: 875, y: 421} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 @@ -33,25 +33,22 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: + - {fileID: 9} - {fileID: 3} - - {fileID: 5} - - {fileID: 4} m_Position: serializedVersion: 2 x: 0 - y: 0 - width: 2560 - height: 1349.3334 - m_MinSize: {x: 875, y: 300} - m_MaxSize: {x: 10000, y: 10000} - m_UseTopView: 1 - m_TopViewHeight: 30 - m_UseBottomView: 1 - m_BottomViewHeight: 20 + y: 30 + width: 1728 + height: 927 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 55 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -61,19 +58,24 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 0 + x: 810 y: 0 - width: 2560 - height: 30 - m_MinSize: {x: 0, y: 0} - m_MaxSize: {x: 0, y: 0} - m_LastLoadedLayoutName: + width: 918 + height: 927 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 17} + m_Panes: + - {fileID: 13} + - {fileID: 17} + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -83,18 +85,23 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 1329.3334 - width: 2560 - height: 20 - m_MinSize: {x: 0, y: 0} - m_MaxSize: {x: 0, y: 0} + y: 0 + width: 199 + height: 549.5 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 14} + m_Panes: + - {fileID: 14} + m_Selected: 0 + m_LastSelected: 0 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -104,22 +111,23 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ProjectBrowser m_EditorClassIdentifier: - m_Children: - - {fileID: 6} - - {fileID: 11} + m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 30 - width: 2560 - height: 1299.3334 - m_MinSize: {x: 300, y: 200} - m_MaxSize: {x: 24288, y: 16192} - vertical: 0 - controlID: 71 + y: 549.5 + width: 810 + height: 377.5 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 12} + m_Panes: + - {fileID: 12} + m_Selected: 0 + m_LastSelected: 0 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -129,22 +137,25 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: - {fileID: 7} - - {fileID: 10} + - {fileID: 2} + - {fileID: 8} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1006 - height: 1299.3334 - m_MinSize: {x: 100, y: 200} - m_MaxSize: {x: 8096, y: 16192} - vertical: 1 - controlID: 164 + width: 1728 + height: 977 + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_UseTopView: 1 + m_TopViewHeight: 30 + m_UseBottomView: 1 + m_BottomViewHeight: 20 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -154,26 +165,19 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_Children: - - {fileID: 8} - - {fileID: 9} + m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1006 - height: 180 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 16} - m_Panes: - - {fileID: 16} - - {fileID: 17} - m_Selected: 0 - m_LastSelected: 1 + width: 1728 + height: 30 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} + m_LastLoadedLayoutName: --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -183,23 +187,18 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 180 - width: 1006 - height: 1119.3334 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 15} - m_Panes: - - {fileID: 13} - m_Selected: 0 - m_LastSelected: 0 + y: 957 + width: 1728 + height: 20 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -208,23 +207,23 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 + m_EditorHideFlags: 1 m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: - {fileID: 10} - - {fileID: 11} + - {fileID: 5} m_Position: serializedVersion: 2 - x: 1006 + x: 0 y: 0 - width: 980 - height: 1299.3334 - m_MinSize: {x: 100, y: 200} - m_MaxSize: {x: 8096, y: 16192} + width: 810 + height: 927 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 72 + controlID: 56 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -234,25 +233,23 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: m_EditorClassIdentifier: - m_Children: [] + m_Children: + - {fileID: 4} + - {fileID: 11} m_Position: serializedVersion: 2 - x: 272 + x: 0 y: 0 - width: 980 - height: 662 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 18} - m_Panes: - - {fileID: 12} - - {fileID: 14} - m_Selected: 1 - m_LastSelected: 0 ---- !u!114 &10 + width: 810 + height: 549.5 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 57 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -262,23 +259,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 0 - y: 662 - width: 980 - height: 637.3334 - m_MinSize: {x: 232, y: 271} - m_MaxSize: {x: 10002, y: 10021} - m_ActualView: {fileID: 19} + x: 199 + y: 0 + width: 611 + height: 549.5 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} - {fileID: 16} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -287,23 +284,138 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_Children: - - {fileID: 13} - - {fileID: 14} - m_Position: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: serializedVersion: 2 - x: 1986 - y: 0 - width: 574 - height: 1299.3334 - m_MinSize: {x: 100, y: 200} - m_MaxSize: {x: 8096, y: 16192} - vertical: 1 - controlID: 100 + x: 0 + y: 645.5 + width: 809 + height: 356.5 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_VersionControlStates: [] + m_SoftLockControlStates: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Scripts/NetworkModule/TestObject + m_Globs: [] + m_OriginalText: + m_ViewMode: 1 + m_StartGridSize: 16 + m_LastFolders: + - Assets/Scripts/NetworkModule/TestObject + m_LastFoldersGridSize: 16 + m_LastProjectPath: /Users/noname/unity project/RandomDiceDefense42-Client + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 307.5} + m_SelectedIDs: ca640000 + m_LastClickedID: 25802 + m_ExpandedIDs: 000000008464000086640000886400008a6400008c6400008e64000000ca9a3b + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 000000008464000086640000886400008a6400008c6400008e640000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: c6230000b263000034630000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 5} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 16 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 207 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -313,51 +425,39 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 1099 - y: 0 - width: 574 - height: 718 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 20} - m_Panes: - - {fileID: 20} - - {fileID: 21} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &14 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: serializedVersion: 2 - x: 0 - y: 718 - width: 574 - height: 581.3334 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 22} - m_Panes: - - {fileID: 17} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &15 + x: 1320.5 + y: 19 + width: 407.5 + height: 906 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 160 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: 5552 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -366,90 +466,55 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Game - m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Hierarchy + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 252.66667 - width: 1005 - height: 1098.3334 + y: 96 + width: 198 + height: 528.5 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] - m_SerializedViewNames: [] - m_SerializedViewValues: [] - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1080, y: 1920} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 07000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -360 - m_HBaseRangeMax: 360 - m_VBaseRangeMin: -640 - m_VBaseRangeMax: 640 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 1005 - height: 1077.3334 - m_Scale: {x: 0.8416667, y: 0.8416667} - m_Translation: {x: 502.5, y: 538.6667} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -597.02966 - y: -640 - width: 1194.0593 - height: 1280 - m_MinimalGUI: 1 - m_defaultScale: 0.8416667 - m_LastWindowPixelSize: {x: 1507.5, y: 1647.5} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 00000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} ---- !u!114 &16 + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 24fbffff + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 4} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 4c969a2b90040154d917609493e03593 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -465,14 +530,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 72.66667 - width: 1005 - height: 159 + x: 199 + y: 96 + width: 609 + height: 528.5 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -482,8 +547,8 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: -98.66669, y: -26} + snapOffset: {x: -101, y: -26} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 id: Tool Settings index: 0 @@ -494,7 +559,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: -141, y: 149} - snapOffsetDelta: {x: 0, y: -16.333328} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 id: unity-grid-and-snap-toolbar index: 1 @@ -504,7 +569,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} + snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-scene-view-toolbar @@ -548,7 +613,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} + snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-transform-toolbar @@ -696,9 +761,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0, y: 0, z: 0} + m_Target: {x: 992, y: 507.5, z: 0} speed: 2 - m_Value: {x: 0, y: 0, z: 0} + m_Value: {x: 992, y: 507.5, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -749,9 +814,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 6.3530984 + m_Target: 1114.2802 speed: 2 - m_Value: 6.3530984 + m_Value: 1114.2802 m_Ortho: m_Target: 1 speed: 2 @@ -776,99 +841,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &17 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 687acdc95675db149bf5de5771ecac18, type: 3} - m_Name: SpriteEditorWindow - m_EditorClassIdentifier: - m_MinSize: {x: 360, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Sprite Editor - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 83 - width: 755.5 - height: 387 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ShowAlpha: 0 - m_MipLevel: 0 - m_Zoom: -1 - m_ScrollPosition: {x: 0, y: 0} - m_SelectedObject: {fileID: 11500000, guid: 7300c990fdf293e498e987897572d45b, type: 3} - m_SelectedSpriteRectGUID: 00000000000000000000000000000000 - m_LastUsedModuleTypeName: ---- !u!114 &18 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Hierarchy - m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1006 - y: 72.66667 - width: 978 - height: 641 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SceneHierarchy: - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 26faffff - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_ExpandedScenes: [] - m_CurrenRootInstanceID: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentSortingName: TransformSorting - m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &14 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -884,14 +857,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game - m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 272 - y: 54 - width: 825 - height: 468.5 + x: 199 + y: 96 + width: 609 + height: 528.5 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -902,7 +875,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1080, y: 1920} + m_TargetSize: {x: 609, y: 507.5} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -911,16 +884,16 @@ MonoBehaviour: m_VSyncEnabled: 0 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 07000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -270 - m_HBaseRangeMax: 270 - m_VBaseRangeMin: -480 - m_VBaseRangeMax: 480 + m_HBaseRangeMin: -304.5 + m_HBaseRangeMax: 304.5 + m_VBaseRangeMin: -253.75 + m_VBaseRangeMax: 253.75 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -929,7 +902,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -938,169 +911,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 825 - height: 447.5 - m_Scale: {x: 0.46614584, y: 0.46614584} - m_Translation: {x: 412.5, y: 223.75} + width: 609 + height: 507.5 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 304.5, y: 253.75} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -884.9162 - y: -480 - width: 1769.8324 - height: 960 + x: -304.5 + y: -253.75 + width: 609 + height: 507.5 m_MinimalGUI: 1 - m_defaultScale: 0.46614584 - m_LastWindowPixelSize: {x: 1650, y: 937} + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 1218, y: 1057} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &15 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - m_TitleContent: - m_Text: Project - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1006 - y: 734.6667 - width: 978 - height: 616.3334 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_VersionControlStates: [] - m_SoftLockControlStates: [] - m_ReferencingInstanceIDs: - m_SceneHandles: - m_ShowAllHits: 0 - m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: - - Assets/Scripts/NetworkModule - m_Globs: [] - m_OriginalText: - m_ViewMode: 1 - m_StartGridSize: 64 - m_LastFolders: - - Assets/Scripts/NetworkModule - m_LastFoldersGridSize: 16 - m_LastProjectPath: C:\unity project\RandomDiceDefense42-Client - m_LockTracker: - m_IsLocked: 0 - m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 9e670000 - m_LastClickedID: 26526 - m_ExpandedIDs: 00000000686700007467000000ca9a3b - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: 24650000 - m_LastClickedInstanceID: 25892 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c623000002630000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: NetworkModule - m_OriginalName: NetworkModule - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 26530 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 0 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 - m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 207 ---- !u!114 &16 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1109,104 +942,22 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1986 - y: 72.66667 - width: 573 - height: 697 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ObjectsLockedBeforeSerialization: [] - m_InstanceIDsLockedBeforeSerialization: - m_PreviewResizer: - m_CachedPref: -160 - m_ControlHash: -371814159 - m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 - m_GlobalObjectId: - m_InspectorMode: 0 - m_LockTracker: - m_IsLocked: 0 - m_PreviewWindow: {fileID: 0} ---- !u!114 &21 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12402, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Console - m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 543.5 - width: 1098 - height: 315.5 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] ---- !u!114 &17 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1986 - y: 790.6667 - width: 573 - height: 560.3334 + x: 810 + y: 96 + width: 917 + height: 906 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] - m_ObjectsLockedBeforeSerialization: [] - m_InstanceIDsLockedBeforeSerialization: - m_PreviewResizer: - m_CachedPref: 160 - m_ControlHash: -371814159 - m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 - m_GlobalObjectId: - m_InspectorMode: 0 - m_LockTracker: - m_IsLocked: 0 - m_PreviewWindow: {fileID: 0}