upgrade to 2021

709d023d · 神楽坂玲奈 · 4c839e7f · 709d023d · 709d023d · 709d023d
Commit 709d023d authored Aug 31, 2021 by 神楽坂玲奈
22 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -3,10 +3,12 @@
 [Oo]bj/
 [Bb]uild/
 [Bb]uilds/
+Logs/
 Assets/AssetStoreTools*
 # Visual Studio cache directory
 /.vs/
+.idea
 # Autogenerated VS/MD/Consulo solution and project files
 ExportedObj/

--- a/Assets/NGUI/Examples/Models/Orc/FBX.FBX.meta
+++ b/Assets/NGUI/Examples/Models/Orc/FBX.FBX.meta
 fileFormatVersion: 2
 guid: 1badfd6944994af44b5ddf21766a94bc
 ModelImporter:
-  serializedVersion: 18
+  serializedVersion: 21100
-  fileIDToRecycleName:
+  internalIDToNameTable:
-    100000: Bip01 L Toe0 - Ignore Me
+  - first:
-    100002: Bip01 R Toe0 - Ignore Me
+      1: 100000
-    100004: Bip01 L Clavicle
+    second: Bip01 L Toe0 - Ignore Me
-    100006: Bip01 L UpperArm
+  - first:
-    100008: Bip01 R Clavicle
+      1: 100002
-    100010: Bip01 R UpperArm
+    second: Bip01 R Toe0 - Ignore Me
-    100012: Bip01 HeadNub
+  - first:
-    100014: Bip01 Head
+      1: 100004
-    100016: Bip01 Neck
+    second: Bip01 L Clavicle
-    100018: Bip01 Spine1
+  - first:
-    100020: Bip01 R Toe0Nub
+      1: 100006
-    100022: Bip01 R Foot
+    second: Bip01 L UpperArm
-    100024: Bip01 R Calf
+  - first:
-    100026: Bip01 R Thigh
+      1: 100008
-    100028: Bip01 L Toe0Nub
+    second: Bip01 R Clavicle
-    100030: Bip01 L Foot
+  - first:
-    100032: Bip01 L Calf
+      1: 100010
-    100034: Bip01 L Thigh
+    second: Bip01 R UpperArm
-    100036: Bip01 Spine
+  - first:
-    100038: Bip01 Pelvis
+      1: 100012
-    100040: Bip01 Footsteps
+    second: Bip01 HeadNub
-    100042: Orc Biped
+  - first:
-    100044: Orc
+      1: 100014
-    100046: //RootNode
+    second: Bip01 Head
-    100048: Bip01 R Hand
+  - first:
-    100050: Bip01 R Forearm
+      1: 100016
-    100052: Bip01 L Hand
+    second: Bip01 Neck
-    100054: Bip01 L Forearm
+  - first:
-    400000: Bip01 L Toe0 - Ignore Me
+      1: 100018
-    400002: Bip01 R Toe0 - Ignore Me
+    second: Bip01 Spine1
-    400004: Bip01 L Clavicle
+  - first:
-    400006: Bip01 L UpperArm
+      1: 100020
-    400008: Bip01 R Clavicle
+    second: Bip01 R Toe0Nub
-    400010: Bip01 R UpperArm
+  - first:
-    400012: Bip01 HeadNub
+      1: 100022
-    400014: Bip01 Head
+    second: Bip01 R Foot
-    400016: Bip01 Neck
+  - first:
-    400018: Bip01 Spine1
+      1: 100024
-    400020: Bip01 R Toe0Nub
+    second: Bip01 R Calf
-    400022: Bip01 R Foot
+  - first:
-    400024: Bip01 R Calf
+      1: 100026
-    400026: Bip01 R Thigh
+    second: Bip01 R Thigh
-    400028: Bip01 L Toe0Nub
+  - first:
-    400030: Bip01 L Foot
+      1: 100028
-    400032: Bip01 L Calf
+    second: Bip01 L Toe0Nub
-    400034: Bip01 L Thigh
+  - first:
-    400036: Bip01 Spine
+      1: 100030
-    400038: Bip01 Pelvis
+    second: Bip01 L Foot
-    400040: Bip01 Footsteps
+  - first:
-    400042: Orc Biped
+      1: 100032
-    400044: Orc
+    second: Bip01 L Calf
-    400046: //RootNode
+  - first:
-    400048: Bip01 R Hand
+      1: 100034
-    400050: Bip01 R Forearm
+    second: Bip01 L Thigh
-    400052: Bip01 L Hand
+  - first:
-    400054: Bip01 L Forearm
+      1: 100036
-    4300000: Orc
+    second: Bip01 Spine
-    11100000: //RootNode
+  - first:
-    13700000: Bip01 Pelvis
+      1: 100038
+    second: Bip01 Pelvis
+  - first:
+      1: 100040
+    second: Bip01 Footsteps
+  - first:
+      1: 100042
+    second: Orc Biped
+  - first:
+      1: 100044
+    second: Orc
+  - first:
+      1: 100046
+    second: //RootNode
+  - first:
+      1: 100048
+    second: Bip01 R Hand
+  - first:
+      1: 100050
+    second: Bip01 R Forearm
+  - first:
+      1: 100052
+    second: Bip01 L Hand
+  - first:
+      1: 100054
+    second: Bip01 L Forearm
+  - first:
+      4: 400000
+    second: Bip01 L Toe0 - Ignore Me
+  - first:
+      4: 400002
+    second: Bip01 R Toe0 - Ignore Me
+  - first:
+      4: 400004
+    second: Bip01 L Clavicle
+  - first:
+      4: 400006
+    second: Bip01 L UpperArm
+  - first:
+      4: 400008
+    second: Bip01 R Clavicle
+  - first:
+      4: 400010
+    second: Bip01 R UpperArm
+  - first:
+      4: 400012
+    second: Bip01 HeadNub
+  - first:
+      4: 400014
+    second: Bip01 Head
+  - first:
+      4: 400016
+    second: Bip01 Neck
+  - first:
+      4: 400018
+    second: Bip01 Spine1
+  - first:
+      4: 400020
+    second: Bip01 R Toe0Nub
+  - first:
+      4: 400022
+    second: Bip01 R Foot
+  - first:
+      4: 400024
+    second: Bip01 R Calf
+  - first:
+      4: 400026
+    second: Bip01 R Thigh
+  - first:
+      4: 400028
+    second: Bip01 L Toe0Nub
+  - first:
+      4: 400030
+    second: Bip01 L Foot
+  - first:
+      4: 400032
+    second: Bip01 L Calf
+  - first:
+      4: 400034
+    second: Bip01 L Thigh
+  - first:
+      4: 400036
+    second: Bip01 Spine
+  - first:
+      4: 400038
+    second: Bip01 Pelvis
+  - first:
+      4: 400040
+    second: Bip01 Footsteps
+  - first:
+      4: 400042
+    second: Orc Biped
+  - first:
+      4: 400044
+    second: Orc
+  - first:
+      4: 400046
+    second: //RootNode
+  - first:
+      4: 400048
+    second: Bip01 R Hand
+  - first:
+      4: 400050
+    second: Bip01 R Forearm
+  - first:
+      4: 400052
+    second: Bip01 L Hand
+  - first:
+      4: 400054
+    second: Bip01 L Forearm
+  - first:
+      43: 4300000
+    second: Orc
+  - first:
+      111: 11100000
+    second: //RootNode
+  - first:
+      137: 13700000
+    second: Bip01 Pelvis
+  externalObjects: {}
  materials:
-    importMaterials: 0
+    materialImportMode: 0
    materialName: 0
    materialSearch: 1
+    materialLocation: 0
  animations:
    legacyGenerateAnimations: 3
    bakeSimulation: 0
+    resampleCurves: 1
    optimizeGameObjects: 0
    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
    animationImportErrors: 
    animationImportWarnings: 
    animationRetargetingWarnings: 
    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
    animationCompression: 1
-    animationRotationError: .5
+    animationRotationError: 0.5
-    animationPositionError: .5
+    animationPositionError: 0.5
-    animationScaleError: .5
+    animationScaleError: 0.5
    animationWrapMode: 0
    extraExposedTransformPaths: []
+    extraUserProperties: []
    clipAnimations: []
    isReadable: 1
  meshes:
    lODScreenPercentages: []
-    globalScale: .100000001
+    globalScale: 0.1
    meshCompression: 0
    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 0
    importBlendShapes: 1
+    importCameras: 0
+    importLights: 0
+    fileIdsGeneration: 1
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
-    optimizeMeshForGPU: 1
    keepQuads: 0
    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 1
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 0
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
    secondaryUVPackMargin: 4
    useFileScale: 0
  tangentSpace:
    normalSmoothAngle: 60
-    splitTangentsAcrossUV: 1
    normalImportMode: 0
-    tangentImportMode: 1
+    tangentImportMode: 4
+    normalCalculationMode: 0
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips:
+  - 12e164431dbd8714bbde0aeef453b764
+  - d9a637e69b9f0a7449ee6b6e158ddd5b
  importAnimation: 1
-  copyAvatar: 0
  humanDescription:
+    serializedVersion: 3
    human: []
    skeleton: []
-    armTwist: .5
+    armTwist: 0.5
-    foreArmTwist: .5
+    foreArmTwist: 0.5
-    upperLegTwist: .5
+    upperLegTwist: 0.5
-    legTwist: .5
+    legTwist: 0.5
-    armStretch: .0500000007
+    armStretch: 0.05
-    legStretch: .0500000007
+    legStretch: 0.05
    feetSpacing: 0
+    globalScale: 0.1
    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 0
  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
  animationType: 1
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 0
  additionalBone: 0
  userData: 
  assetBundleName: 

--- a/Assets/Resources.meta
+++ b/Assets/Resources.meta
+fileFormatVersion: 2
+guid: 24a7d7a375b7505468a9a28d646aaf2e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/BillingMode.json
+++ b/Assets/Resources/BillingMode.json
+{"androidStore":"GooglePlay"}
\ No newline at end of file
--- a/Assets/Resources/BillingMode.json.meta
+++ b/Assets/Resources/BillingMode.json.meta
+fileFormatVersion: 2
+guid: 6fa576f796705304aa63b6e28a58563a
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts.meta
+++ b/Assets/Scripts.meta
+fileFormatVersion: 2
+guid: 6b1151acfe53e714a8cf8cdb103e2e94
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Editor.meta
+++ b/Assets/Scripts/Editor.meta
+fileFormatVersion: 2
+guid: 118f50683296ea34ca471ee48df414f7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Editor/BuildCommand.cs.meta
+++ b/Assets/Scripts/Editor/BuildCommand.cs.meta
+fileFormatVersion: 2
+guid: d0290c9000d10b143a05f773420a6485
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/old/Ocgcore/button/all_button.png.meta
+++ b/Assets/old/Ocgcore/button/all_button.png.meta
 fileFormatVersion: 2
 guid: ea873678223187e439f5dcb7373e1e09
-timeCreated: 1480605786
-licenseType: Pro
 TextureImporter:
-  fileIDToRecycleName:
+  internalIDToNameTable:
-    21300000: all_button_0
+  - first:
-    21300002: all_button_1
+      213: 21300000
-    21300004: all_button_2
+    second: all_button_0
-    21300006: all_button_3
+  - first:
-    21300008: all_button_4
+      213: 21300002
-    21300010: all_button_5
+    second: all_button_1
-    21300012: all_button_6
+  - first:
-    21300014: all_button_7
+      213: 21300004
-    21300016: all_button_8
+    second: all_button_2
-    21300018: all_button_9
+  - first:
-    21300020: all_button_10
+      213: 21300006
-    21300022: all_button_11
+    second: all_button_3
-  serializedVersion: 2
+  - first:
+      213: 21300008
+    second: all_button_4
+  - first:
+      213: 21300010
+    second: all_button_5
+  - first:
+      213: 21300012
+    second: all_button_6
+  - first:
+      213: 21300014
+    second: all_button_7
+  - first:
+      213: 21300016
+    second: all_button_8
+  - first:
+      213: 21300018
+    second: all_button_9
+  - first:
+      213: 21300020
+    second: all_button_10
+  - first:
+      213: 21300022
+    second: all_button_11
+  externalObjects: {}
+  serializedVersion: 11
  mipmaps:
    mipMapMode: 0
    enableMipMap: 1
+    sRGBTexture: 1
    linearTexture: 0
-    correctGamma: 0
    fadeOut: 0
    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
    mipMapFadeDistanceStart: 1
    mipMapFadeDistanceEnd: 3
  bumpmap:
    convertToNormalMap: 0
    externalNormalMap: 0
-    heightScale: .25
+    heightScale: 0.25
    normalMapFilter: 0
  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
  grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
  cubemapConvolution: 0
-  cubemapConvolutionSteps: 8
-  cubemapConvolutionExponent: 1.5
  seamlessCubemap: 0
  textureFormat: -1
  maxTextureSize: 2048
  textureSettings:
-    filterMode: -1
+    serializedVersion: 2
+    filterMode: 1
    aniso: 16
-    mipBias: -1
+    mipBias: 0
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
  nPOTScale: 0
  lightmap: 0
-  rGBM: 0
  compressionQuality: 50
  spriteMode: 2
  spriteExtrude: 1
  spriteMeshType: 1
  alignment: 0
-  spritePivot: {x: .5, y: .5}
+  spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
  textureType: 8
-  buildTargetSettings: []
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 1
+  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
  spriteSheet:
+    serializedVersion: 2
    sprites:
-    - name: all_button_0
+    - serializedVersion: 2
+      name: all_button_0
      rect:
        serializedVersion: 2
        x: 100
@@ -71,7 +125,18 @@ TextureImporter:
      alignment: 0
      pivot: {x: 0, y: 0}
      border: {x: 0, y: 0, z: 0, w: 0}
-    - name: all_button_1
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 02305410000000000800000000000000
+      internalID: 21300000
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: all_button_1
      rect:
        serializedVersion: 2
        x: 365
@@ -81,7 +146,18 @@ TextureImporter:
      alignment: 0
      pivot: {x: 0, y: 0}
      border: {x: 0, y: 0, z: 0, w: 0}
-    - name: all_button_2
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 22305410000000000800000000000000
+      internalID: 21300002
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: all_button_2
      rect:
        serializedVersion: 2
        x: 637
@@ -91,7 +167,18 @@ TextureImporter:
      alignment: 0
      pivot: {x: 0, y: 0}
      border: {x: 0, y: 0, z: 0, w: 0}
-    - name: all_button_3
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 42305410000000000800000000000000
+      internalID: 21300004
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: all_button_3
      rect:
        serializedVersion: 2
        x: 919
@@ -101,7 +188,18 @@ TextureImporter:
      alignment: 0
      pivot: {x: 0, y: 0}
      border: {x: 0, y: 0, z: 0, w: 0}
-    - name: all_button_4
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 62305410000000000800000000000000
+      internalID: 21300006
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: all_button_4
      rect:
        serializedVersion: 2
        x: 91
@@ -111,7 +209,18 @@ TextureImporter:
      alignment: 0
      pivot: {x: 0, y: 0}
      border: {x: 0, y: 0, z: 0, w: 0}
-    - name: all_button_5
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 82305410000000000800000000000000
+      internalID: 21300008
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: all_button_5
      rect:
        serializedVersion: 2
        x: 374
@@ -121,7 +230,18 @@ TextureImporter:
      alignment: 0
      pivot: {x: 0, y: 0}
      border: {x: 0, y: 0, z: 0, w: 0}
-    - name: all_button_6
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: a2305410000000000800000000000000
+      internalID: 21300010
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: all_button_6
      rect:
        serializedVersion: 2
        x: 657
@@ -131,7 +251,18 @@ TextureImporter:
      alignment: 0
      pivot: {x: 0, y: 0}
      border: {x: 0, y: 0, z: 0, w: 0}
-    - name: all_button_7
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: c2305410000000000800000000000000
+      internalID: 21300012
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: all_button_7
      rect:
        serializedVersion: 2
        x: 919
@@ -141,7 +272,18 @@ TextureImporter:
      alignment: 0
      pivot: {x: 0, y: 0}
      border: {x: 0, y: 0, z: 0, w: 0}
-    - name: all_button_8
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: e2305410000000000800000000000000
+      internalID: 21300014
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: all_button_8
      rect:
        serializedVersion: 2
        x: 105
@@ -151,7 +293,18 @@ TextureImporter:
      alignment: 0
      pivot: {x: 0, y: 0}
      border: {x: 0, y: 0, z: 0, w: 0}
-    - name: all_button_9
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 03305410000000000800000000000000
+      internalID: 21300016
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: all_button_9
      rect:
        serializedVersion: 2
        x: 386
@@ -161,7 +314,18 @@ TextureImporter:
      alignment: 0
      pivot: {x: 0, y: 0}
      border: {x: 0, y: 0, z: 0, w: 0}
-    - name: all_button_10
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 23305410000000000800000000000000
+      internalID: 21300018
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: all_button_10
      rect:
        serializedVersion: 2
        x: 657
@@ -171,7 +335,18 @@ TextureImporter:
      alignment: 0
      pivot: {x: 0, y: 0}
      border: {x: 0, y: 0, z: 0, w: 0}
-    - name: all_button_11
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 43305410000000000800000000000000
+      internalID: 21300020
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: all_button_11
      rect:
        serializedVersion: 2
        x: 921
@@ -181,7 +356,29 @@ TextureImporter:
      alignment: 0
      pivot: {x: 0, y: 0}
      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 63305410000000000800000000000000
+      internalID: 21300022
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
  spritePackingTag: button_ocgcore
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
  userData: 
  assetBundleName: 20170219
  assetBundleVariant: 0201
--- a/Assets/old/Ocgcore/numbers/num.png.meta
+++ b/Assets/old/Ocgcore/numbers/num.png.meta
--- a/Assets/old/Ocgcore/numbers/num2.png.meta
+++ b/Assets/old/Ocgcore/numbers/num2.png.meta
--- a/Assets/old/UiverseAssests/TextMesh Pro/Examples/Textures/Gradient Diagonal (Color).jpg.meta
+++ b/Assets/old/UiverseAssests/TextMesh Pro/Examples/Textures/Gradient Diagonal (Color).jpg.meta
 fileFormatVersion: 2
 guid: 2421a4955e71725448211e6bfbc7d7fb
-timeCreated: 1478780265
-licenseType: Pro
 TextureImporter:
-  fileIDToRecycleName: {}
+  internalIDToNameTable: []
-  serializedVersion: 2
+  externalObjects: {}
+  serializedVersion: 11
  mipmaps:
    mipMapMode: 0
    enableMipMap: 1
+    sRGBTexture: 1
    linearTexture: 0
-    correctGamma: 0
    fadeOut: 0
    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
    mipMapFadeDistanceStart: 1
    mipMapFadeDistanceEnd: 3
  bumpmap:
    convertToNormalMap: 0
    externalNormalMap: 0
-    heightScale: .25
+    heightScale: 0.25
    normalMapFilter: 0
  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
  grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
  cubemapConvolution: 0
-  cubemapConvolutionSteps: 8
-  cubemapConvolutionExponent: 1.5
  seamlessCubemap: 0
  textureFormat: -1
  maxTextureSize: 2048
  textureSettings:
-    filterMode: -1
+    serializedVersion: 2
+    filterMode: 1
    aniso: 16
-    mipBias: -1
+    mipBias: 0
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
  nPOTScale: 0
  lightmap: 0
-  rGBM: 0
  compressionQuality: 50
  spriteMode: 1
  spriteExtrude: 1
  spriteMeshType: 1
  alignment: 0
-  spritePivot: {x: .5, y: .5}
+  spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
  textureType: 8
-  buildTargetSettings: []
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 1
+  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
  spriteSheet:
+    serializedVersion: 2
    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/old/UiverseAssests/TextMesh Pro/GUISkins/Textures/btn_AlignMidLine.psd.meta
+++ b/Assets/old/UiverseAssests/TextMesh Pro/GUISkins/Textures/btn_AlignMidLine.psd.meta
 fileFormatVersion: 2
 guid: 413b9be2291f7ad4fb6fa806b7898524
-timeCreated: 1478780266
-licenseType: Pro
 TextureImporter:
-  fileIDToRecycleName: {}
+  internalIDToNameTable: []
-  serializedVersion: 2
+  externalObjects: {}
+  serializedVersion: 11
  mipmaps:
    mipMapMode: 0
    enableMipMap: 1
+    sRGBTexture: 1
    linearTexture: 0
-    correctGamma: 0
    fadeOut: 0
    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
    mipMapFadeDistanceStart: 1
    mipMapFadeDistanceEnd: 3
  bumpmap:
    convertToNormalMap: 0
    externalNormalMap: 0
-    heightScale: .25
+    heightScale: 0.25
    normalMapFilter: 0
  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
  grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
  cubemapConvolution: 0
-  cubemapConvolutionSteps: 8
-  cubemapConvolutionExponent: 1.5
  seamlessCubemap: 0
  textureFormat: -1
  maxTextureSize: 2048
  textureSettings:
-    filterMode: -1
+    serializedVersion: 2
+    filterMode: 1
    aniso: 16
-    mipBias: -1
+    mipBias: 0
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
  nPOTScale: 0
  lightmap: 0
-  rGBM: 0
  compressionQuality: 50
  spriteMode: 1
  spriteExtrude: 1
  spriteMeshType: 1
  alignment: 0
-  spritePivot: {x: .5, y: .5}
+  spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
  textureType: 8
-  buildTargetSettings: []
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 1
+  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
  spriteSheet:
+    serializedVersion: 2
    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
  spritePackingTag: 
+  pSDRemoveMatte: 1
+  pSDShowRemoveMatteOption: 1
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/old/UiverseAssests/TextMesh Pro/GUISkins/Textures/btn_AlignMidline_Light.psd.meta
+++ b/Assets/old/UiverseAssests/TextMesh Pro/GUISkins/Textures/btn_AlignMidline_Light.psd.meta
 fileFormatVersion: 2
 guid: ebd48e965fafc8b468f2de2c36eea7d2
-timeCreated: 1480605786
-licenseType: Pro
 TextureImporter:
-  fileIDToRecycleName: {}
+  internalIDToNameTable: []
-  serializedVersion: 2
+  externalObjects: {}
+  serializedVersion: 11
  mipmaps:
    mipMapMode: 0
    enableMipMap: 1
+    sRGBTexture: 1
    linearTexture: 0
-    correctGamma: 0
    fadeOut: 0
    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
    mipMapFadeDistanceStart: 1
    mipMapFadeDistanceEnd: 3
  bumpmap:
    convertToNormalMap: 0
    externalNormalMap: 0
-    heightScale: .25
+    heightScale: 0.25
    normalMapFilter: 0
  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
  grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
  cubemapConvolution: 0
-  cubemapConvolutionSteps: 8
-  cubemapConvolutionExponent: 1.5
  seamlessCubemap: 0
  textureFormat: -1
  maxTextureSize: 2048
  textureSettings:
-    filterMode: -1
+    serializedVersion: 2
+    filterMode: 1
    aniso: 16
-    mipBias: -1
+    mipBias: 0
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
  nPOTScale: 0
  lightmap: 0
-  rGBM: 0
  compressionQuality: 50
  spriteMode: 1
  spriteExtrude: 1
  spriteMeshType: 1
  alignment: 0
-  spritePivot: {x: .5, y: .5}
+  spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
  textureType: 8
-  buildTargetSettings: []
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 1
+  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
  spriteSheet:
+    serializedVersion: 2
    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
  spritePackingTag: 
+  pSDRemoveMatte: 1
+  pSDShowRemoveMatteOption: 1
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/old/UiverseAssests/TextMesh Pro/Resources/Sprites/Default Sprite Atlas.psd.meta
+++ b/Assets/old/UiverseAssests/TextMesh Pro/Resources/Sprites/Default Sprite Atlas.psd.meta
 fileFormatVersion: 2
 guid: eb3653d62088d6a4a8e661798eb33737
-timeCreated: 1480605786
-licenseType: Pro
 TextureImporter:
-  fileIDToRecycleName:
+  internalIDToNameTable:
-    21300000: Smile_01
+  - first:
-    21300002: Wink
+      213: 21300000
-    21300004: Bob
+    second: Smile_01
-    21300006: Default Sprite Atlas_3
+  - first:
-    21300008: Sad_01
+      213: 21300002
-    21300010: Default Sprite Atlas_2
+    second: Wink
-    21300012: Wink_01
+  - first:
-    21300014: Whaaat
+      213: 21300004
-    21300016: Default Sprite Atlas_6
+    second: Bob
-    21300018: Smile_0
+  - first:
-    21300020: Default Sprite Atlas_1
+      213: 21300006
-    21300022: Default Sprite Atlas_4
+    second: Default Sprite Atlas_3
-    21300024: Default Sprite Atlas_0
+  - first:
-    21300026: Default Sprite Atlas_5
+      213: 21300008
-    21300028: Default Sprite Atlas_7
+    second: Sad_01
-    21300030: Default Sprite Atlas_8
+  - first:
-    21300032: Default Sprite Atlas_9
+      213: 21300010
-  serializedVersion: 2
+    second: Default Sprite Atlas_2
+  - first:
+      213: 21300012
+    second: Wink_01
+  - first:
+      213: 21300014
+    second: Whaaat
+  - first:
+      213: 21300016
+    second: Default Sprite Atlas_6
+  - first:
+      213: 21300018
+    second: Smile_0
+  - first:
+      213: 21300020
+    second: Default Sprite Atlas_1
+  - first:
+      213: 21300022
+    second: Default Sprite Atlas_4
+  - first:
+      213: 21300024
+    second: Default Sprite Atlas_0
+  - first:
+      213: 21300026
+    second: Default Sprite Atlas_5
+  - first:
+      213: 21300028
+    second: Default Sprite Atlas_7
+  - first:
+      213: 21300030
+    second: Default Sprite Atlas_8
+  - first:
+      213: 21300032
+    second: Default Sprite Atlas_9
+  externalObjects: {}
+  serializedVersion: 11
  mipmaps:
    mipMapMode: 0
    enableMipMap: 1
+    sRGBTexture: 1
    linearTexture: 0
-    correctGamma: 0
    fadeOut: 0
    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
    mipMapFadeDistanceStart: 1
    mipMapFadeDistanceEnd: 3
  bumpmap:
    convertToNormalMap: 0
    externalNormalMap: 0
-    heightScale: .25
+    heightScale: 0.25
    normalMapFilter: 0
  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
  grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
  cubemapConvolution: 0
-  cubemapConvolutionSteps: 8
-  cubemapConvolutionExponent: 1.5
  seamlessCubemap: 0
  textureFormat: -1
  maxTextureSize: 1024
  textureSettings:
-    filterMode: -1
+    serializedVersion: 2
+    filterMode: 1
    aniso: 16
-    mipBias: -1
+    mipBias: 0
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
  nPOTScale: 0
  lightmap: 0
-  rGBM: 0
  compressionQuality: 50
  spriteMode: 2
  spriteExtrude: 1
  spriteMeshType: 1
  alignment: 0
-  spritePivot: {x: .5, y: .5}
+  spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
  textureType: 8
-  buildTargetSettings: []
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 1
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
+    serializedVersion: 2
    sprites:
-    - name: Default Sprite Atlas_0
+    - serializedVersion: 2
+      name: Default Sprite Atlas_0
      rect:
        serializedVersion: 2
        x: 12
@@ -74,9 +138,20 @@ TextureImporter:
        width: 105
        height: 102
      alignment: 0
-      pivot: {x: .5, y: .5}
+      pivot: {x: 0.5, y: 0.5}
      border: {x: 0, y: 0, z: 0, w: 0}
-    - name: Default Sprite Atlas_1
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 83305410000000000800000000000000
+      internalID: 21300024
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Default Sprite Atlas_1
      rect:
        serializedVersion: 2
        x: 268
@@ -84,9 +159,20 @@ TextureImporter:
        width: 105
        height: 105
      alignment: 0
-      pivot: {x: .5, y: .5}
+      pivot: {x: 0.5, y: 0.5}
      border: {x: 0, y: 0, z: 0, w: 0}
-    - name: Default Sprite Atlas_2
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 43305410000000000800000000000000
+      internalID: 21300020
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Default Sprite Atlas_2
      rect:
        serializedVersion: 2
        x: 652
@@ -94,9 +180,20 @@ TextureImporter:
        width: 105
        height: 102
      alignment: 0
-      pivot: {x: .5, y: .5}
+      pivot: {x: 0.5, y: 0.5}
      border: {x: 0, y: 0, z: 0, w: 0}
-    - name: Default Sprite Atlas_3
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: a2305410000000000800000000000000
+      internalID: 21300010
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Default Sprite Atlas_3
      rect:
        serializedVersion: 2
        x: 908
@@ -104,9 +201,20 @@ TextureImporter:
        width: 105
        height: 106
      alignment: 0
-      pivot: {x: .5, y: .5}
+      pivot: {x: 0.5, y: 0.5}
      border: {x: 0, y: 0, z: 0, w: 0}
-    - name: Default Sprite Atlas_5
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 62305410000000000800000000000000
+      internalID: 21300006
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Default Sprite Atlas_5
      rect:
        serializedVersion: 2
        x: 13
@@ -114,9 +222,20 @@ TextureImporter:
        width: 105
        height: 102
      alignment: 0
-      pivot: {x: .5, y: .5}
+      pivot: {x: 0.5, y: 0.5}
      border: {x: 0, y: 0, z: 0, w: 0}
-    - name: Default Sprite Atlas_6
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: a3305410000000000800000000000000
+      internalID: 21300026
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Default Sprite Atlas_6
      rect:
        serializedVersion: 2
        x: 396
@@ -124,9 +243,20 @@ TextureImporter:
        width: 105
        height: 102
      alignment: 0
-      pivot: {x: .5, y: .5}
+      pivot: {x: 0.5, y: 0.5}
      border: {x: 0, y: 0, z: 0, w: 0}
-    - name: Default Sprite Atlas_4
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 03305410000000000800000000000000
+      internalID: 21300016
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Default Sprite Atlas_4
      rect:
        serializedVersion: 2
        x: 396
@@ -134,9 +264,20 @@ TextureImporter:
        width: 105
        height: 106
      alignment: 0
-      pivot: {x: .5, y: .5}
+      pivot: {x: 0.5, y: 0.5}
      border: {x: 0, y: 0, z: 0, w: 0}
-    - name: Default Sprite Atlas_7
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 63305410000000000800000000000000
+      internalID: 21300022
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Default Sprite Atlas_7
      rect:
        serializedVersion: 2
        x: 640
@@ -144,9 +285,20 @@ TextureImporter:
        width: 127
        height: 110
      alignment: 0
-      pivot: {x: .5, y: .5}
+      pivot: {x: 0.5, y: 0.5}
      border: {x: 0, y: 0, z: 0, w: 0}
-    - name: Default Sprite Atlas_8
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: c3305410000000000800000000000000
+      internalID: 21300028
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Default Sprite Atlas_8
      rect:
        serializedVersion: 2
        x: 659
@@ -154,9 +306,20 @@ TextureImporter:
        width: 350
        height: 120
      alignment: 0
-      pivot: {x: .5, y: .5}
+      pivot: {x: 0.5, y: 0.5}
      border: {x: 0, y: 0, z: 0, w: 0}
-    - name: Default Sprite Atlas_9
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: e3305410000000000800000000000000
+      internalID: 21300030
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Default Sprite Atlas_9
      rect:
        serializedVersion: 2
        x: 268
@@ -164,9 +327,31 @@ TextureImporter:
        width: 105
        height: 110
      alignment: 0
-      pivot: {x: .5, y: .5}
+      pivot: {x: 0.5, y: 0.5}
      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 04305410000000000800000000000000
+      internalID: 21300032
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
  spritePackingTag: 
+  pSDRemoveMatte: 1
+  pSDShowRemoveMatteOption: 1
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
 {
  "dependencies": {
-    "com.unity.ads": "2.0.8",
+    "com.unity.2d.sprite": "1.0.0",
-    "com.unity.analytics": "2.0.16",
+    "com.unity.2d.tilemap": "1.0.0",
-    "com.unity.package-manager-ui": "1.9.11",
+    "com.unity.ads": "3.7.5",
-    "com.unity.purchasing": "2.0.3",
+    "com.unity.analytics": "3.5.3",
+    "com.unity.collab-proxy": "1.7.1",
+    "com.unity.ide.rider": "3.0.7",
+    "com.unity.ide.visualstudio": "2.0.11",
+    "com.unity.ide.vscode": "1.2.3",
+    "com.unity.purchasing": "3.2.3",
+    "com.unity.test-framework": "1.1.27",
+    "com.unity.timeline": "1.5.6",
+    "com.unity.ugui": "1.0.0",
+    "com.unity.xr.legacyinputhelpers": "2.1.8",
    "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",

--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
--- a/ProjectSettings/PackageManagerSettings.asset
+++ b/ProjectSettings/PackageManagerSettings.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 61
+  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: 13964, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EnablePreReleasePackages: 0
+  m_EnablePackageDependencies: 0
+  m_AdvancedSettingsExpanded: 1
+  m_ScopedRegistriesSettingsExpanded: 1
+  m_SeeAllPackageVersions: 0
+  oneTimeWarningShown: 0
+  m_Registries:
+  - m_Id: main
+    m_Name: 
+    m_Url: https://packages.unity.com
+    m_Scopes: []
+    m_IsDefault: 1
+    m_Capabilities: 7
+  m_UserSelectedRegistryName: 
+  m_UserAddingNewScopedRegistry: 0
+  m_RegistryInfoDraft:
+    m_ErrorMessage: 
+    m_Original:
+      m_Id: 
+      m_Name: 
+      m_Url: 
+      m_Scopes: []
+      m_IsDefault: 0
+      m_Capabilities: 0
+    m_Modified: 0
+    m_Name: 
+    m_Url: 
+    m_Scopes:
+    - 
+    m_SelectedScopeIndex: 0
+  m_LoadAssets: 0
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
-m_EditorVersion: 2018.2.20f1
+m_EditorVersion: 2021.1.18f1
+m_EditorVersionWithRevision: 2021.1.18f1 (25bdc3efbc2d)
--- a/ProjectSettings/VFXManager.asset
+++ b/ProjectSettings/VFXManager.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!937362698 &1
+VFXManager:
+  m_ObjectHideFlags: 0
+  m_IndirectShader: {fileID: 0}
+  m_CopyBufferShader: {fileID: 0}
+  m_SortShader: {fileID: 0}
+  m_StripUpdateShader: {fileID: 0}
+  m_RenderPipeSettingsPath: 
+  m_FixedTimeStep: 0.016666668
+  m_MaxDeltaTime: 0.05
+  m_CompiledVersion: 0
+  m_RuntimeVersion: 0
--- a/ProjectSettings/VersionControlSettings.asset
+++ b/ProjectSettings/VersionControlSettings.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!890905787 &1
+VersionControlSettings:
+  m_ObjectHideFlags: 0
+  m_Mode: Visible Meta Files
+  m_CollabEditorSettings:
+    inProgressEnabled: 1
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!162 &1
+EditorUserSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 4
+  m_ConfigSettings:
+    RecentlyUsedScenePath-0:
+      value: 22424703114646560c07026c052d56040f
+      flags: 0
+    vcSharedLogLevel:
+      value: 0d5e400f0650
+      flags: 0
+  m_VCAutomaticAdd: 1
+  m_VCDebugCom: 0
+  m_VCDebugCmd: 0
+  m_VCDebugOut: 0
+  m_SemanticMergeMode: 2
+  m_VCShowFailedCheckout: 1
+  m_VCOverwriteFailedCheckoutAssets: 1
+  m_VCProjectOverlayIcons: 1
+  m_VCHierarchyOverlayIcons: 1
+  m_VCOtherOverlayIcons: 1
+  m_VCAllowAsyncUpdate: 1