basic setup

2023-09-22 00:03:47 -04:00 · 2023-09-22 00:03:47 -04:00 · 281be65040
parent 497ad916b7
commit 281be65040
17 changed files with 3068 additions and 1982 deletions
--- a/Assets/Resources/Fonts/aboutfriend/AboutFriendExtended
+++ b/Assets/Resources/Fonts/aboutfriend/AboutFriendExtended
--- a/Assets/Resources/Fonts/rodin/FOT-Rodin
+++ b/Assets/Resources/Fonts/rodin/FOT-Rodin
--- a/Assets/Resources/Fonts/rodin/FOT-Rodin
+++ b/Assets/Resources/Fonts/rodin/FOT-Rodin
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9ff0c04cbd659ef43bccfe273684eadf
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Fonts/rodin/FOT-Rodin
+++ b/Assets/Resources/Fonts/rodin/FOT-Rodin
--- a/Assets/Resources/Fonts/rodin/FOT-Rodin
+++ b/Assets/Resources/Fonts/rodin/FOT-Rodin
@ -2,14 +2,15 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: FOT-Rodin Pro DB Entity
  m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
-  m_ShaderKeywords: 
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
@ -39,6 +40,7 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _Ambient: 1
    - _Bevel: 0.5
--- a/Assets/Resources/Fonts/rodin/FOT-Rodin
+++ b/Assets/Resources/Fonts/rodin/FOT-Rodin
@ -14,9 +14,9 @@ Texture2D:
  m_DownscaleFallback: 0
  m_IsAlphaChannelOptional: 0
  serializedVersion: 2
-  m_Width: 0
-  m_Height: 0
-  m_CompleteImageSize: 0
+  m_Width: 1
+  m_Height: 1
+  m_CompleteImageSize: 1
  m_MipsStripped: 0
  m_TextureFormat: 1
  m_MipCount: 1
@ -40,8 +40,8 @@ Texture2D:
  m_LightmapFormat: 0
  m_ColorSpace: 0
  m_PlatformBlob: 
-  image data: 0
-  _typelessdata: 
+  image data: 1
+  _typelessdata: 00
  m_StreamData:
    serializedVersion: 2
    offset: 0
@ -59,21 +59,14 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
  m_Name: FOT-Rodin Pro DB SDF Dynamic
  m_EditorClassIdentifier: 
-  hashCode: -716773919
-  material: {fileID: 5296781804180034499}
-  materialHashCode: -1646043487
  m_Version: 1.1.0
-  m_SourceFontFileGUID: d9b391ecd583bd54fa458814fbcad7be
-  m_SourceFontFile_EditorRef: {fileID: 12800000, guid: d9b391ecd583bd54fa458814fbcad7be, type: 3}
-  m_SourceFontFile: {fileID: 12800000, guid: d9b391ecd583bd54fa458814fbcad7be, type: 3}
-  m_AtlasPopulationMode: 1
  m_FaceInfo:
    m_FaceIndex: 0
    m_FamilyName: FOT-Rodin Pro
    m_StyleName: DB
    m_PointSize: 90
    m_Scale: 1
-    m_UnitsPerEM: 0
+    m_UnitsPerEM: 1000
    m_LineHeight: 180
    m_AscentLine: 79.200005
    m_CapLine: 71
@ -89,59 +82,16 @@ MonoBehaviour:
    m_StrikethroughOffset: 20
    m_StrikethroughThickness: 4.5
    m_TabWidth: 31
-  m_GlyphTable: []
-  m_CharacterTable: []
-  m_AtlasTextures:
-  - {fileID: -7616882842637102995}
-  m_AtlasTextureIndex: 0
-  m_IsMultiAtlasTexturesEnabled: 1
-  m_ClearDynamicDataOnBuild: 1
-  m_UsedGlyphRects: []
-  m_FreeGlyphRects:
-  - m_X: 0
-    m_Y: 0
-    m_Width: 2047
-    m_Height: 2047
-  m_fontInfo:
-    Name: 
-    PointSize: 0
-    Scale: 0
-    CharacterCount: 0
-    LineHeight: 0
-    Baseline: 0
-    Ascender: 0
-    CapHeight: 0
-    Descender: 0
-    CenterLine: 0
-    SuperscriptOffset: 0
-    SubscriptOffset: 0
-    SubSize: 0
-    Underline: 0
-    UnderlineThickness: 0
-    strikethrough: 0
-    strikethroughThickness: 0
-    TabWidth: 0
-    Padding: 0
-    AtlasWidth: 0
-    AtlasHeight: 0
-  atlas: {fileID: 0}
-  m_AtlasWidth: 2048
-  m_AtlasHeight: 2048
-  m_AtlasPadding: 9
-  m_AtlasRenderMode: 4165
-  m_glyphInfoList: []
-  m_KerningTable:
-    kerningPairs: []
-  m_FontFeatureTable:
-    m_GlyphPairAdjustmentRecords: []
-  fallbackFontAssets: []
-  m_FallbackFontAssetTable: []
+  m_Material: {fileID: 5296781804180034499}
+  m_SourceFontFileGUID: d9b391ecd583bd54fa458814fbcad7be
  m_CreationSettings:
    sourceFontFileName: 
    sourceFontFileGUID: d9b391ecd583bd54fa458814fbcad7be
