diff --git a/.vscode/settings.json b/.vscode/settings.json index ee4a2501..ce3ca05e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -56,5 +56,5 @@ "temp/": true, "Temp/": true }, - "dotnet.defaultSolution": "2DMMOMirror.sln" + "dotnet.defaultSolution": "mmorpg2d.sln" } \ No newline at end of file diff --git a/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta b/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta deleted file mode 100644 index 1d182472..00000000 --- a/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5b07afdbcf13e43438545d591cfd2e4b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MultiplayerPrefab/char1.prefab b/Assets/MultiplayerPrefab/char1.prefab index 1406b73c..8f9f1052 100644 --- a/Assets/MultiplayerPrefab/char1.prefab +++ b/Assets/MultiplayerPrefab/char1.prefab @@ -4325,6 +4325,110 @@ Transform: m_Children: [] m_Father: {fileID: 2852918893435529976} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &819158497849908942 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7937345326718523464} + - component: {fileID: 2912723888912963932} + - component: {fileID: 103157289070120255} + - component: {fileID: 5455878075437147495} + m_Layer: 6 + m_Name: canvas_invite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7937345326718523464 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 819158497849908942} + 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: 3347673930407525693} + - {fileID: 4866742539517983073} + - {fileID: 365828791895358502} + m_Father: {fileID: 4537453342636086539} + 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 &2912723888912963932 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 819158497849908942} + 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_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &103157289070120255 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 819158497849908942} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 1 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &5455878075437147495 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 819158497849908942} + 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 --- !u!1 &828640107705054673 GameObject: m_ObjectHideFlags: 0 @@ -6520,7 +6624,7 @@ RectTransform: - {fileID: 4671626060501372350} - {fileID: 3221669741278759812} - {fileID: 6461078038513426199} - m_Father: {fileID: 2292226162926766732} + m_Father: {fileID: 7937345326718523464} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -9848,9 +9952,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8752608139095817020} - - {fileID: 3347673930407525693} - - {fileID: 4866742539517983073} - - {fileID: 365828791895358502} - {fileID: 5989374854399517686} - {fileID: 7406951178957778888} - {fileID: 1067844022485966098} @@ -14882,6 +14983,7 @@ Transform: - {fileID: 7957994234254661919} - {fileID: 6634559944325329787} - {fileID: 7125741257416083047} + - {fileID: 7937345326718523464} - {fileID: 2777675283947947790} - {fileID: 6536042509376752811} m_Father: {fileID: 0} @@ -15542,7 +15644,7 @@ MonoBehaviour: inPartyUI: {fileID: 6212582780142130674} inPartyOwnerNameTxt: {fileID: 4157618920817146930} inPartyPlayersTxt: {fileID: 4763456039480402226} - inviteOwnerNameTxt: {fileID: 4157618920817146930} + inviteOwnerNameTxt: {fileID: 7030286270905106535} uiCanvasGroup: {fileID: 2096525255603639546} bUiCanvasGroup: {fileID: 6470811560482639934} uiRectTransform: {fileID: 3347673930407525693} @@ -23224,11 +23326,11 @@ RectTransform: - {fileID: 713401944674284017} - {fileID: 4036259298438466285} - {fileID: 1131185340219349864} - m_Father: {fileID: 2292226162926766732} + m_Father: {fileID: 7937345326718523464} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1072.4, y: -158.61} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -116.599976, y: -158.61} m_SizeDelta: {x: 225, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7139550012282140415 @@ -39248,7 +39350,7 @@ RectTransform: - {fileID: 3268208695809012095} - {fileID: 8025276278638308788} - {fileID: 8907363270874956250} - m_Father: {fileID: 2292226162926766732} + m_Father: {fileID: 7937345326718523464} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -43122,7 +43224,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.19986725, y: 0.80329895} + m_AnchoredPosition: {x: 0.1998291, y: 0.80329895} m_SizeDelta: {x: -14.6, y: -13.0254} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6137251443529331717 diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 3b0a95d8..02b3deae 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -38,6 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -903,15 +904,13 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -6486,15 +6485,13 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 0001030405 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -11839,15 +11836,13 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -16957,15 +16952,13 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0.3, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -22838,15 +22831,13 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -30679,15 +30670,13 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -35579,15 +35568,13 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -41089,15 +41076,13 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: -7909654892493620595, guid: cd20e8790f3e4884ca3c74989aa84a83, type: 3} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -46366,15 +46351,13 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -52118,15 +52101,13 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -297764,15 +297745,13 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 4.34, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -303307,7 +303286,7 @@ MonoBehaviour: offlineScene: onlineScene: transport: {fileID: 1650164940} - networkAddress: vps.playpoolstudios.com + networkAddress: localhost maxConnections: 100 disconnectInactiveConnections: 0 disconnectInactiveTimeout: 60 @@ -303484,15 +303463,13 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -312966,15 +312943,13 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: -7909654892493620595, guid: cd20e8790f3e4884ca3c74989aa84a83, type: 3} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -335539,15 +335514,13 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -340519,15 +340492,13 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 0001030405 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -365977,15 +365948,13 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -371092,15 +371061,13 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0.3, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -412924,15 +412891,13 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0.3, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -413016,15 +412981,13 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -550971,15 +550934,13 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: -7909654892493620595, guid: cd20e8790f3e4884ca3c74989aa84a83, type: 3} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -686514,15 +686475,13 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -749681,15 +749640,13 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 4.34, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -753135,15 +753092,13 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -775163,15 +775118,13 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -775252,15 +775205,13 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -817776,15 +817727,13 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 0001030405 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -817850,15 +817799,13 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 0001030405 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -838816,15 +838763,13 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -849129,15 +849074,13 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -849222,15 +849165,13 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -860387,15 +860328,13 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -862809,15 +862748,13 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -927617,15 +927554,13 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: -7909654892493620595, guid: cd20e8790f3e4884ca3c74989aa84a83, type: 3} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -931628,15 +931563,13 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0.3, z: 0} m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} diff --git a/Assets/Script/invitePlayer.cs b/Assets/Script/invitePlayer.cs index 4a53ddec..e5d724bc 100644 --- a/Assets/Script/invitePlayer.cs +++ b/Assets/Script/invitePlayer.cs @@ -55,6 +55,7 @@ public class invitePlayer : NetworkBehaviour private void OnMouseDown() //clicking on collider //ToDo exclude owner { + Debug.Log("OnMouseDown on invitePlayer " + GetComponent().playerName); ShowInviteUI(); } diff --git a/Assets/Script/playerNetwork.cs b/Assets/Script/playerNetwork.cs index cf35253c..e4d92845 100644 --- a/Assets/Script/playerNetwork.cs +++ b/Assets/Script/playerNetwork.cs @@ -215,11 +215,11 @@ public class playerNetwork : NetworkBehaviour } void Start(){ - // for(int i =0; i < 2000; i+=10){ - // int level = GetLevelByXp(i); - // int xp = GetXpForLevel(level); - // Debug.Log($"{i} : {level} : {xp}"); - // } + #if UNITY_EDITOR + if(isServer){ + playerName = "Player" + Random.Range(0, 100); + } + #endif if(!isLocalPlayer){ canvas.SetActive(false); @@ -245,8 +245,11 @@ public class playerNetwork : NetworkBehaviour RpcBroadcastCharJson(CharacterSelection.selectedCharJson); } else{ - CmdSetName(gplayAuth.userNameCloud); - + if(gplayAuth.userNameCloud.Length > 0){ + CmdSetName(gplayAuth.userNameCloud); + }else{ + CmdSetName("Player" + Random.Range(0, 100)); + } CmdSetCharJson(CharacterSelection.selectedCharJson); } } diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 14d2ae57..dda4887a 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -17,11 +17,11 @@ "hash": "f8c8347af3a144069dffd6120f1c4142f8120891" }, "com.unity.2d.animation": { - "version": "9.1.3", + "version": "9.0.3", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "8.0.4", + "com.unity.2d.common": "8.0.1", "com.unity.2d.sprite": "1.0.0", "com.unity.collections": "1.1.0", "com.unity.modules.animation": "1.0.0", @@ -30,7 +30,7 @@ "url": "https://packages.unity.com" }, "com.unity.2d.aseprite": { - "version": "1.1.6", + "version": "1.0.1", "depth": 1, "source": "registry", "dependencies": { @@ -42,7 +42,7 @@ "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "8.0.4", + "version": "8.0.1", "depth": 2, "source": "registry", "dependencies": { @@ -62,13 +62,13 @@ "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "8.0.5", + "version": "8.0.2", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "8.0.2", + "com.unity.2d.common": "8.0.1", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.animation": "9.1.1" + "com.unity.2d.animation": "9.0.1" }, "url": "https://packages.unity.com" }, @@ -79,11 +79,11 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "9.0.5", + "version": "9.0.2", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "8.0.4", + "com.unity.2d.common": "8.0.1", "com.unity.mathematics": "1.1.0", "com.unity.modules.physics2d": "1.0.0" }, @@ -99,7 +99,7 @@ } }, "com.unity.2d.tilemap.extras": { - "version": "3.1.3", + "version": "3.1.1", "depth": 1, "source": "registry", "dependencies": { @@ -111,12 +111,11 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.18", + "version": "1.8.8", "depth": 3, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.2.1", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.mathematics": "1.2.1" }, "url": "https://packages.unity.com" }, @@ -149,14 +148,14 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.2d.animation": "9.1.3", + "com.unity.2d.animation": "9.0.3", "com.unity.2d.pixel-perfect": "5.0.3", - "com.unity.2d.psdimporter": "8.0.5", + "com.unity.2d.psdimporter": "8.0.2", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "9.0.5", + "com.unity.2d.spriteshape": "9.0.2", "com.unity.2d.tilemap": "1.0.0", - "com.unity.2d.tilemap.extras": "3.1.3", - "com.unity.2d.aseprite": "1.1.6" + "com.unity.2d.tilemap.extras": "3.1.1", + "com.unity.2d.aseprite": "1.0.1" } }, "com.unity.ide.rider": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index ba6dfe72..88bb9cf9 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.53f1 -m_EditorVersionWithRevision: 2022.3.53f1 (df4e529d20d3) +m_EditorVersion: 2022.3.10f1 +m_EditorVersionWithRevision: 2022.3.10f1 (ff3792e53c62)