Skip to content

Commit

Permalink
🔀 Merge develop into master (pull request #16)
Browse files Browse the repository at this point in the history
# Features
Add splash screen.

# Internal changes
- Upgrade to Unity 2022.3.47.
- Replace LSL logo and Unity text with the splashscreen image.
- Update 2D animation package to 9.1.2.
  • Loading branch information
matheusamazonas authored Sep 23, 2024
2 parents fe26607 + 7760796 commit e118762
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 152 deletions.
134 changes: 2 additions & 132 deletions Assets/Prefabs/Menu/Credits Screen.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -257.6069}
m_AnchoredPosition: {x: 0, y: -285}
m_SizeDelta: {x: 0, y: 275.2138}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4788314592851932050
Expand Down Expand Up @@ -393,7 +393,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 4879d57dd6c714b56a994108e29c70d4, type: 3}
m_Sprite: {fileID: 21300000, guid: 2eb2b230f9914425b9b0048d0497f270, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
Expand Down Expand Up @@ -569,7 +569,6 @@ RectTransform:
m_Children:
- {fileID: 5713677244715263065}
- {fileID: 6448952742224196677}
- {fileID: 8756050418236912309}
- {fileID: 6557434175949241023}
m_Father: {fileID: 277345803925993460}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -798,135 +797,6 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 471430501937249295}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &964662512068958902
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1883323428989730489}
m_Modifications:
- target: {fileID: 328315184782035710, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
propertyPath: m_Text
value: LAZY SQUIRREL LABS
objectReference: {fileID: 0}
- target: {fileID: 5240676137010181436, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
propertyPath: m_Name
value: LSL
objectReference: {fileID: 0}
- target: {fileID: 8421896260636272643, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8421896260636272643, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
propertyPath: m_Pivot.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8421896260636272643, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8421896260636272643, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8421896260636272643, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8421896260636272643, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8421896260636272643, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8421896260636272643, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
propertyPath: m_SizeDelta.y
value: 60
objectReference: {fileID: 0}
- target: {fileID: 8421896260636272643, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8421896260636272643, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8421896260636272643, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8421896260636272643, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8421896260636272643, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8421896260636272643, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8421896260636272643, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8421896260636272643, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8421896260636272643, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -395.2138
objectReference: {fileID: 0}
- target: {fileID: 8421896260636272643, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8421896260636272643, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8421896260636272643, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 322792b20cb0848aca64f1d32c566d9d, type: 3}
--- !u!224 &8756050418236912309 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8421896260636272643, guid: 322792b20cb0848aca64f1d32c566d9d,
type: 3}
m_PrefabInstance: {fileID: 964662512068958902}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1052102382795704539
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down
4 changes: 2 additions & 2 deletions Assets/UI/LSL logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions Assets/UI/LSL logo.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"com.unity.2d.animation": "9.1.1",
"com.unity.2d.animation": "9.1.2",
"com.unity.2d.pixel-perfect": "5.0.3",
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.spriteshape": "9.0.4",
Expand Down
10 changes: 5 additions & 5 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"dependencies": {
"com.unity.2d.animation": {
"version": "9.1.1",
"version": "9.1.2",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.2d.common": "8.0.2",
"com.unity.2d.common": "8.0.3",
"com.unity.2d.sprite": "1.0.0",
"com.unity.collections": "1.1.0",
"com.unity.modules.animation": "1.0.0",
Expand All @@ -18,11 +18,11 @@
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.burst": "1.7.3",
"com.unity.2d.sprite": "1.0.0",
"com.unity.mathematics": "1.1.0",
"com.unity.modules.uielements": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.burst": "1.7.3"
"com.unity.modules.uielements": "1.0.0"
},
"url": "https://packages.unity.com"
},
Expand All @@ -44,8 +44,8 @@
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.mathematics": "1.1.0",
"com.unity.2d.common": "8.0.3",
"com.unity.mathematics": "1.1.0",
"com.unity.modules.physics2d": "1.0.0"
},
"url": "https://packages.unity.com"
Expand Down
19 changes: 11 additions & 8 deletions ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ PlayerSettings:
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.1792453, g: 0.1792453, b: 0.1792453, a: 1}
m_ShowUnitySplashScreen: 0
m_ShowUnitySplashScreen: 1
m_ShowUnitySplashLogo: 0
m_SplashScreenOverlayOpacity: 1
m_SplashScreenAnimation: 1
m_SplashScreenAnimation: 0
m_SplashScreenLogoStyle: 1
m_SplashScreenDrawMode: 0
m_SplashScreenDrawMode: 1
m_SplashScreenBackgroundAnimationZoom: 1
m_SplashScreenLogoAnimationZoom: 1
m_SplashScreenBackgroundLandscapeAspect: 1
Expand All @@ -39,7 +39,9 @@ PlayerSettings:
y: 0
width: 1
height: 1
m_SplashScreenLogos: []
m_SplashScreenLogos:
- logo: {fileID: 21300000, guid: 2eb2b230f9914425b9b0048d0497f270, type: 3}
duration: 3
m_VirtualRealitySplashScreen: {fileID: 0}
m_HolographicTrackingLossScreen: {fileID: 0}
defaultScreenWidth: 1024
Expand Down Expand Up @@ -139,8 +141,9 @@ PlayerSettings:
loadStoreDebugModeEnabled: 0
visionOSBundleVersion: 1.0
tvOSBundleVersion: 1.0
bundleVersion: 1.1.3
preloadedAssets: []
bundleVersion: 1.1.4
preloadedAssets:
- {fileID: 11400000, guid: e96a38792a19545f3b82acfb8f0a109b, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
Expand Down Expand Up @@ -168,7 +171,7 @@ PlayerSettings:
iPhone: 0
tvOS: 0
overrideDefaultApplicationIdentifier: 1
AndroidBundleVersionCode: 11
AndroidBundleVersionCode: 12
AndroidMinSdkVersion: 22
AndroidTargetSdkVersion: 34
AndroidPreferredInstallLocation: 1
Expand Down Expand Up @@ -767,7 +770,7 @@ PlayerSettings:
monoEnv:
splashScreenBackgroundSourceLandscape: {fileID: 0}
splashScreenBackgroundSourcePortrait: {fileID: 0}
blurSplashScreenBackground: 1
blurSplashScreenBackground: 0
spritePackerPolicy:
webGLMemorySize: 16
webGLExceptionSupport: 1
Expand Down
4 changes: 2 additions & 2 deletions ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
m_EditorVersion: 2022.3.44f1
m_EditorVersionWithRevision: 2022.3.44f1 (c3ae09b9f03c)
m_EditorVersion: 2022.3.47f1
m_EditorVersionWithRevision: 2022.3.47f1 (88c277b85d21)

0 comments on commit e118762

Please sign in to comment.