+    faceIndex: 0
    pointSizeSamplingMode: 0
    pointSize: 90
    padding: 9
+    paddingMode: 0
    packingMode: 0
    atlasWidth: 2048
    atlasHeight: 2048
@ -153,6 +103,115 @@ MonoBehaviour:
    fontStyleModifier: 0
    renderMode: 4165
    includeFontFeatures: 0
+  m_SourceFontFile: {fileID: 12800000, guid: d9b391ecd583bd54fa458814fbcad7be, type: 3}
+  m_SourceFontFilePath: 
+  m_AtlasPopulationMode: 1
+  InternalDynamicOS: 0
+  m_GlyphTable: []
+  m_CharacterTable: []
+  m_AtlasTextures:
+  - {fileID: -7616882842637102995}
+  m_AtlasTextureIndex: 0
+  m_IsMultiAtlasTexturesEnabled: 1
+  m_GetFontFeatures: 1
+  m_ClearDynamicDataOnBuild: 1
+  m_AtlasWidth: 2048
+  m_AtlasHeight: 2048
+  m_AtlasPadding: 9
+  m_AtlasRenderMode: 4165
+  m_UsedGlyphRects: []
+  m_FreeGlyphRects:
+  - m_X: 0
+    m_Y: 0
+    m_Width: 2047
+    m_Height: 2047
+  m_FontFeatureTable:
+    m_MultipleSubstitutionRecords: []
+    m_LigatureSubstitutionRecords:
+    - m_ComponentGlyphIDs: 4f000000100000004e000000
+      m_LigatureGlyphID: 11868
+    - m_ComponentGlyphIDs: 4f00000054000000
+      m_LigatureGlyphID: 8029
+    m_GlyphPairAdjustmentRecords:
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 79
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 1.8000001
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 87
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: -1702022880
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 79
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0.45000002
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 90
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: -1702022880
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 87
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -4.5
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 13
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: -1702022880
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 87
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -4.5
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 15
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: -1702022880
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 87
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 4.1400003
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 122
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: -1702022880
+    m_MarkToBaseAdjustmentRecords: []
+    m_MarkToMarkAdjustmentRecords: []
+  m_ShouldReimportFontFeatures: 0
+  m_FallbackFontAssetTable: []
  m_FontWeightTable:
  - regularTypeface: {fileID: 0}
    italicTypeface: {fileID: 0}
@ -181,6 +240,33 @@ MonoBehaviour:
  boldSpacing: 7
  italicStyle: 35
  tabSize: 10
+  m_fontInfo:
+    Name: 
+    PointSize: 0
+    Scale: 0
+    CharacterCount: 0
+    LineHeight: 0
+    Baseline: 0
+    Ascender: 0
+    CapHeight: 0
+    Descender: 0
+    CenterLine: 0
+    SuperscriptOffset: 0
+    SubscriptOffset: 0
+    SubSize: 0
+    Underline: 0
+    UnderlineThickness: 0
+    strikethrough: 0
+    strikethroughThickness: 0
+    TabWidth: 0
+    Padding: 0
+    AtlasWidth: 0
+    AtlasHeight: 0
+  m_glyphInfoList: []
+  m_KerningTable:
+    kerningPairs: []
+  fallbackFontAssets: []
+  atlas: {fileID: 0}
 --- !u!21 &5296781804180034499
 Material:
  serializedVersion: 8
--- a/Assets/Resources/Fonts/rodin/FOT-Rodin
+++ b/Assets/Resources/Fonts/rodin/FOT-Rodin
--- a/Assets/Resources/Prefabs/GameView/GameTex.renderTexture
+++ b/Assets/Resources/Prefabs/GameView/GameTex.renderTexture
@ -14,8 +14,8 @@ RenderTexture:
  m_DownscaleFallback: 0
  m_IsAlphaChannelOptional: 0
  serializedVersion: 5
