bugfixes; added fullscreen toggle

This commit is contained in:
Данил Ярош 2025-09-17 17:08:04 +03:00
parent 6ceeeebb7f
commit ed38c8504d
30 changed files with 72897 additions and 6343 deletions

View File

@ -1,4 +1,5 @@
{
"version": 1,
"name": "InputSystem_Actions",
"maps": [
{
@ -54,7 +55,7 @@
"name": "Jump",
"type": "Button",
"id": "f1ba0d36-48eb-4cd5-b651-1c94a6531f70",
"expectedControlType": "Button",
"expectedControlType": "",
"processors": "",
"interactions": "",
"initialStateCheck": false
@ -63,7 +64,7 @@
"name": "Previous",
"type": "Button",
"id": "2776c80d-3c14-4091-8c56-d04ced07a2b0",
"expectedControlType": "Button",
"expectedControlType": "",
"processors": "",
"interactions": "",
"initialStateCheck": false
@ -81,7 +82,16 @@
"name": "Sprint",
"type": "Button",
"id": "641cd816-40e6-41b4-8c3d-04687c349290",
"expectedControlType": "Button",
"expectedControlType": "",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Fire",
"type": "Button",
"id": "081258c7-deac-485c-b8a9-dcf4723800f2",
"expectedControlType": "",
"processors": "",
"interactions": "",
"initialStateCheck": false
@ -127,7 +137,7 @@
"path": "<Keyboard>/upArrow",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"groups": "",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
@ -407,6 +417,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "81b364a0-c39b-419b-9484-2a38dbabed30",
"path": "<Keyboard>/upArrow",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Jump",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "1534dc16-a6aa-499d-9c3a-22b47347b52a",
@ -472,6 +493,28 @@
"action": "Crouch",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "ec196577-e640-4131-9770-645d8e6e10b4",
"path": "<Keyboard>/f",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Fire",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "c5212fed-c13e-483c-bcf8-eab32a3c24e4",
"path": "<Keyboard>/ctrl",
"interactions": "",
"processors": "",
"groups": "",
"action": "Fire",
"isComposite": false,
"isPartOfComposite": false
}
]
},

View File

@ -1 +0,0 @@
{"TestSuite":"","Date":0,"Player":{"Development":false,"ScreenWidth":0,"ScreenHeight":0,"ScreenRefreshRate":0,"Fullscreen":false,"Vsync":0,"AntiAliasing":0,"Batchmode":false,"RenderThreadingMode":"GraphicsJobs","GpuSkinning":false,"Platform":"","ColorSpace":"","AnisotropicFiltering":"","BlendWeights":"","GraphicsApi":"","ScriptingBackend":"Mono2x","AndroidTargetSdkVersion":"AndroidApiLevelAuto","AndroidBuildSystem":"Gradle","BuildTarget":"StandaloneLinux64","StereoRenderingPath":"MultiPass"},"Hardware":{"OperatingSystem":"","DeviceModel":"","DeviceName":"","ProcessorType":"","ProcessorCount":0,"GraphicsDeviceName":"","SystemMemorySizeMB":0},"Editor":{"Version":"6000.0.56f1","Branch":"6000.0/staging","Changeset":"9c7b5e468860","Date":1754996063},"Dependencies":["com.unity.collab-proxy@2.9.2","com.unity.feature.2d@2.0.1","com.unity.ide.rider@3.0.36","com.unity.ide.visualstudio@2.0.23","com.unity.inputsystem@1.14.2","com.unity.multiplayer.center@1.0.0","com.unity.render-pipelines.universal@17.0.4","com.unity.test-framework@1.5.1","com.unity.timeline@1.8.9","com.unity.ugui@2.0.0","com.unity.visualscripting@1.9.7","com.unity.modules.accessibility@1.0.0","com.unity.modules.ai@1.0.0","com.unity.modules.androidjni@1.0.0","com.unity.modules.animation@1.0.0","com.unity.modules.assetbundle@1.0.0","com.unity.modules.audio@1.0.0","com.unity.modules.cloth@1.0.0","com.unity.modules.director@1.0.0","com.unity.modules.imageconversion@1.0.0","com.unity.modules.imgui@1.0.0","com.unity.modules.jsonserialize@1.0.0","com.unity.modules.particlesystem@1.0.0","com.unity.modules.physics@1.0.0","com.unity.modules.physics2d@1.0.0","com.unity.modules.screencapture@1.0.0","com.unity.modules.terrain@1.0.0","com.unity.modules.terrainphysics@1.0.0","com.unity.modules.tilemap@1.0.0","com.unity.modules.ui@1.0.0","com.unity.modules.uielements@1.0.0","com.unity.modules.umbra@1.0.0","com.unity.modules.unityanalytics@1.0.0","com.unity.modules.unitywebrequest@1.0.0","com.unity.modules.unitywebrequestassetbundle@1.0.0","com.unity.modules.unitywebrequestaudio@1.0.0","com.unity.modules.unitywebrequesttexture@1.0.0","com.unity.modules.unitywebrequestwww@1.0.0","com.unity.modules.vehicles@1.0.0","com.unity.modules.video@1.0.0","com.unity.modules.vr@1.0.0","com.unity.modules.wind@1.0.0","com.unity.modules.xr@1.0.0","com.unity.modules.subsystems@1.0.0","com.unity.modules.hierarchycore@1.0.0","com.unity.ext.nunit@2.0.5","com.unity.render-pipelines.core@17.0.4","com.unity.shadergraph@17.0.4","com.unity.render-pipelines.universal-config@17.0.3","com.unity.2d.animation@10.2.1","com.unity.2d.pixel-perfect@5.0.3","com.unity.2d.psdimporter@9.1.0","com.unity.2d.sprite@1.0.0","com.unity.2d.spriteshape@10.0.7","com.unity.2d.tilemap@1.0.0","com.unity.2d.tilemap.extras@4.1.0","com.unity.2d.aseprite@1.1.10","com.unity.searcher@4.9.3","com.unity.burst@1.8.24","com.unity.mathematics@1.3.2","com.unity.collections@2.5.1","com.unity.rendering.light-transport@1.0.1","com.unity.2d.common@9.1.1","com.unity.nuget.mono-cecil@1.11.4","com.unity.test-framework.performance@3.1.0"],"Results":[]}

View File

@ -1 +0,0 @@
{"MeasurementCount":-1}

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: ec04b1fd47b24b3468a8e7e4e129ed38
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -960,7 +960,7 @@ BoxCollider2D:
m_UsedByEffector: 0
m_CompositeOperation: 0
m_CompositeOrder: 0
m_Offset: {x: -0.07313037, y: 3.9858446}
m_Offset: {x: -0.07313037, y: 4.0265718}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
@ -970,7 +970,7 @@ BoxCollider2D:
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Size: {x: 5.4368367, y: 8.289099}
m_Size: {x: 5.4368367, y: 8.207644}
m_EdgeRadius: 0
--- !u!114 &-4306594679098426553
MonoBehaviour:
@ -984,7 +984,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 16ac12688a958d34983f6f0307a045ad, type: 3}
m_Name:
m_EditorClassIdentifier:
playerObj: {fileID: 0}
viewDistance: 5
viewAngle: 60
moveSpeed: 3

View File

@ -1614,7 +1614,7 @@ BoxCollider2D:
m_UsedByEffector: 0
m_CompositeOperation: 0
m_CompositeOrder: 0
m_Offset: {x: -0.07313037, y: 3.9858446}
m_Offset: {x: -0.07313037, y: 4.0279546}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
@ -1624,7 +1624,7 @@ BoxCollider2D:
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Size: {x: 5.4368367, y: 8.289099}
m_Size: {x: 5.4368367, y: 8.204879}
m_EdgeRadius: 0
--- !u!114 &2340304884233875183
MonoBehaviour:
@ -1638,7 +1638,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 16ac12688a958d34983f6f0307a045ad, type: 3}
m_Name:
m_EditorClassIdentifier:
playerObj: {fileID: 0}
viewDistance: 5
viewAngle: 60
moveSpeed: 4

View File

@ -2685,9 +2685,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
projectilePrefab: {fileID: 0}
spawnIfMissing: 0
attachPoint: {fileID: 6550761234593413718}
actionKey: 102
throwSpeed: 20
attachPoint: {fileID: 6550761234593413718}
--- !u!1 &6550761235546795891
GameObject:
m_ObjectHideFlags: 0

View File

@ -29,7 +29,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 5420728216044927655}
@ -113,18 +113,18 @@ MonoBehaviour:
m_EditorClassIdentifier:
initialSpeed: 15
maxLifetime: 5
alignRotationToVelocity: 1
knockback: 0
hitLayers:
serializedVersion: 2
m_Bits: 4294967295
maxPierce: 0
useGravity: 0
gravityScale: 1
owner: {fileID: 0}
hitVfxPrefab: {fileID: 0}
hitSfx: {fileID: 0}
sfxVolume: 1
alignRotationToVelocity: 1
knockback: 0
owner: {fileID: 0}
--- !u!1 &8420934987544802596
GameObject:
m_ObjectHideFlags: 0

View File

@ -113,34 +113,32 @@ MonoBehaviour:
m_EditorClassIdentifier:
initialSpeed: 25
maxLifetime: 5
alignRotationToVelocity: 1
knockback: 0
hitLayers:
serializedVersion: 2
m_Bits: 4294967295
maxPierce: 0
useGravity: 1
gravityScale: 1
owner: {fileID: 0}
hitVfxPrefab: {fileID: 0}
hitSfx: {fileID: 0}
sfxVolume: 1
alignRotationToVelocity: 1
knockback: 0
owner: {fileID: 0}
heldLocalOffset: {x: 0.25, y: 0.1, z: 0}
snapExactlyToAttachPoint: 1
ignoreOwnerTimeOnThrow: 0.25
heldScale: 1.5
ignoreOwnerTimeOnThrow: 0.1
attachPointChildName: HandPoint
sleepVelocity: 0.05
groundVelocity: 0.05
lockWhenLanded: 1
maxBounces: 5
minBounceSpeed: 0.1
restitution: 0.6
tangentDamping: 0.85
groundUpTolerance: 0.25
stickDelayAfterImpact: 0.03
recallStartDistance: 10
recallArriveDistance: 1.4
recallSpeed: 16
recallAcceleration: 100
drawGizmos: 1
gizmoColor: {r: 0.2, g: 0.8, b: 1, a: 0.35}
--- !u!1 &7932273378799574310

View File

@ -34636,7 +34636,7 @@ Transform:
m_GameObject: {fileID: 3339211251245379734}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.12675886, y: 2.2426212, z: 0.12992167}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:

View File

@ -26,7 +26,7 @@ Transform:
m_GameObject: {fileID: 3013926927394175097}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 107, y: 3, z: -1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 2c51629bc32dcf149a07c09736ee7cc0
guid: 1f119714b4500324cafa8c65a9e85a55
DefaultImporter:
externalObjects: {}
userData:

View File

@ -877,7 +877,7 @@ MonoBehaviour:
m_ChildAlignment: 7
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 450, y: 200}
m_CellSize: {x: 350, y: 125}
m_Spacing: {x: 0, y: 50}
m_Constraint: 0
m_ConstraintCount: 2

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@ -1,6 +1,7 @@
fileFormatVersion: 2
guid: 2d579539d5fa7a44eaf35120c19b8c28
TextScriptImporter:
guid: f6e9ec6a171e19047996a82e5248edb4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:

View File

@ -0,0 +1,39 @@
using UnityEngine;
using UnityEngine.InputSystem;
public class GlobalFullscreenHotkey : MonoBehaviour
{
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterSceneLoad)]
static void Bootstrap()
{
var go = new GameObject("GlobalFullscreenHotkey");
go.AddComponent<GlobalFullscreenHotkey>();
Object.DontDestroyOnLoad(go);
}
void Update()
{
var kb = Keyboard.current;
if (kb == null) return;
bool f11 = kb.f11Key.wasPressedThisFrame;
bool altEnter = kb.enterKey.wasPressedThisFrame && (kb.leftAltKey.isPressed || kb.rightAltKey.isPressed);
if (f11 || altEnter) Toggle();
}
static void Toggle()
{
bool fs = !Screen.fullScreen;
Screen.fullScreenMode = fs ? FullScreenMode.FullScreenWindow : FullScreenMode.Windowed;
if (fs)
Screen.SetResolution(Display.main.systemWidth, Display.main.systemHeight, true);
else
{
int w = Mathf.RoundToInt(Display.main.systemWidth * 0.75f);
int h = Mathf.RoundToInt(Display.main.systemHeight * 0.75f);
Screen.SetResolution(w, h, false);
}
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 8df459fdd4ce4364ab34fe84e2518e0a

View File

@ -18,6 +18,11 @@ namespace RR.Common.UI
private void Start()
{
Bootstrap();
if (Application.platform == RuntimePlatform.WebGLPlayer)
{
quitButton.gameObject.SetActive(false);
}
}
/// <summary>

View File

@ -57,7 +57,10 @@ namespace RR.Game2D.Behaviour
// Передвижение
inputX = Input.GetAxisRaw("Horizontal");
if (Input.GetButtonDown("Jump"))
//if (Input.GetButtonDown("Jump"))
// lastJumpPressedTime = Time.time;
if (Input.GetButton("Jump"))
lastJumpPressedTime = Time.time;
if (Input.GetButtonUp("Jump")) // && rb.linearVelocity.y > 0f)

View File

@ -17,7 +17,7 @@ namespace RR.Game2D.Entities.Projectiles
[Header("Подбор и прикрепление")]
[SerializeField] private Vector3 heldLocalOffset = new(0.25f, 0.1f, 0f);
[SerializeField] private float heldScale = 1.5f;
[SerializeField] private float ignoreOwnerTimeOnThrow = 0.25f;
[SerializeField] private float ignoreOwnerTimeOnThrow = 0.1f;
[SerializeField] private string attachPointChildName = "HandPoint";
[Header("Приземление")]
@ -82,6 +82,11 @@ namespace RR.Game2D.Entities.Projectiles
BecomeGrounded(null);
}
//private void Update()
//{
// Debug.Log(CurrentState);
//}
protected override void FixedUpdate()
{
base.FixedUpdate();
@ -119,12 +124,10 @@ namespace RR.Game2D.Entities.Projectiles
if (CurrentState == State.Airborne)
{
if (TryBounce(collision))
{
lastImpactTime = Time.time;
return;
}
else
BecomeGrounded(collision);
BecomeGrounded(collision);
}
}
@ -189,7 +192,7 @@ namespace RR.Game2D.Entities.Projectiles
public void Launch(Vector2 direction, float speed, GameObject throwOwner = null)
{
if (CurrentState == State.Held)
transform.SetParent(null, worldPositionStays: true);
transform.SetParent(null);//, worldPositionStays: true);
owner = throwOwner;
lastKnownHolder = throwOwner;
@ -310,7 +313,7 @@ namespace RR.Game2D.Entities.Projectiles
if (velocityOut.sqrMagnitude > 1e-6f)
transform.up = velocityOut.normalized;
bounceCounter++;
if (collision.collider.CompareTag("Ground")) bounceCounter++;
if (bounceCounter >= maxBounces)
return false;

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View File

@ -0,0 +1,702 @@
fileFormatVersion: 2
guid: 8491b33c0e81eeb4fb867e59c47c0f35
TextureImporter:
internalIDToNameTable:
- first:
213: 3411466254393983056
second: Logo full white_0
- first:
213: -9208491148333489008
second: Logo full white_1
- first:
213: -8792649195256863492
second: Logo full white_2
- first:
213: -9204990047669683623
second: Logo full white_3
- first:
213: -859542090629743455
second: Logo full white_4
- first:
213: 6663928628366398102
second: Logo full white_5
- first:
213: 338950026373537648
second: Logo full white_6
- first:
213: 3995032339446266100
second: Logo full white_7
- first:
213: -2396263560665776879
second: Logo full white_8
- first:
213: 6703915002716501048
second: Logo full white_9
- first:
213: -2051530302361494564
second: Logo full white_10
- first:
213: -1307715230987478760
second: Logo full white_11
- first:
213: 1693817456344194055
second: Logo full white_12
- first:
213: 3348832126249554314
second: Logo full white_13
- first:
213: -3354891386024518342
second: Logo full white_14
- first:
213: -3842968578036278028
second: Logo full white_15
- first:
213: -2408618357435136902
second: Logo full white_16
- first:
213: -8193010529200760971
second: Logo full white_17
- first:
213: -8973690928311859389
second: Logo full white_18
- first:
213: 115804924549008929
second: Logo full white_19
- first:
213: 5057476661327963032
second: Logo full white_20
- first:
213: 4939104197733505698
second: Logo full white_21
externalObjects: {}
serializedVersion: 13
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 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
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: Logo full white_0
rect:
serializedVersion: 2
x: 103
y: 191
width: 146
height: 51
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 050c260db76f75f20800000000000000
internalID: 3411466254393983056
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo full white_1
rect:
serializedVersion: 2
x: 122
y: 87
width: 108
height: 139
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 094e04ad61ed43080800000000000000
internalID: -9208491148333489008
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo full white_2
rect:
serializedVersion: 2
x: 326
y: 137
width: 78
height: 81
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: cf42712742c3af580800000000000000
internalID: -8792649195256863492
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo full white_3
rect:
serializedVersion: 2
x: 477
y: 137
width: 62
height: 81
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 95a74af525e414080800000000000000
internalID: -9204990047669683623
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo full white_4
rect:
serializedVersion: 2
x: 612
y: 137
width: 45
height: 81
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 1ac748ac50b4214f0800000000000000
internalID: -859542090629743455
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo full white_5
rect:
serializedVersion: 2
x: 669
y: 203
width: 20
height: 15
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 692d55ec7c70b7c50800000000000000
internalID: 6663928628366398102
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo full white_6
rect:
serializedVersion: 2
x: 68
y: 134
width: 58
height: 57
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 07f9a9ec04134b400800000000000000
internalID: 338950026373537648
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo full white_7
rect:
serializedVersion: 2
x: 227
y: 134
width: 58
height: 57
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 4f874e20fb4317730800000000000000
internalID: 3995032339446266100
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo full white_8
rect:
serializedVersion: 2
x: 405
y: 137
width: 68
height: 63
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 11dbd4eccf2cebed0800000000000000
internalID: -2396263560665776879
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo full white_9
rect:
serializedVersion: 2
x: 541
y: 137
width: 69
height: 63
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 83434551d27190d50800000000000000
internalID: 6703915002716501048
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo full white_10
rect:
serializedVersion: 2
x: 669
y: 137
width: 20
height: 62
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: cdb1bc93f008783e0800000000000000
internalID: -2051530302361494564
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo full white_11
rect:
serializedVersion: 2
x: 696
y: 137
width: 57
height: 62
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 8199f9d0def0adde0800000000000000
internalID: -1307715230987478760
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo full white_12
rect:
serializedVersion: 2
x: 103
y: 70
width: 146
height: 63
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 70c50c79006a18710800000000000000
internalID: 1693817456344194055
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo full white_13
rect:
serializedVersion: 2
x: 326
y: 100
width: 21
height: 26
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: a8155817311797e20800000000000000
internalID: 3348832126249554314
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo full white_14
rect:
serializedVersion: 2
x: 347
y: 100
width: 18
height: 26
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: a3d9df33f080171d0800000000000000
internalID: -3354891386024518342
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo full white_15
rect:
serializedVersion: 2
x: 364
y: 100
width: 22
height: 26
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 4fcd82f60780baac0800000000000000
internalID: -3842968578036278028
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo full white_16
rect:
serializedVersion: 2
x: 382
y: 100
width: 25
height: 26
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: a7408958d5ed29ed0800000000000000
internalID: -2408618357435136902
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo full white_17
rect:
serializedVersion: 2
x: 407
y: 100
width: 7
height: 26
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 57714f505549c4e80800000000000000
internalID: -8193010529200760971
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo full white_18
rect:
serializedVersion: 2
x: 416
y: 100
width: 18
height: 26
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 34783d535ab077380800000000000000
internalID: -8973690928311859389
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo full white_19
rect:
serializedVersion: 2
x: 434
y: 100
width: 19
height: 26
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 12e0cfe17fb6b9100800000000000000
internalID: 115804924549008929
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo full white_20
rect:
serializedVersion: 2
x: 453
y: 100
width: 21
height: 26
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 89328425a34cf2640800000000000000
internalID: 5057476661327963032
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo full white_21
rect:
serializedVersion: 2
x: 473
y: 100
width: 21
height: 27
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 2aadb8e69193b8440800000000000000
internalID: 4939104197733505698
vertices: []
indices:
edges: []
weights: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable:
Logo full white_0: 3411466254393983056
Logo full white_1: -9208491148333489008
Logo full white_10: -2051530302361494564
Logo full white_11: -1307715230987478760
Logo full white_12: 1693817456344194055
Logo full white_13: 3348832126249554314
Logo full white_14: -3354891386024518342
Logo full white_15: -3842968578036278028
Logo full white_16: -2408618357435136902
Logo full white_17: -8193010529200760971
Logo full white_18: -8973690928311859389
Logo full white_19: 115804924549008929
Logo full white_2: -8792649195256863492
Logo full white_20: 5057476661327963032
Logo full white_21: 4939104197733505698
Logo full white_3: -9204990047669683623
Logo full white_4: -859542090629743455
Logo full white_5: 6663928628366398102
Logo full white_6: 338950026373537648
Logo full white_7: 3995032339446266100
Logo full white_8: -2396263560665776879
Logo full white_9: 6703915002716501048
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

View File

@ -1,10 +1,22 @@
fileFormatVersion: 2
guid: 698ae6f0523d818459c87d916f78d1e4
guid: e201693b2561a8b42965bf77d8e77314
TextureImporter:
internalIDToNameTable:
- first:
213: -2920598655614517764
second: texture_round_0
213: -3961197413717314203
second: Logo white_0
- first:
213: -4867979533602602170
second: Logo white_1
- first:
213: -4281055538193760728
second: Logo white_2
- first:
213: 482530335404441122
second: Logo white_3
- first:
213: -2722091801093858465
second: Logo white_4
externalObjects: {}
serializedVersion: 13
mipmaps:
@ -46,7 +58,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -113,13 +125,13 @@ TextureImporter:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: texture_round_0
name: Logo white_0
rect:
serializedVersion: 2
x: 0
y: 0
width: 1024
height: 1024
y: 63
width: 56
height: 57
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
@ -128,8 +140,96 @@ TextureImporter:
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: cfdfc982ff2f777d0800000000000000
internalID: -2920598655614517764
spriteID: 565fe2680fff609c0800000000000000
internalID: -3961197413717314203
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo white_1
rect:
serializedVersion: 2
x: 33
y: 120
width: 146
height: 50
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 643ceb5e766717cb0800000000000000
internalID: -4867979533602602170
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo white_2
rect:
serializedVersion: 2
x: 52
y: 17
width: 109
height: 139
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 82efd368ba2a694c0800000000000000
internalID: -4281055538193760728
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo white_3
rect:
serializedVersion: 2
x: 157
y: 63
width: 57
height: 57
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 22eb12398ca42b600800000000000000
internalID: 482530335404441122
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Logo white_4
rect:
serializedVersion: 2
x: 33
y: 0
width: 146
height: 62
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: f5b1ccdddef293ad0800000000000000
internalID: -2722091801093858465
vertices: []
indices:
edges: []
@ -138,7 +238,7 @@ TextureImporter:
customData:
physicsShape: []
bones: []
spriteID:
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
@ -148,7 +248,11 @@ TextureImporter:
spriteCustomMetadata:
entries: []
nameFileIdTable:
texture_round_0: -2920598655614517764
Logo white_0: -3961197413717314203
Logo white_1: -4867979533602602170
Logo white_2: -4281055538193760728
Logo white_3: 482530335404441122
Logo white_4: -2722091801093858465
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 MiB

View File

@ -12,13 +12,13 @@ PlayerSettings:
targetDevice: 2
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: DefaultCompany
productName: Mario-like platformer
companyName: RR
productName: "\u041F\u0440\u043E\u043C\u043E-\u0438\u0433\u0440\u0430"
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
m_ShowUnitySplashScreen: 1
m_ShowUnitySplashLogo: 1
m_ShowUnitySplashLogo: 0
m_SplashScreenOverlayOpacity: 1
m_SplashScreenAnimation: 1
m_SplashScreenLogoStyle: 1
@ -39,8 +39,10 @@ PlayerSettings:
y: 0
width: 1
height: 1
m_SplashScreenLogos: []
m_VirtualRealitySplashScreen: {fileID: 0}
m_SplashScreenLogos:
- logo: {fileID: 21300000, guid: 8491b33c0e81eeb4fb867e59c47c0f35, type: 3}
duration: 2
m_VirtualRealitySplashScreen: {fileID: 2800000, guid: e201693b2561a8b42965bf77d8e77314, type: 3}
m_HolographicTrackingLossScreen: {fileID: 0}
defaultScreenWidth: 1920
defaultScreenHeight: 1080
@ -140,7 +142,7 @@ PlayerSettings:
loadStoreDebugModeEnabled: 0
visionOSBundleVersion: 1.0
tvOSBundleVersion: 1.0
bundleVersion: 1.0
bundleVersion: 0.0.3a
preloadedAssets:
- {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3}
metroInputSource: 0
@ -313,7 +315,10 @@ PlayerSettings:
m_BuildTargetGroupLightmapSettings: []
m_BuildTargetGroupLoadStoreDebugModeSettings: []
m_BuildTargetNormalMapEncoding: []
m_BuildTargetDefaultTextureCompressionFormat: []
m_BuildTargetDefaultTextureCompressionFormat:
- serializedVersion: 3
m_BuildTarget: WebGL
m_Formats: 05000000
playModeTestRunnerEnabled: 0
runPlayModeTestAsEditModeTest: 0
actionOnDotNetUnhandledException: 1