-  m_Width: 1728
-  m_Height: 972
+  m_Width: 1189
+  m_Height: 668
  m_AntiAliasing: 2
  m_MipCount: -1
  m_DepthStencilFormat: 92
--- a/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture
+++ b/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture
@ -14,8 +14,8 @@ RenderTexture:
  m_DownscaleFallback: 0
  m_IsAlphaChannelOptional: 0
  serializedVersion: 5
-  m_Width: 2592
-  m_Height: 1458
+  m_Width: 1783
+  m_Height: 1002
  m_AntiAliasing: 1
  m_MipCount: -1
  m_DepthStencilFormat: 92
--- a/Assets/Resources/Sprites/Editor/UI/rounded-bg-6px.png
+++ b/Assets/Resources/Sprites/Editor/UI/rounded-bg-6px.png
--- a/Assets/Resources/Sprites/Editor/UI/rounded-bg-6px.png.meta
+++ b/Assets/Resources/Sprites/Editor/UI/rounded-bg-6px.png.meta
@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 84fb27b49ee4cc148abc3d78cf2e9448
+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: 0
+  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: 8, y: 8, z: 8, w: 8}
+  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: 64
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    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: WebGL
+    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: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/Editor.unity
+++ b/Assets/Scenes/Editor.unity
--- a/Assets/Scripts/AppInfo.cs
+++ b/Assets/Scripts/AppInfo.cs
@ -1,8 +1,8 @@
 using System;

 public static class AppInfo {
-    public const string Version = "0.0.982";
-    public static readonly DateTime Date = new DateTime(2023, 09, 11, 20, 44, 02, 741, DateTimeKind.Utc);
+    public const string Version = "0.0.983";
+    public static readonly DateTime Date = new DateTime(2023, 09, 21, 14, 09, 18, 735, DateTimeKind.Utc);
 }


--- a/Assets/Scripts/LevelEditor/Timeline/Timeline.cs
+++ b/Assets/Scripts/LevelEditor/Timeline/Timeline.cs
@ -900,12 +900,12 @@ namespace HeavenStudio.Editor.Track
        public float SnapToLayer(float y)
        {
            float size = LayerHeight();
-            return Mathf.Clamp(Mathp.Round2Nearest(y, size), -size * 4f, 0f);
+            return Mathf.Clamp(Mathp.Round2Nearest(y, size), -size * (LayerCount - 1), 0f);
        }

        public float LayerHeight()
        {
-            return LayersRect.rect.height / 5f;
+            return LayersRect.rect.height / LayerCount;
        }

        const float SpeedSnap = 0.25f;
--- a/Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs
+++ b/Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs
@ -1,12 +1,8 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;

 using Starpelly;
-using DG.Tweening;
 using Jukebox;
-using Jukebox.Legacy;
 using TMPro;

 namespace HeavenStudio.Editor.Track
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -134,7 +134,7 @@ PlayerSettings:
    16:10: 1
    16:9: 1
    Others: 1
-  bundleVersion: 0.0.982
+  bundleVersion: 0.0.983
  preloadedAssets:
  - {fileID: 102900000, guid: 5348c08b82446e0478cee8bda6c02cfc, type: 3}
  metroInputSource: 0
@ -158,11 +158,11 @@ PlayerSettings:
  applicationIdentifier:
    Standalone: com.RHeavenStudio.Heaven-Studio
  buildNumber:
-    Standalone: 982
+    Standalone: 983
    iPhone: 0
    tvOS: 0
  overrideDefaultApplicationIdentifier: 0
-  AndroidBundleVersionCode: 982
+  AndroidBundleVersionCode: 983
  AndroidMinSdkVersion: 22
  AndroidTargetSdkVersion: 0
  AndroidPreferredInstallLocation: 1
@ -278,7 +278,99 @@ PlayerSettings:
      m_Width: 128
      m_Height: 128
      m_Kind: 0
-  m_BuildTargetPlatformIcons: []
+  m_BuildTargetPlatformIcons:
+  - m_BuildTarget: Android
+    m_Icons:
+    - m_Textures: []
+      m_Width: 432
+      m_Height: 432
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 324
+      m_Height: 324
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 216
+      m_Height: 216
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 162
+      m_Height: 162
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 108
+      m_Height: 108
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 81
+      m_Height: 81
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 0
+      m_SubKind: 
  m_BuildTargetBatching: []
  m_BuildTargetShaderSettings: []
  m_BuildTargetGraphicsJobs: