Tutorial start

Assets/GUI PRO Kit - Casual Game/ResourcesData/Sprite/Component/Label/Label_LeftLabel01_Grey.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 2b7a689e4a87890938a9f1c010b285be
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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: 12, y: 0, z: 12, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  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: 

Assets/Game/Materials/UI.meta

@@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: 22c0c39bb66984f449489395e7ed3b96
+guid: 7cf786bc48ecc5172b035fa37a0d7aeb
+folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Game/Materials/UI/Mask.mat

@@ -0,0 +1,130 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Mask
+  m_Shader: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: UNITY_UI_ALPHACLIP
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AlphaClip: 0
+    - _Blend: 0
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _ColorMask: 15
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Stencil: 1
+    - _StencilComp: 8
+    - _StencilOp: 2
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _Surface: 0
+    - _UseUIAlphaClip: 1
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 0}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+  m_BuildTextureStacks: []
+--- !u!114 &4152682595501032597
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 4

Assets/Game/Materials/UI/Mask.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ce4fce560570deee0bc223ea2f178b7e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Game/Materials/UI/UI_Inverted_mask 1.mat

@@ -0,0 +1,130 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: UI_Inverted_mask 1
+  m_Shader: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AlphaClip: 0
+    - _Blend: 0
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _ColorMask: 15
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Stencil: 2
+    - _StencilComp: 3
+    - _StencilOp: 0
+    - _StencilReadMask: 1
+    - _StencilWriteMask: 0
+    - _Surface: 0
+    - _UseUIAlphaClip: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+  m_BuildTextureStacks: []
+--- !u!114 &4152682595501032597
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 4

Assets/Game/Materials/UI/UI_Inverted_mask 1.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8eab8d2e4505cdc36806a0be93c3d8e2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Game/Prefabs/Minigame/Player.prefab

@@ -72,7 +72,7 @@ TrailRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 1
-  m_Time: 2.5
+  m_Time: 0.5
   m_Parameters:
     serializedVersion: 3
     widthMultiplier: 1.5
@@ -355,8 +355,10 @@ MonoBehaviour:
   Scores: 0
   Kills: 0
   trailTime: 0
+  minTrailTime: 0.5
+  maxTrailTime: 5
   moonsCollected: 0
-  trailIncrementRate: 0.25
+  trailIncrementRate: 0.2
   dead: 0
   speed: 0
   _scaleMultiplier: 0.05

Assets/Game/Prefabs/Skins/SkinShopItem.prefab

@@ -1,5 +1,80 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2239248840644030921
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3605897088970061269}
+  - component: {fileID: 2917325939017843715}
+  - component: {fileID: 5052494186722842618}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3605897088970061269
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2239248840644030921}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2267201087308618751}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 147, y: -0.000011444}
+  m_SizeDelta: {x: 68.602, y: 71.601}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2917325939017843715
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2239248840644030921}
+  m_CullTransparentMesh: 1
+--- !u!114 &5052494186722842618
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2239248840644030921}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 879b65f7be8a74453a53e4d7f6a87e64, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &2267201085646891677
 GameObject:
   m_ObjectHideFlags: 0
@@ -435,7 +510,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Normal
+  m_text: Common
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2}
   m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2}
@@ -532,9 +607,10 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 3605897088970061269}
   m_Father: {fileID: 7828166040598954425}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -638,6 +714,124 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &6799651736204221948
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9123963870415919566}
+  - component: {fileID: 2950009384983416056}
+  - component: {fileID: 7796254324390053281}
+  - component: {fileID: 4885356713903174657}
+  - component: {fileID: 5762281462607907431}
+  m_Layer: 5
+  m_Name: Rate_def
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9123963870415919566
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6799651736204221948}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 128232600264143795}
+  m_Father: {fileID: 7828166040598954425}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 72.4, y: -66.04001}
+  m_SizeDelta: {x: 0, y: 60}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2950009384983416056
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6799651736204221948}
+  m_CullTransparentMesh: 0
+--- !u!114 &7796254324390053281
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6799651736204221948}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 2b7a689e4a87890938a9f1c010b285be, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &4885356713903174657
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6799651736204221948}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 28
+    m_Right: 30
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 1
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &5762281462607907431
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6799651736204221948}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &7828166039557632735
 GameObject:
   m_ObjectHideFlags: 0
@@ -668,7 +862,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 7828166040598954425}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -703,7 +897,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 4684224760558976125, guid: 4de40472c684c464db6425c3f8b4cb86, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 56681134adc79482a89c82b4f7895c93, type: 3}
   m_Type: 0
   m_PreserveAspect: 1
   m_FillCenter: 1
@@ -743,7 +937,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 7828166040598954425}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1067,13 +1261,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7828166040598954430}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 7828166040415516018}
   - {fileID: 2267201086751097330}
   - {fileID: 2267201086408934813}
+  - {fileID: 9123963870415919566}
   - {fileID: 7828166039557632734}
   - {fileID: 7828166039567903425}
   - {fileID: 7828166041015103882}
@@ -1194,10 +1389,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   spaceshipImg: {fileID: 7828166039557632729}
   banners:
+  - {fileID: 6799651736204221948}
   - {fileID: 2267201086408934812}
   - {fileID: 7828166040415516019}
   - {fileID: 2267201086751097329}
   frame: {fileID: 7828166041015103893}
+  Available: 0
   notPurchasedIndicator: {fileID: 2267201087308618750}
   skinData:
     name: 
@@ -1234,7 +1431,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 7828166040598954425}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -1279,3 +1476,137 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &8921009772826827995
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 128232600264143795}
+  - component: {fileID: 5683207330131760304}
+  - component: {fileID: 903659058104457449}
+  m_Layer: 5
+  m_Name: Text_Rate
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &128232600264143795
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921009772826827995}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 9123963870415919566}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 44.74713}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5683207330131760304
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921009772826827995}
+  m_CullTransparentMesh: 0
+--- !u!114 &903659058104457449
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921009772826827995}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: Basic
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2}
+  m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 32.8
+  m_fontSizeBase: 32.8
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 1
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}

Assets/Game/SFX/typewriter.meta

@@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: a74ca5aa1c88e784f8caa5f8fb3cb6c2
+guid: 3fa9c40bb8d59e310906523cdb280c36
+folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Game/SFX/typewriter/1.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 4371f87bb4103dee1abdc1605346ea16
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Game/SFX/typewriter/2.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 389e75eab5c78f8d6b17dd83455304a2
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Game/SFX/typewriter/3.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: e6ada4b38f36b402686f8c3fe379908d
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Game/SFX/typewriter/4.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: bffbdf5bf1e52dec58dfa1a7f952e3ee
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Game/Scenes/GameScene/Login.unity

@@ -342,6 +342,7 @@ RectTransform:
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
   - {fileID: 558232702}
+  - {fileID: 1641368355}
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1629,6 +1630,95 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!1 &1025848907
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1025848908}
+  - component: {fileID: 1025848911}
+  - component: {fileID: 1025848910}
+  - component: {fileID: 1025848909}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1025848908
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1025848907}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1841238504}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 3.12}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1025848909
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1025848907}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d15ae079e941bca4c90d983a184abc2b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  rotationVector: {x: 0, y: 0, z: 1}
+--- !u!114 &1025848910
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1025848907}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 3c211ed28a1254ad5be923faa2874f0e, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1025848911
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1025848907}
+  m_CullTransparentMesh: 1
 --- !u!1 &1055066934
 GameObject:
   m_ObjectHideFlags: 0
@@ -1829,6 +1919,140 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1088007779
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1088007780}
+  - component: {fileID: 1088007782}
+  - component: {fileID: 1088007781}
+  m_Layer: 5
+  m_Name: Text_Title (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1088007780
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1088007779}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1841238504}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 1828.9209, y: 85.44299}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1088007781
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1088007779}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: Loading...
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 605433b68313d491a8ab88bc03a41651, type: 2}
+  m_sharedMaterial: {fileID: 2830636965969884548, guid: 605433b68313d491a8ab88bc03a41651, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: 93368250
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 92.3
+  m_fontSizeBase: 92.3
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 1
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &1088007782
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1088007779}
+  m_CullTransparentMesh: 0
 --- !u!1 &1111181344
 GameObject:
   m_ObjectHideFlags: 0
@@ -1995,6 +2219,11 @@ MonoBehaviour:
   pickupCollected: {fileID: 8300000, guid: 9c2cdbe2f23c30fb482440c47e3453c6, type: 3}
   minigameVictory: {fileID: 8300000, guid: bfdbb0af4bda419d5aad27742b893bd7, type: 3}
   minigameFailed: {fileID: 8300000, guid: 22f6e5cad3bd5ed07acaf936801f375a, type: 3}
+  typewriters:
+  - {fileID: 8300000, guid: 4371f87bb4103dee1abdc1605346ea16, type: 3}
+  - {fileID: 8300000, guid: 389e75eab5c78f8d6b17dd83455304a2, type: 3}
+  - {fileID: 8300000, guid: e6ada4b38f36b402686f8c3fe379908d, type: 3}
+  - {fileID: 8300000, guid: bffbdf5bf1e52dec58dfa1a7f952e3ee, type: 3}
 --- !u!82 &1120262859
 AudioSource:
   m_ObjectHideFlags: 0
@@ -2413,6 +2642,7 @@ MonoBehaviour:
   reg_password: {fileID: 1414273971}
   regBtn: {fileID: 192624791}
   defaultBuilding: {fileID: 11400000, guid: b8064a67361de4c648b86f3642bb0317, type: 2}
+  loadingScreen: {fileID: 1641368354}
 --- !u!4 &1341947405
 Transform:
   m_ObjectHideFlags: 0
@@ -2524,6 +2754,82 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &1641368354
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1641368355}
+  - component: {fileID: 1641368357}
+  - component: {fileID: 1641368356}
+  m_Layer: 5
+  m_Name: LoadingScreen
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1641368355
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1641368354}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 1841238504}
+  m_Father: {fileID: 141437357}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1641368356
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1641368354}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.7294118}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1641368357
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1641368354}
+  m_CullTransparentMesh: 1
 --- !u!1 &1652306570
 GameObject:
   m_ObjectHideFlags: 0
@@ -2836,6 +3142,83 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 1122908926327601336, guid: f1c38827cf8d35ea8bb29a9d8d0ec0a8, type: 3}
   m_PrefabInstance: {fileID: 1823654559}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1841238503
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1841238504}
+  - component: {fileID: 1841238506}
+  - component: {fileID: 1841238505}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1841238504
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1841238503}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 1088007780}
+  - {fileID: 1025848908}
+  m_Father: {fileID: 1641368355}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 250, y: 260}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1841238505
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1841238503}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 742f52afe0a104f478d877db51a3321a, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1841238506
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1841238503}
+  m_CullTransparentMesh: 1
 --- !u!1 &2054554446
 GameObject:
   m_ObjectHideFlags: 0
@@ -6701,8 +7084,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 560.156, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 101.33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7675510707330291337
 GameObject:
@@ -6827,7 +7210,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7675510707330291337}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 

Assets/Game/Scenes/Minigame/Minigame.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+  m_IndirectSpecularColor: {r: 0.4465791, g: 0.4964133, b: 0.57481784, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -5597,6 +5597,95 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 139961634}
   m_CullTransparentMesh: 0
+--- !u!1 &277495303
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 277495304}
+  - component: {fileID: 277495307}
+  - component: {fileID: 277495306}
+  - component: {fileID: 277495305}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &277495304
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 277495303}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1714293962}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 8}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &277495305
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 277495303}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d15ae079e941bca4c90d983a184abc2b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  rotationVector: {x: 0, y: 0, z: 1}
+--- !u!114 &277495306
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 277495303}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 3c211ed28a1254ad5be923faa2874f0e, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &277495307
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 277495303}
+  m_CullTransparentMesh: 1
 --- !u!1 &290750407
 GameObject:
   m_ObjectHideFlags: 0
@@ -9860,6 +9949,158 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1689565360}
   m_CullTransparentMesh: 1
+--- !u!1 &1693293650
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1693293651}
+  - component: {fileID: 1693293653}
+  - component: {fileID: 1693293652}
+  m_Layer: 5
+  m_Name: Loading
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1693293651
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1693293650}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 1714293962}
+  m_Father: {fileID: 2181381953112870393}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1693293652
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1693293650}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.5803922}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1693293653
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1693293650}
+  m_CullTransparentMesh: 1
+--- !u!1 &1714293961
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1714293962}
+  - component: {fileID: 1714293964}
+  - component: {fileID: 1714293963}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1714293962
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1714293961}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 277495304}
+  m_Father: {fileID: 1693293651}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 250, y: 260}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1714293963
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1714293961}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 742f52afe0a104f478d877db51a3321a, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1714293964
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1714293961}
+  m_CullTransparentMesh: 1
 --- !u!1 &1837953383
 GameObject:
   m_ObjectHideFlags: 0
@@ -11216,6 +11457,7 @@ RectTransform:
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
   - {fileID: 5001849302241710808}
+  - {fileID: 1693293651}
   m_Father: {fileID: 0}
   m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -11550,6 +11792,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 1693293650}
+        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+        m_MethodName: SetActive
+        m_Mode: 6
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 1
+        m_CallState: 2
 --- !u!1 &5001849302241710807
 GameObject:
   m_ObjectHideFlags: 0
@@ -41599,7 +41853,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 1, y: 0.43300003}
-  m_AnchoredPosition: {x: 0, y: -24.789062}
+  m_AnchoredPosition: {x: 0, y: -24.789001}
   m_SizeDelta: {x: 0, y: -49.575012}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5001849302973059566
@@ -57159,7 +57413,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0.5, y: 0.43300003}
-  m_AnchoredPosition: {x: 0, y: -24.789062}
+  m_AnchoredPosition: {x: 0, y: -24.789001}
   m_SizeDelta: {x: 0, y: -49.575012}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5001849303916639358

Assets/Game/Scenes/Minigame/MinigameRanked.unity

@@ -17064,7 +17064,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 1, y: 0.43300003}
-  m_AnchoredPosition: {x: 0, y: -24.789062}
+  m_AnchoredPosition: {x: 0, y: -24.789124}
   m_SizeDelta: {x: 0, y: -49.575012}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &751258194
@@ -17239,6 +17239,82 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 789429593}
   m_CullTransparentMesh: 0
+--- !u!1 &795309080
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 795309081}
+  - component: {fileID: 795309083}
+  - component: {fileID: 795309082}
+  m_Layer: 5
+  m_Name: Loading
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &795309081
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 795309080}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 1683322045}
+  m_Father: {fileID: 2181381953112870393}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &795309082
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 795309080}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.49803922}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &795309083
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 795309080}
+  m_CullTransparentMesh: 1
 --- !u!1 &799128814
 GameObject:
   m_ObjectHideFlags: 0
@@ -22367,6 +22443,95 @@ ParticleSystem:
         m_PostInfinity: 2
         m_RotationOrder: 4
     vectorLabel1_3: W
+--- !u!1 &836639131
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 836639132}
+  - component: {fileID: 836639135}
+  - component: {fileID: 836639134}
+  - component: {fileID: 836639133}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &836639132
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 836639131}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1683322045}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 8}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &836639133
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 836639131}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d15ae079e941bca4c90d983a184abc2b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  rotationVector: {x: 0, y: 0, z: 1}
+--- !u!114 &836639134
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 836639131}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 3c211ed28a1254ad5be923faa2874f0e, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &836639135
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 836639131}
+  m_CullTransparentMesh: 1
 --- !u!1 &842262928
 GameObject:
   m_ObjectHideFlags: 0
@@ -39672,6 +39837,82 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1671734754}
   m_CullTransparentMesh: 0
+--- !u!1 &1683322044
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1683322045}
+  - component: {fileID: 1683322047}
+  - component: {fileID: 1683322046}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1683322045
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1683322044}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 836639132}
+  m_Father: {fileID: 795309081}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 250, y: 260}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1683322046
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1683322044}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 742f52afe0a104f478d877db51a3321a, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1683322047
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1683322044}
+  m_CullTransparentMesh: 1
 --- !u!1 &1689565360
 GameObject:
   m_ObjectHideFlags: 0
@@ -40335,7 +40576,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0.5, y: 0.43300003}
-  m_AnchoredPosition: {x: 0, y: -24.789062}
+  m_AnchoredPosition: {x: 0, y: -24.789124}
   m_SizeDelta: {x: 0, y: -49.575012}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1948563773
@@ -50962,6 +51203,7 @@ RectTransform:
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
   - {fileID: 5001849302241710808}
+  - {fileID: 795309081}
   m_Father: {fileID: 0}
   m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -51311,6 +51553,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 795309080}
+        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+        m_MethodName: SetActive
+        m_Mode: 6
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 1
+        m_CallState: 2
 --- !u!1 &5001849302241710807
 GameObject:
   m_ObjectHideFlags: 0

Assets/Game/Scripts/AudioManager.cs

@@ -21,6 +21,7 @@ public class AudioManager : MonoBehaviour
     [SerializeField]private AudioClip pickupCollected;
     [SerializeField]private AudioClip minigameVictory;
     [SerializeField]private AudioClip minigameFailed;
+    [SerializeField]private AudioClip[] typewriters;
 
 
 
@@ -109,4 +110,8 @@ public class AudioManager : MonoBehaviour
     public void MinigameLost(){
         audioSrc.PlayOneShot(minigameFailed);
     }
+
+    public void TypeWriter(){
+        audioSrc.PlayOneShot(typewriters[Random.Range(0, typewriters.Length)],0.7f);
+    }
 }

Assets/Game/Scripts/Building.cs

@@ -63,7 +63,10 @@ public class Building : MonoBehaviour
                 case 1: Debug.Log("2 Stars"); break;
             }
 
-
+        if(DBmanager.Coins < cost){
+            MessageDialog.instance.ShowMessage("Failed", "Insufficient Resources to complete the transaction");
+            return;
+        }
         DBmanager.SetCoins(DBmanager.Coins-cost);
         if(newLevel <0){
             curLevel = Mathf.Clamp(curLevel+1,0, buildingData.levels.Count-1);

Assets/Game/Scripts/ChestOpener.cs

@@ -75,12 +75,7 @@ public class ChestOpener : MonoBehaviour
 
         if(selectedSkin!=null){
             skinDrop.transform.GetChild(1).GetComponent<Image>().sprite = selectedSkin.image;
-            Color bgColor = new Color(0,1,0);
-            if(rareSkins.Contains(selectedSkin)){
-                bgColor = new Color(0,1,1);
-            }else if(legendarySkins.Contains(selectedSkin)){
-                bgColor = new Color(1,0,0);
-            }
+            Color bgColor = SkinShopManager.getRarityColor(selectedSkin);
 
             skinBgParticle.startColor = new Color(bgColor.r,bgColor.g,bgColor.b, skinBgParticle.startColor.a);
         }

Assets/Game/Scripts/CollectBtn.cs

@@ -35,7 +35,7 @@ public class CollectBtn : MonoBehaviour
         resourceType = _resourceType;
     }
 
-    async void OnClick(){
+    public async void OnClick(){
         collectableAmount= GetCollectableGold();
         lastCollected = await DBmanager.GetNetworkTime();
         switch (resourceType){

Assets/Game/Scripts/CutoutMaskUI.cs

@@ -0,0 +1,16 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+using UnityEngine.Rendering;
+
+public class CutoutMaskUI : Image
+{
+    public override Material materialForRendering{
+        get{
+            Material material = new Material(base.materialForRendering);
+            material.SetInt("_StencilComp", (int)CompareFunction.NotEqual);
+            return material;
+        }
+    }
+}

Assets/Game/Scripts/CutoutMaskUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 448373c5b90f871059fe30b040c7c888
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Game/Scripts/DBmanager.cs

@@ -545,7 +545,7 @@ public class DBmanager : MonoBehaviour
         }
         SetMetal(metal-data.price);
         AddSkin(data);
-        AudioManager.instnace.Spend();
+        AudioManager.instnace.ChestOpen();
     }
 
     public static void AddSkin(SkinShopItemData data){        

Assets/Game/Scripts/GoldMine.cs

@@ -4,32 +4,57 @@ using UnityEngine;
 
 public class GoldMine : MonoBehaviour
 {
-    static int LevelsCount = 40;
-    void Start()
-    {
-        for(int i=0; i < LevelsCount * LevelsCount; i++){
+    public static int LevelsCount => levelsCount;
+    static int levelsCount = 40;
+    public Sprite statIcon;
+    static int ProductionMultiplier=50;
+    static int CapacityMultiplier=1000;
+    static int gold_prod_upgrade_cost = 3000;
+    static int gold_cap_upgrade_cost = 2500;
+    void Awake()
+    {   BuildingData data =GetComponent<Building>().buildingData;
+        data.levels = new List<BuildingLevel>();
+        data.productinoRates = new float[levelsCount*levelsCount];
+        for(int i=0; i < levelsCount * levelsCount; i++){
             int l = i+1;
             int p = GetProductionRateByLevel(l);
             int c = GetCapacityRateByLevel(l);
             int L = GetLevelByRates(c,p);
-            Debug.Log($"Level:{l},{L} ,Prod:{p}, Capactiy:{c}");
-        }
+            List<BuildingStat> stats = new List<BuildingStat>();
+            stats.Add(new BuildingStat("Gold per hour", (p * ProductionMultiplier).ToString(),statIcon));
+            stats.Add(new BuildingStat("Capacity", (c * CapacityMultiplier).ToString(),statIcon));
+            data.levels.Add(new BuildingLevel(l,stats,l*3000));
+            data.levels[i].xpGain = (i > 0) ? 150 : 0;
+            data.productinoRates[i] = p * ProductionMultiplier;
+
+            // Debug.Log($"Level:{l},{L} ,Prod:{p}, Capactiy:{c}");
+        }       
+
     }
     //Note for future me: Refer to the sketch you draw on laptop to understand below equations
     public static int GetProductionRateByLevel(int level){
         //P = L - C - (2l-3)
-        int l = Mathf.CeilToInt((float)level/(float)LevelsCount);
+        int l = Mathf.CeilToInt((float)level/(float)levelsCount);
         return l;
     }
 
     public static int GetCapacityRateByLevel(int level){
         //C = L -3(l - 1)
-        int l = Mathf.CeilToInt((float)level/(float)LevelsCount);
-        return level - LevelsCount * (l - 1);
+        int l = Mathf.CeilToInt((float)level/(float)levelsCount);
+        return level - levelsCount * (l - 1);
     }
 
     public static int GetLevelByRates(int Capacity, int Production){
         //L = 3P + C -3
-        return (LevelsCount*Production) + Capacity - LevelsCount;
+        return (levelsCount*Production) + Capacity - levelsCount;
+    }
+
+    public static int GetCostForProduction(int level){
+        int Level = GetProductionRateByLevel(level);
+        return Level*gold_prod_upgrade_cost;
+    }
+    public static int GetCostForCapacity(int level){
+        int Level = GetCapacityRateByLevel(level);
+        return Level*gold_cap_upgrade_cost;
     }
 }

Assets/Game/Scripts/LoginManager.cs

@@ -16,6 +16,7 @@ public class LoginManager : MonoBehaviour
 
     // public OtherUIbuttons otherUI;
     public BuildingData defaultBuilding;
+    public GameObject loadingScreen;
 
     void Start()
     {
@@ -66,6 +67,7 @@ public class LoginManager : MonoBehaviour
     IEnumerator LoginPlayer()
     {
         loginBtn.interactable=false;
+        loadingScreen.SetActive(true);
         WWWForm form = new WWWForm();
         form.AddField("name", login_username.text);
         form.AddField("password", login_password.text);
@@ -102,18 +104,24 @@ public class LoginManager : MonoBehaviour
             Debug.Log("XP : " + DBmanager.Xp);
 
             UnityEngine.SceneManagement.SceneManager.LoadScene("GameScene");
+
         }
         else
         {
             Debug.Log("User Login failed. Error #" + www.text);
             MessageDialog.instance.ShowMessage("Error!", "Sorry, We couldn't log you in,\n Error: " + www.text);
+        loadingScreen.SetActive(false);
+
         }
         loginBtn.interactable=true;
+
     }
 
     IEnumerator Register()
     {
         regBtn.interactable = false;
+        loadingScreen.SetActive(true);
+
         WWWForm form = new WWWForm();
         form.AddField("name", reg_username.text);
         form.AddField("password", reg_password.text);
@@ -128,14 +136,22 @@ public class LoginManager : MonoBehaviour
             PlayerPrefs.Save();
             DBmanager.username = reg_username.text;
             DBmanager.AddBuilding(defaultBuilding);
-            UnityEngine.SceneManagement.SceneManager.LoadScene("GameScene");
+            // UnityEngine.SceneManagement.SceneManager.LoadScene("GameScene");
+            login_username.text = reg_username.text;
+            login_password.text = reg_password.text;
+            TutorialManager.justRegistered =true;
+            StartCoroutine(LoginPlayer());
+            // loadingScreen.SetActive(false);
+
         }
         else
         {
             Debug.Log("User creation failed " + www.text);
             MessageDialog.instance.ShowMessage("Error!", "Sorry, We couldn't Register you,\n Error: " + www.text);
+            loadingScreen.SetActive(false);
 
         }
         regBtn.interactable=true;
+
     }
 }

Assets/Game/Scripts/MaintainceChecker.cs

@@ -6,7 +6,7 @@ using UnityEngine.SceneManagement;
 
 public class MaintainceChecker : MonoBehaviour
 {
-    public static int version = 2;
+    public static int version = 8;
     public static MaintainceChecker instance;
     public int checkInterval = 10;
     float t;

Assets/Game/Scripts/Minigame/SkinShopItem.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
 public class SkinShopItem : MonoBehaviour
@@ -8,19 +9,27 @@ public class SkinShopItem : MonoBehaviour
     [Tooltip("In order of: normal, rare, legendary. 3 items required")]
     public GameObject[] banners;
     public Image frame;
+    public bool Available;
     public GameObject notPurchasedIndicator;
     public SkinShopItemData skinData;
 
-    public void Set(SkinShopItemData data){
+    public void Set(SkinShopItemData data, bool available){
         skinData = data;
             // newItem.backgroundImg.color = (skinsData.skins[i].skinType==SkinType.Base) ? basicColor : (skinsData.skins[i].skinType==SkinType.Rare ? rareColor : legendaryColor);
-        spaceshipImg.sprite = data.image;
-
+        if(available){spaceshipImg.sprite = data.image;}
+        spaceshipImg.color = available ? Color.white : Color.black;
+        Available = available;
         UpdateFrame();
 
-        banners[0].SetActive(data.skinType== SkinType.Base);
-        banners[1].SetActive(data.skinType== SkinType.Rare);
-        banners[2].SetActive(data.skinType== SkinType.Legendary);
+        if(data.price <=0){
+            banners[0].SetActive(true);
+            banners[1].SetActive(false);
+        }else{
+            banners[0].SetActive(false);
+            banners[1].SetActive(data.skinType== SkinType.Base);
+        }
+        banners[2].SetActive(data.skinType== SkinType.Rare);
+        banners[3].SetActive(data.skinType== SkinType.Legendary);
 
         
     }
@@ -36,13 +45,17 @@ public class SkinShopItem : MonoBehaviour
         if(!DBmanager.SkinsPurchased.Contains(skinData.name)){
             frame.color = Color.red;
             notPurchasedIndicator.SetActive(true);
+            notPurchasedIndicator.GetComponentInChildren<TMP_Text>().text = skinData.price.ToString();
         }else{
             notPurchasedIndicator.SetActive(false);
         }
+        if(!Available){
+            notPurchasedIndicator.SetActive(false);
+        }
     }
 
     public void OnClick(){
-        SkinShopManager.instance.SelectItem(skinData);
+        SkinShopManager.instance.SelectItem(skinData,Available);
     }
     public void OnSelectionChanged(string selectedItem){
         if(selectedItem == skinData.name){

Assets/Game/Scripts/Minigame/SkinShopManager.cs

@@ -8,6 +8,8 @@ using UnityEngine.UI;
 public class SkinShopManager : MonoBehaviour
 {
     public static SkinShopManager instance;
+    public static bool availableToUpgrade;
+    public NewSkinDisplay newSkinDisplay;
     public Building skinShopBuilding;
     public SkinsData skinsData;
     public GameObject popup;
@@ -17,6 +19,8 @@ public class SkinShopManager : MonoBehaviour
     public Button btn_Equip;
     public Button btn_Buy;
     public static SkinShopItemData selectedSkin;
+    public int[] prices;
+    public static int[] Prices => instance.prices;
     List<SkinShopItem> skinShopItems=new List<SkinShopItem>();
     
     void Awake() {
@@ -34,8 +38,11 @@ public class SkinShopManager : MonoBehaviour
         Populate();
         popup.SetActive(true);
     }
-
+    List<SkinShopItemData> skinsAvailableToPurchase=  new List<SkinShopItemData>();
     public void Populate(){
+        int purchasedFlagships=0;
+        int flagshipsCount=0;
+
         //Validate skins list
         if(DBmanager.SkinsPurchased.Count <=0){
             foreach(SkinShopItemData skin in skinsData.skins){
@@ -52,25 +59,57 @@ public class SkinShopManager : MonoBehaviour
         for(int i=0;i < listItemsParent.childCount;i++){
             Destroy(listItemsParent.GetChild(i).gameObject);
         }
+        skinsAvailableToPurchase = new List<SkinShopItemData>();
         skinShopItems = new List<SkinShopItem>();
         for(int i=0; i<skinsData.skins.Length;i++){
-            int rarity = 0;
-            if(skinsData.skins[i].skinType == SkinType.Rare){rarity=1;}
-            if(skinsData.skins[i].skinType == SkinType.Legendary){rarity=2;}
+            int rarity = getRarityInt(skinsData.skins[i]);
+            bool isAvailable = skinShopBuilding.curLevel >= rarity;
+            if(!isAvailable){continue;}
 
-            if(skinShopBuilding.curLevel < rarity){
-                continue;
+            bool isOwned = DBmanager.SkinsPurchased.Contains(skinsData.skins[i].name);
+
+            
+            if(skinShopBuilding.curLevel == rarity){
+                flagshipsCount++;
+                if(isOwned){
+                    purchasedFlagships++;
+                }
             }
-            SkinShopItem newItem = Instantiate(listItemPrefab, listItemsParent).GetComponent<SkinShopItem>();
-            newItem.Set(skinsData.skins[i]);
-            skinShopItems.Add(newItem);
+
+            if(!isOwned){
+                skinsAvailableToPurchase.Add(skinsData.skins[i]);
+            }else{
+                SkinShopItem newItem = Instantiate(listItemPrefab, listItemsParent).GetComponent<SkinShopItem>();
+                
+                newItem.Set(skinsData.skins[i],isOwned);
+                skinShopItems.Add(newItem);
+            }
+
+            
             // newItem.backgroundImg.color = (skinsData.skins[i].skinType==SkinType.Base) ? basicColor : (skinsData.skins[i].skinType==SkinType.Rare ? rareColor : legendaryColor);
         }
+        Debug.Log("Question ships: " +skinsAvailableToPurchase.Count);
+        foreach(SkinShopItemData skin in skinsAvailableToPurchase){
+            int rarity = getRarityInt(skin);
+            SkinShopItem newItem = Instantiate(listItemPrefab, listItemsParent).GetComponent<SkinShopItem>();
+            newItem.Set(skin,false);
+            skinShopItems.Add(newItem);
+        }
 
-        SelectItem(selectedSkin);
+        availableToUpgrade = purchasedFlagships >= ((float)flagshipsCount/2f);
+
+        SelectItem(selectedSkin,true);
     }
 
-    public void SelectItem(SkinShopItemData data){
+    int getRarityInt(SkinShopItemData skin){
+        int rarity = 0;
+        if(skin.skinType == SkinType.Rare){rarity=1;}
+        if(skin.skinType == SkinType.Legendary){rarity=2;}
+
+        return rarity;
+    }
+
+    public void SelectItem(SkinShopItemData data, bool Available){
         selectedSkin = data;
         if(data==null){
             btn_Equip.gameObject.SetActive(false); btn_Buy.gameObject.SetActive(false);
@@ -99,10 +138,24 @@ public class SkinShopManager : MonoBehaviour
         Populate();
     }
 
-    void onBuy(){
-        DBmanager.PurchaseSkin(selectedSkin);
+    public void EquipSkin(SkinShopItemData skin){
+        EquipSkin(skin.name);
+        Populate();
+    }
 
+    void onBuy(){
+        List<SkinShopItemData> skinsInSameRarity = new List<SkinShopItemData>();
+        foreach(SkinShopItemData skin in skinsAvailableToPurchase){
+            if(skin.skinType == selectedSkin.skinType){
+                skinsInSameRarity.Add(skin);
+            }
+        }
+
+        SkinShopItemData randomSkin = skinsInSameRarity[UnityEngine.Random.Range(0,skinsInSameRarity.Count)];
+
+        DBmanager.PurchaseSkin(randomSkin);
         SkinShopManager.instance.Populate();
+        newSkinDisplay.Show(randomSkin);
     }
 
     public static void EquipSkin(string skin){
@@ -117,6 +170,17 @@ public class SkinShopManager : MonoBehaviour
 
         return "Default";
     }
+
+    public static Color getRarityColor(SkinShopItemData skin){
+        Color color = new Color(0,1,0);
+        if(skin.skinType == SkinType.Rare){
+            color = new Color(0,1,1);
+        }else if(skin.skinType == SkinType.Legendary){
+            color = new Color(1,0,0);
+        }
+
+        return color;
+    }
 }
 
 [Serializable]

Assets/Game/Scripts/Minigame/SpaceshipController.cs

@@ -21,6 +21,8 @@ public class SpaceshipController : NetworkBehaviour
     public int Kills;
     [SyncVar(hook = nameof(OnTrailTimeChanged))]
     public float trailTime;
+    public float minTrailTime;
+    public float maxTrailTime;
     [SyncVar]
     public int moonsCollected;
     public float trailIncrementRate = 0.5f;
@@ -102,8 +104,9 @@ public class SpaceshipController : NetworkBehaviour
         trailMgr.trail.time = newValue;
         if (isLocalPlayer)
         {
-            SceneData.holder.boostBtn.gameObject.SetActive(scale > 1);
-            if(scale <=1 && boosting){
+            bool isBoostAvailable= trailTime > minTrailTime;
+            SceneData.holder.boostBtn.gameObject.SetActive(isBoostAvailable);
+            if(!isBoostAvailable&& boosting){
                 CmdSetBoosting(false);
             }
         }
@@ -195,6 +198,8 @@ public class SpaceshipController : NetworkBehaviour
         if (isServer)
         {
             startedTime = NetworkTime.time;
+            trailTime =0;
+            DecreaseTrail(0);
         }
     }
 
@@ -546,14 +551,14 @@ public class SpaceshipController : NetworkBehaviour
 
     void IncreaseTrail(float rate)
     {
-        trailTime = trailMgr.trail.time + rate;
+        trailTime = Mathf.Clamp(trailMgr.trail.time + rate,minTrailTime,maxTrailTime);
         trailMgr.trail.time = trailTime;
         // Debug.Log("Increasing trail of" + pname);
     }
 
     public void DecreaseTrail(float rate)
     {
-        trailTime = Mathf.Clamp(trailMgr.trail.time - rate,0,float.MaxValue);
+        trailTime = Mathf.Clamp(trailMgr.trail.time - rate,minTrailTime,maxTrailTime);        
         trailMgr.trail.time = trailTime;
         // Debug.Log("Decreasing trail of" + pname);
     }
@@ -608,7 +613,7 @@ public class SpaceshipController : NetworkBehaviour
         Scores = 0;
         Kills = 0;
         startedTime = NetworkTime.time;
-        trailTime = 1;
+        DecreaseTrail(trailTime);
         trailMgr.trail.time = trailTime;
         RpcDie(killer);
         gameObject.SetActive(false);

Assets/Game/Scripts/NewSkinDisplay.cs

@@ -0,0 +1,28 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class NewSkinDisplay : MonoBehaviour
+{
+    public ParticleSystem glowParticle;
+    public Image rocketImg;
+    SkinShopItemData newSkin;
+
+    public void Show(SkinShopItemData skin){
+        newSkin =skin;
+        gameObject.SetActive(true);
+        glowParticle.startColor = SkinShopManager.getRarityColor(skin);
+        rocketImg.sprite = newSkin.image;
+    }
+
+    public void Cancel(){
+        gameObject.SetActive(false);
+        AudioManager.instnace.UIClick();
+    }
+
+    public void Equip(){
+        SkinShopManager.instance.EquipSkin(newSkin);
+        gameObject.SetActive(false);
+    }
+}

Assets/Game/Scripts/NewSkinDisplay.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 92aec48cae38c57cb85cb0f6b38edc43
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Game/Scripts/RocketHanger.cs

@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class RocketHanger : MonoBehaviour
+{
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Assets/Game/Scripts/RocketHanger.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: eae943e5c73af568eba479f83225c1a0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Game/Scripts/SelectedItemMenu.cs

@@ -26,6 +26,7 @@ public class SelectedItemMenu : MonoBehaviour
     public Transform upgrade_statParent;
     public GameObject[] upgrade_tierIndicators;
     public TMP_Text upgrade_buildingName;
+    public TMP_Text extraDetailsTxt;
     public Button upgradeBtn;
 
     [Header("Special buildings")]
@@ -84,9 +85,9 @@ public class SelectedItemMenu : MonoBehaviour
         infoMenu.SetActive(false);
     }
 
-    void OnUpgradeMenuClicked()
+    public void OnUpgradeMenuClicked()
     {
-
+        extraDetailsTxt.gameObject.SetActive(false);
         // Debug.Log("Opening Upgrade Menu for : " + Selector.selectedBuilding.buildingData.name);
         AudioManager.instnace.UIPopup();
 
@@ -126,8 +127,7 @@ public class SelectedItemMenu : MonoBehaviour
         if (Selector.selectedBuilding.curLevel < Selector.selectedData.levels.Count - 1)
         {
             upgradeBtn.interactable = (Selector.selectedData.levels[Selector.selectedBuilding.curLevel + 1].price < DBmanager.Coins);
-            upgradeBtn.GetComponentInChildren<TMP_Text>().text = Selector.selectedData.levels[Selector.selectedBuilding.curLevel + 1].price.ToString();
-            
+            upgradeBtn.GetComponentInChildren<TMP_Text>().text = Selector.selectedData.levels[Selector.selectedBuilding.curLevel + 1].price.ToString();    
         }
         else
         {
@@ -137,7 +137,16 @@ public class SelectedItemMenu : MonoBehaviour
             Debug.Log("Already max");
         }
 
-        
+        if(Selector.selectedData == rocketRepair){
+            SkinShopManager.instance.Populate();
+            upgradeBtn.interactable= (SkinShopManager.availableToUpgrade);
+            if(!SkinShopManager.availableToUpgrade && Selector.selectedBuilding.curLevel < Selector.selectedData.levels.Count-1){
+                // MessageDialog.instance.ShowMessage("Notice!","You have to purchase half of the best rarity skins available to upgrade");
+                extraDetailsTxt.gameObject.SetActive(true);
+                extraDetailsTxt.text = "You have to purchase half of the best rarity skins available to upgrade";
+                extraDetailsTxt.color = Color.red;
+            }
+        }
 
         if (upgrade_statParent.childCount < stats.Count)
         {
@@ -154,17 +163,23 @@ public class SelectedItemMenu : MonoBehaviour
             int C = GoldMine.GetCapacityRateByLevel(L);        
             int P = GoldMine.GetProductionRateByLevel(L);
             //Calculate prices
-            if(P>=3){
-                btn_gold_prod.interactable=false; btn_gold_prod.transform.Find("txt_price").GetComponent<TMP_Text>().text = "Max!";
+            if(P>=GoldMine.LevelsCount){
+                btn_gold_prod.interactable=false; 
+                btn_gold_prod.transform.Find("txt_price").GetComponent<TMP_Text>().text = "Max!";
             }
             else{
-                btn_gold_prod.interactable=true; btn_gold_prod.transform.Find("txt_price").GetComponent<TMP_Text>().text = (gold_prod_upgrade_cost * P).ToString();
+                bool affroadable = DBmanager.Coins >= GoldMine.GetCostForProduction(L);
+                btn_gold_prod.interactable=affroadable;
+                btn_gold_prod.transform.Find("txt_price").GetComponent<TMP_Text>().text = GoldMine.GetCostForProduction(L).ToString();
             }
-            if(C>=3){
-                btn_gold_cap.interactable=false; btn_gold_cap.transform.Find("txt_price").GetComponent<TMP_Text>().text = "Max!";
+            if(C>=GoldMine.LevelsCount){
+                btn_gold_cap.interactable = false;
+                btn_gold_cap.transform.Find("txt_price").GetComponent<TMP_Text>().text = "Max!";
             }
             else{
-                btn_gold_cap.interactable=true; btn_gold_cap.transform.Find("txt_price").GetComponent<TMP_Text>().text = (gold_cap_upgrade_cost * C).ToString();
+                bool affroadable = DBmanager.Coins >= GoldMine.GetCostForCapacity(L);
+                btn_gold_cap.interactable=affroadable; 
+                btn_gold_cap.transform.Find("txt_price").GetComponent<TMP_Text>().text = GoldMine.GetCostForCapacity(L).ToString();
 
             }
 
@@ -175,17 +190,16 @@ public class SelectedItemMenu : MonoBehaviour
         Selector.selectedBuilding.Upgrade();
         OnUpgradeMenuClicked();
     }
-    int gold_prod_upgrade_cost = 3000;
-    int gold_cap_upgrade_cost = 2500;
+    
     void OnGoldmineCapUpgrade(){
         int L = Selector.selectedBuilding.curLevel+1;
         int C = GoldMine.GetCapacityRateByLevel(L);
-        if(C >=3){return;}
+        if(C >=GoldMine.LevelsCount){return;}
         int P = GoldMine.GetProductionRateByLevel(L);
 
         int newLevel = GoldMine.GetLevelByRates(C + 1, P);
         upgradeBtn.interactable= false;
-        Selector.selectedBuilding.Upgrade(newLevel:newLevel-1, cost: C*gold_cap_upgrade_cost);
+        Selector.selectedBuilding.Upgrade(newLevel:newLevel-1, cost:GoldMine.GetCostForCapacity(L) );
         goldmineUpgradeMenu.SetActive(false);
         OnUpgradeMenuClicked();
     }
@@ -194,10 +208,10 @@ public class SelectedItemMenu : MonoBehaviour
         int L = Selector.selectedBuilding.curLevel+1;
         int C = GoldMine.GetCapacityRateByLevel(L);        
         int P = GoldMine.GetProductionRateByLevel(L);
-        if(P >=3){return;}
+        if(P >=GoldMine.LevelsCount){return;}
         int newLevel = GoldMine.GetLevelByRates(C, P+1);
         upgradeBtn.interactable= false;
-        Selector.selectedBuilding.Upgrade(newLevel:newLevel-1, cost: C*gold_prod_upgrade_cost);
+        Selector.selectedBuilding.Upgrade(newLevel:newLevel-1, cost: GoldMine.GetCostForProduction(L));
 
         goldmineUpgradeMenu.SetActive(false);
         OnUpgradeMenuClicked();

Assets/Game/Scripts/TutorialManager.cs

@@ -0,0 +1,44 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using UnityEngine;
+
+public class TutorialManager : MonoBehaviour
+{
+    public static bool justRegistered;
+    public static TutorialManager instance;
+    public TutorialScreen[] firstTutorial;
+    void Awake()
+    {
+        instance = this;
+    }
+
+    void Start(){
+        justRegistered= true; //for testing purpose
+        if(justRegistered){
+            StartSequence(firstTutorial);
+        }
+    }
+
+
+    async void StartSequence(TutorialScreen[] list){
+        foreach(TutorialScreen screen in list){
+            screen.Hide();
+        }
+        for(int i=0; i < list.Length; i++){
+            nextClicked = false;
+            await Task.Delay(list[i].delayBeforeAppear);
+            list[i].Show();
+
+            while(!nextClicked){
+                await Task.Delay(500);
+            }
+            list[i].Hide();
+        }
+    }
+    bool nextClicked= false;
+
+    public static void NextClicked(){
+        instance.nextClicked = true;
+    }
+}

Assets/Game/Scripts/TutorialManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a91d1290d1c1c780ab983d3d404aaa07
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Game/Scripts/TutorialScreen.cs

@@ -0,0 +1,65 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using TMPro;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class TutorialScreen : MonoBehaviour
+{
+    public Transform messageParent;
+    public Button btn_next;
+    public int delayBeforeAppear;
+    public bool hideNextButtonOnStart=true;
+
+    Dictionary<TMP_Text, string> messages;
+
+    void Awake(){
+        btn_next.onClick.AddListener(OnNextButton);
+    }
+
+    public void Show(){
+        gameObject.SetActive(true);
+        ShowTexts();
+    }
+
+    async void ShowTexts(){
+        if(hideNextButtonOnStart){btn_next.gameObject.SetActive(false);}
+        int typewriteDelay = 0;
+        if(messages == null){
+            messages = new Dictionary<TMP_Text, string>();
+            TMP_Text[] texts = messageParent.GetComponentsInChildren<TMP_Text>();
+            foreach(TMP_Text text in texts){
+                messages.Add(text, text.text);
+                text.text = "";
+            }
+        }
+            foreach(KeyValuePair<TMP_Text, string> message in messages){
+                message.Key.text="";
+                Debug.Log(message.Value);
+                for(int i=0; i < message.Value.Length; i++){
+                    message.Key.text+=message.Value.ToCharArray()[i];
+                    if(typewriteDelay< 4){
+                        typewriteDelay++;
+                    }else{
+                    AudioManager.instnace.TypeWriter();
+                    typewriteDelay=0;
+                    }
+                    await Task.Delay(20);
+                }
+                await Task.Delay(500);
+            }
+        
+
+        btn_next.gameObject.SetActive(true);
+    }
+
+    public void Hide(){
+        gameObject.SetActive(false);
+    }
+
+    public void OnNextButton(){
+        TutorialManager.NextClicked();
+        AudioManager.instnace.UIClick();
+    }
+}

Assets/Game/Scripts/TutorialScreen.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 56baa627e873d35a984a9c8cf18ef589
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Game/Scripts/WorldItemSelector.cs

@@ -51,6 +51,10 @@ public class WorldItemSelector : MonoBehaviour
         }
     }
 
+    public void SelectBuilding(Building building){
+        Selector.selectBuilding(building);
+    }
+
 
 
     private Vector2? startedPos= null;

Assets/Game/Scripts/XpPass.cs

@@ -5,7 +5,9 @@ using TMPro;
 using UnityEngine.UI;
 public class XpPass : MonoBehaviour
 {
+    public GameObject panel;
     public TMP_Text nextLevelTxt;
+    public GameObject newRewardsNotification;
     public float sliderWidthPerLevel = 450;
     public Slider levelSlider;
     [SerializeField]
@@ -22,16 +24,16 @@ public class XpPass : MonoBehaviour
     
     public void Show(){
         Refresh();
-        gameObject.SetActive(true);
+        panel.SetActive(true);
     }
 
     public void Hide(){
-        gameObject.SetActive(false);
+        panel.SetActive(false);
     }
 
     void Refresh(){
         nextLevelTxt.text = (DBmanager.LevelInt +1).ToString();
-
+        int rewardsLeftToCollect= 0;
         //Sort Rewards by Level
         XpPassReward temp;
         for (int j = 0; j <= rewards.Length - 2; j++) {
@@ -88,11 +90,18 @@ public class XpPass : MonoBehaviour
                 rewardCard.GetComponent<Button>().interactable=false;
                 rewardCard.transform.GetChild(3).gameObject.SetActive(true);
             }
+            if(rewardCard.GetComponent<Button>().interactable){
+                rewardsLeftToCollect++;
+            }
             rewardCard.GetComponent<Button>().onClick.AddListener(()=>OnRewardCollect(reward.level));
         }
         levelSlider.GetComponent<RectTransform>().sizeDelta = new Vector2(sliderWidthPerLevel * rewards.Length-2 ,levelSlider.GetComponent<RectTransform>().sizeDelta.y);
         rewardCardPrefab.SetActive(false); xpLevelPointPrefab.SetActive(false);
         levelSlider.value = DBmanager.Level / (float)rewards[rewards.Length-1].level;
+
+        //Set notification
+        newRewardsNotification.SetActive(rewardsLeftToCollect>0);
+        newRewardsNotification.GetComponentInChildren<TMP_Text>().text = rewardsLeftToCollect.ToString();
     }
 
     public void OnRewardCollect(int level){

Assets/Game/Sprites/Tutorial.meta

@@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: c4e3e3041d1151d48a662a0f0796672e
+guid: 0e75b697f1cffda3884da79aa2fcf4c3
+folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Game/Sprites/Tutorial/vQEkPRw.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: dcd7405eb09ee70feb1013a21ffc33f1
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  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: 0
+  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
+  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
+  - 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: Android
+    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: 

Assets/ProjectSettings/ProjectVersion.txt.meta

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

Assets/Resources/IAPProductCatalog.json

@@ -1 +1 @@
-{"appleSKU":"","appleTeamID":"","enableCodelessAutoInitialization":true,"enableUnityGamingServicesAutoInitialization":true,"products":[{"id":"com.TWEP.UPF.gems40","type":0,"storeIDs":[],"defaultDescription":{"googleLocale":4,"title":"40 Gems Pack","description":"Receive 40 Gems"},"screenshotPath":"","applePriceTier":2,"googlePrice":{"data":[199,0,0,131072],"num":1.99},"pricingTemplateID":"1.99","descriptions":[],"udpPrice":{"data":[0,0,0,0],"num":0.0},"payouts":[{"t":"Currency","st":"Gems","q":40.0,"d":""}]},{"id":"com.TWEP.UPF.gems220","type":0,"storeIDs":[],"defaultDescription":{"googleLocale":4,"title":"220 Gems Pack","description":""},"screenshotPath":"","applePriceTier":5,"googlePrice":{"data":[499,0,0,131072],"num":4.99},"pricingTemplateID":"4.99","descriptions":[],"udpPrice":{"data":[0,0,0,0],"num":0.0},"payouts":[{"t":"Currency","st":"Gems","q":220.0,"d":""}]},{"id":"com.TWEP.UPF.gems480","type":0,"storeIDs":[],"defaultDescription":{"googleLocale":4,"title":"480 Gems Pack","description":""},"screenshotPath":"","applePriceTier":12,"googlePrice":{"data":[1199,0,0,131072],"num":11.99},"pricingTemplateID":"11.99","descriptions":[],"udpPrice":{"data":[0,0,0,0],"num":0.0},"payouts":[{"t":"Currency","st":"Gems","q":480.0,"d":""}]},{"id":"com.TWEP.UPF.gems1200","type":0,"storeIDs":[],"defaultDescription":{"googleLocale":4,"title":"1200 Gems Pack","description":""},"screenshotPath":"","applePriceTier":25,"googlePrice":{"data":[2499,0,0,131072],"num":24.99},"pricingTemplateID":"24.99","descriptions":[],"udpPrice":{"data":[0,0,0,0],"num":0.0},"payouts":[{"t":"Currency","st":"Gems","q":1200.0,"d":""}]},{"id":"com.TWEP.UPF.gems2100","type":0,"storeIDs":[],"defaultDescription":{"googleLocale":4,"title":"2100 Gems Pack","description":""},"screenshotPath":"","applePriceTier":50,"googlePrice":{"data":[4999,0,0,131072],"num":49.99},"pricingTemplateID":"49.99","descriptions":[],"udpPrice":{"data":[0,0,0,0],"num":0.0},"payouts":[{"t":"Currency","st":"Gems","q":2100.0,"d":""}]}]}
+{"appleSKU":"","appleTeamID":"","enableCodelessAutoInitialization":true,"enableUnityGamingServicesAutoInitialization":true,"products":[{"id":"com.TWEP.UPF.gems12","type":0,"storeIDs":[],"defaultDescription":{"googleLocale":4,"title":"12 Gems Pack","description":"Receive 12 Gems"},"screenshotPath":"","applePriceTier":2,"googlePrice":{"data":[199,0,0,131072],"num":1.99},"pricingTemplateID":"1.99","descriptions":[],"udpPrice":{"data":[0,0,0,0],"num":0.0},"payouts":[{"t":"Currency","st":"Gems","q":40.0,"d":""}]},{"id":"com.TWEP.UPF.gems40","type":0,"storeIDs":[],"defaultDescription":{"googleLocale":4,"title":"40 Gems Pack","description":"Receive 40 Gems"},"screenshotPath":"","applePriceTier":5,"googlePrice":{"data":[499,0,0,131072],"num":4.99},"pricingTemplateID":"4.99","descriptions":[],"udpPrice":{"data":[0,0,0,0],"num":0.0},"payouts":[{"t":"Currency","st":"Gems","q":220.0,"d":""}]},{"id":"com.TWEP.UPF.gems100","type":0,"storeIDs":[],"defaultDescription":{"googleLocale":4,"title":"100 Gems Pack","description":"Receive 100 Gems"},"screenshotPath":"","applePriceTier":12,"googlePrice":{"data":[1199,0,0,131072],"num":11.99},"pricingTemplateID":"11.99","descriptions":[],"udpPrice":{"data":[0,0,0,0],"num":0.0},"payouts":[{"t":"Currency","st":"Gems","q":480.0,"d":""}]},{"id":"com.TWEP.UPF.gems230","type":0,"storeIDs":[],"defaultDescription":{"googleLocale":4,"title":"230 Gems Pack","description":"Receive 230 Gems"},"screenshotPath":"","applePriceTier":25,"googlePrice":{"data":[2499,0,0,131072],"num":24.99},"pricingTemplateID":"24.99","descriptions":[],"udpPrice":{"data":[0,0,0,0],"num":0.0},"payouts":[{"t":"Currency","st":"Gems","q":1200.0,"d":""}]},{"id":"com.TWEP.UPF.gems500","type":0,"storeIDs":[],"defaultDescription":{"googleLocale":4,"title":"500 Gems Pack","description":"Receive 500 Gems"},"screenshotPath":"","applePriceTier":50,"googlePrice":{"data":[4999,0,0,131072],"num":49.99},"pricingTemplateID":"49.99","descriptions":[],"udpPrice":{"data":[0,0,0,0],"num":0.0},"payouts":[{"t":"Currency","st":"Gems","q":2100.0,"d":""}]}]}

Assets/Resources/ScriptableObjects/BuildingData/O2Mine.asset

@@ -20,7 +20,7 @@ MonoBehaviour:
       value: Normal
       image: {fileID: 21300000, guid: b6daf313078da4746bd859fc9e71e6e0, type: 3}
     price: 20000
-    xpGain: 2000
+    xpGain: 0
   - level: 1
     stats:
     - name: Level

Assets/Resources/ScriptableObjects/SkinsData.asset

@@ -19,61 +19,61 @@ MonoBehaviour:
     skinType: 0
   - name: base_yellow
     image: {fileID: -891101006492794385, guid: 4de40472c684c464db6425c3f8b4cb86, type: 3}
-    price: 5000
+    price: 2000
     skinType: 0
   - name: base green
     image: {fileID: -3653331988967430578, guid: 4de40472c684c464db6425c3f8b4cb86, type: 3}
-    price: 5000
+    price: 2000
     skinType: 0
   - name: base_red
     image: {fileID: 638681777288463559, guid: 4de40472c684c464db6425c3f8b4cb86, type: 3}
-    price: 10000
+    price: 2000
     skinType: 0
   - name: base2_green
     image: {fileID: 5693378827328238, guid: 4de40472c684c464db6425c3f8b4cb86, type: 3}
-    price: 10000
+    price: 2000
     skinType: 0
   - name: base2_silver
     image: {fileID: 4857983967714589581, guid: 4de40472c684c464db6425c3f8b4cb86, type: 3}
-    price: 10000
+    price: 2000
     skinType: 0
   - name: rare_black_gold
     image: {fileID: 4684224760558976125, guid: d274292b8f4ba6c49a18bae11a1b9893, type: 3}
-    price: 20000
+    price: 3000
     skinType: 1
   - name: rare_pink
     image: {fileID: -891101006492794385, guid: d274292b8f4ba6c49a18bae11a1b9893, type: 3}
-    price: 20000
+    price: 3000
     skinType: 1
   - name: rare_pink_2
     image: {fileID: -3653331988967430578, guid: d274292b8f4ba6c49a18bae11a1b9893, type: 3}
-    price: 25000
+    price: 3000
     skinType: 1
   - name: rare_blue_2
     image: {fileID: 638681777288463559, guid: d274292b8f4ba6c49a18bae11a1b9893, type: 3}
-    price: 25000
+    price: 3000
     skinType: 1
   - name: rare_blue_3
     image: {fileID: 5693378827328238, guid: d274292b8f4ba6c49a18bae11a1b9893, type: 3}
-    price: 30000
+    price: 3000
     skinType: 1
   - name: rare_purple_3
     image: {fileID: -5759662267452513102, guid: d274292b8f4ba6c49a18bae11a1b9893, type: 3}
-    price: 30000
+    price: 3000
     skinType: 1
   - name: legendary_fish_red
     image: {fileID: 4684224760558976125, guid: 2c885f2a72d92dd4e96779a685c53911, type: 3}
-    price: 40000
+    price: 5000
     skinType: 2
   - name: legendary_fish_green
     image: {fileID: -891101006492794385, guid: 2c885f2a72d92dd4e96779a685c53911, type: 3}
-    price: 40000
+    price: 5000
     skinType: 2
   - name: legendary_pig_green
     image: {fileID: -3653331988967430578, guid: 2c885f2a72d92dd4e96779a685c53911, type: 3}
-    price: 50000
+    price: 5000
     skinType: 2
   - name: legendary_pig_pink
     image: {fileID: 638681777288463559, guid: 2c885f2a72d92dd4e96779a685c53911, type: 3}
-    price: 50000
+    price: 5000
     skinType: 2

ProjectSettings/GvhProjectSettings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <projectSettings>
-  <projectSetting name="com.google.external-dependency-managerAnalyticsCookie" value="923612e29990433084d6e7eddc2aed9d" />
-  <projectSetting name="com.google.external-dependency-managerAnalyticsEnabled" value="True" />
+  <projectSetting name="com.google.external-dependency-managerAnalyticsEnabled" value="False" />
   <projectSetting name="Google.IOSResolver.VerboseLoggingEnabled" value="False" />
   <projectSetting name="Google.PackageManagerResolver.VerboseLoggingEnabled" value="False" />
   <projectSetting name="Google.VersionHandler.VerboseLoggingEnabled" value="False" />

ProjectSettings/ProjectSettings.asset

@@ -134,7 +134,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.6
+  bundleVersion: 0.8
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -160,7 +160,7 @@ PlayerSettings:
     iPhone: 0
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
-  AndroidBundleVersionCode: 6
+  AndroidBundleVersionCode: 8
   AndroidMinSdkVersion: 22
   AndroidTargetSdkVersion: 33
   AndroidPreferredInstallLocation: 1

ProjectSettings/ProjectSettings.sync-conflict-20221008-180119-YYYAVZU.asset

@@ -1,799 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!129 &1
-PlayerSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 22
-  productGUID: 8580acfbe6f2f154c9c1f974633f3a4b
-  AndroidProfiler: 0
-  AndroidFilterTouchesWhenObscured: 0
-  AndroidEnableSustainedPerformanceMode: 0
-  defaultScreenOrientation: 4
-  targetDevice: 2
-  useOnDemandResources: 0
-  accelerometerFrequency: 60
-  companyName: TWEP
-  productName: UPF
-  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_SplashScreenOverlayOpacity: 1
-  m_SplashScreenAnimation: 1
-  m_SplashScreenLogoStyle: 1
-  m_SplashScreenDrawMode: 0
-  m_SplashScreenBackgroundAnimationZoom: 1
-  m_SplashScreenLogoAnimationZoom: 1
-  m_SplashScreenBackgroundLandscapeAspect: 1
-  m_SplashScreenBackgroundPortraitAspect: 1
-  m_SplashScreenBackgroundLandscapeUvs:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  m_SplashScreenBackgroundPortraitUvs:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  m_SplashScreenLogos: []
-  m_VirtualRealitySplashScreen: {fileID: 0}
-  m_HolographicTrackingLossScreen: {fileID: 0}
-  defaultScreenWidth: 1024
-  defaultScreenHeight: 768
-  defaultScreenWidthWeb: 960
-  defaultScreenHeightWeb: 600
-  m_StereoRenderingPath: 0
-  m_ActiveColorSpace: 0
-  m_MTRendering: 1
-  mipStripping: 0
-  numberOfMipsStripped: 0
-  m_StackTraceTypes: 010000000100000001000000010000000100000001000000
-  iosShowActivityIndicatorOnLoading: -1
-  androidShowActivityIndicatorOnLoading: 2
-  iosUseCustomAppBackgroundBehavior: 0
-  iosAllowHTTPDownload: 1
-  allowedAutorotateToPortrait: 0
-  allowedAutorotateToPortraitUpsideDown: 0
-  allowedAutorotateToLandscapeRight: 1
-  allowedAutorotateToLandscapeLeft: 1
-  useOSAutorotation: 1
-  use32BitDisplayBuffer: 0
-  preserveFramebufferAlpha: 0
-  disableDepthAndStencilBuffers: 0
-  androidStartInFullscreen: 1
-  androidRenderOutsideSafeArea: 1
-  androidUseSwappy: 1
-  androidBlitType: 2
-  androidResizableWindow: 0
-  androidDefaultWindowWidth: 1920
-  androidDefaultWindowHeight: 1080
-  androidMinimumWindowWidth: 400
-  androidMinimumWindowHeight: 300
-  androidFullscreenMode: 1
-  defaultIsNativeResolution: 1
-  macRetinaSupport: 1
-  runInBackground: 1
-  captureSingleScreen: 0
-  muteOtherAudioSources: 0
-  Prepare IOS For Recording: 0
-  Force IOS Speakers When Recording: 0
-  deferSystemGesturesMode: 0
-  hideHomeButton: 0
-  submitAnalytics: 1
-  usePlayerLog: 1
-  bakeCollisionMeshes: 0
-  forceSingleInstance: 0
-  useFlipModelSwapchain: 1
-  resizableWindow: 1
-  useMacAppStoreValidation: 0
-  macAppStoreCategory: public.app-category.games
-  gpuSkinning: 1
-  xboxPIXTextureCapture: 0
-  xboxEnableAvatar: 0
-  xboxEnableKinect: 0
-  xboxEnableKinectAutoTracking: 0
-  xboxEnableFitness: 0
-  visibleInBackground: 1
-  allowFullscreenSwitch: 1
-  fullscreenMode: 3
-  xboxSpeechDB: 0
-  xboxEnableHeadOrientation: 0
-  xboxEnableGuest: 0
-  xboxEnablePIXSampling: 0
-  metalFramebufferOnly: 0
-  xboxOneResolution: 0
-  xboxOneSResolution: 0
-  xboxOneXResolution: 3
-  xboxOneMonoLoggingLevel: 0
-  xboxOneLoggingLevel: 1
-  xboxOneDisableEsram: 0
-  xboxOneEnableTypeOptimization: 0
-  xboxOnePresentImmediateThreshold: 0
-  switchQueueCommandMemory: 0
-  switchQueueControlMemory: 16384
-  switchQueueComputeMemory: 262144
-  switchNVNShaderPoolsGranularity: 33554432
-  switchNVNDefaultPoolsGranularity: 16777216
-  switchNVNOtherPoolsGranularity: 16777216
-  switchNVNMaxPublicTextureIDCount: 0
-  switchNVNMaxPublicSamplerIDCount: 0
-  stadiaPresentMode: 0
-  stadiaTargetFramerate: 0
-  vulkanNumSwapchainBuffers: 3
-  vulkanEnableSetSRGBWrite: 0
-  vulkanEnablePreTransform: 0
-  vulkanEnableLateAcquireNextImage: 0
-  vulkanEnableCommandBufferRecycling: 1
-  m_SupportedAspectRatios:
-    4:3: 1
-    5:4: 1
-    16:10: 1
-    16:9: 1
-    Others: 1
-  bundleVersion: 0.3
-  preloadedAssets: []
-  metroInputSource: 0
-  wsaTransparentSwapchain: 0
-  m_HolographicPauseOnTrackingLoss: 1
-  xboxOneDisableKinectGpuReservation: 1
-  xboxOneEnable7thCore: 1
-  vrSettings:
-    enable360StereoCapture: 0
-  isWsaHolographicRemotingEnabled: 0
-  enableFrameTimingStats: 0
-  useHDRDisplay: 0
-  D3DHDRBitDepth: 0
-  m_ColorGamuts: 00000000
-  targetPixelDensity: 30
-  resolutionScalingMode: 0
-  androidSupportedAspectRatio: 1
-  androidMaxAspectRatio: 2.1
-  applicationIdentifier:
-    Android: com.TWEP.UPF
-    Standalone: com.DefaultCompany.UPF
-  buildNumber:
-    Standalone: 0
-    iPhone: 0
-    tvOS: 0
-  overrideDefaultApplicationIdentifier: 0
-  AndroidBundleVersionCode: 3
-  AndroidMinSdkVersion: 22
-  AndroidTargetSdkVersion: 33
-  AndroidPreferredInstallLocation: 1
-  aotOptions: 
-  stripEngineCode: 1
-  iPhoneStrippingLevel: 0
-  iPhoneScriptCallOptimization: 0
-  ForceInternetPermission: 1
-  ForceSDCardPermission: 0
-  CreateWallpaper: 0
-  APKExpansionFiles: 0
-  keepLoadedShadersAlive: 0
-  StripUnusedMeshComponents: 1
-  VertexChannelCompressionMask: 4054
-  iPhoneSdkVersion: 988
-  iOSTargetOSVersionString: 11.0
-  tvOSSdkVersion: 0
-  tvOSRequireExtendedGameController: 0
-  tvOSTargetOSVersionString: 11.0
-  uIPrerenderedIcon: 0
-  uIRequiresPersistentWiFi: 0
-  uIRequiresFullScreen: 1
-  uIStatusBarHidden: 1
-  uIExitOnSuspend: 0
-  uIStatusBarStyle: 0
-  appleTVSplashScreen: {fileID: 0}
-  appleTVSplashScreen2x: {fileID: 0}
-  tvOSSmallIconLayers: []
-  tvOSSmallIconLayers2x: []
-  tvOSLargeIconLayers: []
-  tvOSLargeIconLayers2x: []
-  tvOSTopShelfImageLayers: []
-  tvOSTopShelfImageLayers2x: []
-  tvOSTopShelfImageWideLayers: []
-  tvOSTopShelfImageWideLayers2x: []
-  iOSLaunchScreenType: 0
-  iOSLaunchScreenPortrait: {fileID: 0}
-  iOSLaunchScreenLandscape: {fileID: 0}
-  iOSLaunchScreenBackgroundColor:
-    serializedVersion: 2
-    rgba: 0
-  iOSLaunchScreenFillPct: 100
-  iOSLaunchScreenSize: 100
-  iOSLaunchScreenCustomXibPath: 
-  iOSLaunchScreeniPadType: 0
-  iOSLaunchScreeniPadImage: {fileID: 0}
-  iOSLaunchScreeniPadBackgroundColor:
-    serializedVersion: 2
-    rgba: 0
-  iOSLaunchScreeniPadFillPct: 100
-  iOSLaunchScreeniPadSize: 100
-  iOSLaunchScreeniPadCustomXibPath: 
-  iOSLaunchScreenCustomStoryboardPath: 
-  iOSLaunchScreeniPadCustomStoryboardPath: 
-  iOSDeviceRequirements: []
-  iOSURLSchemes: []
-  iOSBackgroundModes: 0
-  iOSMetalForceHardShadows: 0
-  metalEditorSupport: 1
-  metalAPIValidation: 1
-  iOSRenderExtraFrameOnPause: 0
-  iosCopyPluginsCodeInsteadOfSymlink: 0
-  appleDeveloperTeamID: 
-  iOSManualSigningProvisioningProfileID: 
-  tvOSManualSigningProvisioningProfileID: 
-  iOSManualSigningProvisioningProfileType: 0
-  tvOSManualSigningProvisioningProfileType: 0
-  appleEnableAutomaticSigning: 0
-  iOSRequireARKit: 0
-  iOSAutomaticallyDetectAndAddCapabilities: 1
-  appleEnableProMotion: 0
-  shaderPrecisionModel: 0
-  clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
-  templatePackageId: com.unity.template.3d@5.0.4
-  templateDefaultScene: Assets/Scenes/SampleScene.unity
-  useCustomMainManifest: 0
-  useCustomLauncherManifest: 0
-  useCustomMainGradleTemplate: 0
-  useCustomLauncherGradleManifest: 0
-  useCustomBaseGradleTemplate: 0
-  useCustomGradlePropertiesTemplate: 0
-  useCustomProguardFile: 0
-  AndroidTargetArchitectures: 3
-  AndroidTargetDevices: 0
-  AndroidSplashScreenScale: 0
-  androidSplashScreen: {fileID: 0}
-  AndroidKeystoreName: /media/RocketSpeed/keys/twep.keystore
-  AndroidKeyaliasName: tul
-  AndroidBuildApkPerCpuArchitecture: 0
-  AndroidTVCompatibility: 0
-  AndroidIsGame: 1
-  AndroidEnableTango: 0
-  androidEnableBanner: 1
-  androidUseLowAccuracyLocation: 0
-  androidUseCustomKeystore: 1
-  m_AndroidBanners:
-  - width: 320
-    height: 180
-    banner: {fileID: 0}
-  androidGamepadSupportLevel: 0
-  chromeosInputEmulation: 1
-  AndroidMinifyWithR8: 0
-  AndroidMinifyRelease: 0
-  AndroidMinifyDebug: 0
-  AndroidValidateAppBundleSize: 1
-  AndroidAppBundleSizeToValidate: 150
-  m_BuildTargetIcons: []
-  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: 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_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_BuildTargetBatching:
-  - m_BuildTarget: Standalone
-    m_StaticBatching: 1
-    m_DynamicBatching: 0
-  - m_BuildTarget: tvOS
-    m_StaticBatching: 1
-    m_DynamicBatching: 0
-  - m_BuildTarget: Android
-    m_StaticBatching: 1
-    m_DynamicBatching: 0
-  - m_BuildTarget: iPhone
-    m_StaticBatching: 1
-    m_DynamicBatching: 0
-  - m_BuildTarget: WebGL
-    m_StaticBatching: 0
-    m_DynamicBatching: 0
-  m_BuildTargetGraphicsJobs:
-  - m_BuildTarget: MacStandaloneSupport
-    m_GraphicsJobs: 0
-  - m_BuildTarget: Switch
-    m_GraphicsJobs: 1
-  - m_BuildTarget: MetroSupport
-    m_GraphicsJobs: 1
-  - m_BuildTarget: AppleTVSupport
-    m_GraphicsJobs: 0
-  - m_BuildTarget: BJMSupport
-    m_GraphicsJobs: 1
-  - m_BuildTarget: LinuxStandaloneSupport
-    m_GraphicsJobs: 1
-  - m_BuildTarget: PS4Player
-    m_GraphicsJobs: 1
-  - m_BuildTarget: iOSSupport
-    m_GraphicsJobs: 0
-  - m_BuildTarget: WindowsStandaloneSupport
-    m_GraphicsJobs: 1
-  - m_BuildTarget: XboxOnePlayer
-    m_GraphicsJobs: 1
-  - m_BuildTarget: LuminSupport
-    m_GraphicsJobs: 0
-  - m_BuildTarget: AndroidPlayer
-    m_GraphicsJobs: 0
-  - m_BuildTarget: WebGLSupport
-    m_GraphicsJobs: 0
-  m_BuildTargetGraphicsJobMode:
-  - m_BuildTarget: PS4Player
-    m_GraphicsJobMode: 0
-  - m_BuildTarget: XboxOnePlayer
-    m_GraphicsJobMode: 0
-  m_BuildTargetGraphicsAPIs:
-  - m_BuildTarget: AndroidPlayer
-    m_APIs: 150000000b000000
-    m_Automatic: 1
-  - m_BuildTarget: iOSSupport
-    m_APIs: 10000000
-    m_Automatic: 1
-  - m_BuildTarget: AppleTVSupport
-    m_APIs: 10000000
-    m_Automatic: 1
-  - m_BuildTarget: WebGLSupport
-    m_APIs: 0b000000
-    m_Automatic: 1
-  - m_BuildTarget: LinuxStandaloneSupport
-    m_APIs: 1500000011000000
-    m_Automatic: 0
-  m_BuildTargetVRSettings:
-  - m_BuildTarget: Standalone
-    m_Enabled: 0
-    m_Devices:
-    - Oculus
-    - OpenVR
-  openGLRequireES31: 0
-  openGLRequireES31AEP: 0
-  openGLRequireES32: 0
-  m_TemplateCustomTags: {}
-  mobileMTRendering:
-    Android: 1
-    iPhone: 1
-    tvOS: 1
-  m_BuildTargetGroupLightmapEncodingQuality: []
-  m_BuildTargetGroupLightmapSettings: []
-  m_BuildTargetNormalMapEncoding: []
-  playModeTestRunnerEnabled: 0
-  runPlayModeTestAsEditModeTest: 0
-  actionOnDotNetUnhandledException: 1
-  enableInternalProfiler: 0
-  logObjCUncaughtExceptions: 1
-  enableCrashReportAPI: 0
-  cameraUsageDescription: 
-  locationUsageDescription: 
-  microphoneUsageDescription: 
-  bluetoothUsageDescription: 
-  switchNMETAOverride: 
-  switchNetLibKey: 
-  switchSocketMemoryPoolSize: 6144
-  switchSocketAllocatorPoolSize: 128
-  switchSocketConcurrencyLimit: 14
-  switchScreenResolutionBehavior: 2
-  switchUseCPUProfiler: 0
-  switchUseGOLDLinker: 0
-  switchApplicationID: 0x01004b9000490000
-  switchNSODependencies: 
-  switchTitleNames_0: 
-  switchTitleNames_1: 
-  switchTitleNames_2: 
-  switchTitleNames_3: 
-  switchTitleNames_4: 
-  switchTitleNames_5: 
-  switchTitleNames_6: 
-  switchTitleNames_7: 
-  switchTitleNames_8: 
-  switchTitleNames_9: 
-  switchTitleNames_10: 
-  switchTitleNames_11: 
-  switchTitleNames_12: 
-  switchTitleNames_13: 
-  switchTitleNames_14: 
-  switchTitleNames_15: 
-  switchPublisherNames_0: 
-  switchPublisherNames_1: 
-  switchPublisherNames_2: 
-  switchPublisherNames_3: 
-  switchPublisherNames_4: 
-  switchPublisherNames_5: 
-  switchPublisherNames_6: 
-  switchPublisherNames_7: 
-  switchPublisherNames_8: 
-  switchPublisherNames_9: 
-  switchPublisherNames_10: 
-  switchPublisherNames_11: 
-  switchPublisherNames_12: 
-  switchPublisherNames_13: 
-  switchPublisherNames_14: 
-  switchPublisherNames_15: 
-  switchIcons_0: {fileID: 0}
-  switchIcons_1: {fileID: 0}
-  switchIcons_2: {fileID: 0}
-  switchIcons_3: {fileID: 0}
-  switchIcons_4: {fileID: 0}
-  switchIcons_5: {fileID: 0}
-  switchIcons_6: {fileID: 0}
-  switchIcons_7: {fileID: 0}
-  switchIcons_8: {fileID: 0}
-  switchIcons_9: {fileID: 0}
-  switchIcons_10: {fileID: 0}
-  switchIcons_11: {fileID: 0}
-  switchIcons_12: {fileID: 0}
-  switchIcons_13: {fileID: 0}
-  switchIcons_14: {fileID: 0}
-  switchIcons_15: {fileID: 0}
-  switchSmallIcons_0: {fileID: 0}
-  switchSmallIcons_1: {fileID: 0}
-  switchSmallIcons_2: {fileID: 0}
-  switchSmallIcons_3: {fileID: 0}
-  switchSmallIcons_4: {fileID: 0}
-  switchSmallIcons_5: {fileID: 0}
-  switchSmallIcons_6: {fileID: 0}
-  switchSmallIcons_7: {fileID: 0}
-  switchSmallIcons_8: {fileID: 0}
-  switchSmallIcons_9: {fileID: 0}
-  switchSmallIcons_10: {fileID: 0}
-  switchSmallIcons_11: {fileID: 0}
-  switchSmallIcons_12: {fileID: 0}
-  switchSmallIcons_13: {fileID: 0}
-  switchSmallIcons_14: {fileID: 0}
-  switchSmallIcons_15: {fileID: 0}
-  switchManualHTML: 
-  switchAccessibleURLs: 
-  switchLegalInformation: 
-  switchMainThreadStackSize: 1048576
-  switchPresenceGroupId: 
-  switchLogoHandling: 0
-  switchReleaseVersion: 0
-  switchDisplayVersion: 1.0.0
-  switchStartupUserAccount: 0
-  switchTouchScreenUsage: 0
-  switchSupportedLanguagesMask: 0
-  switchLogoType: 0
-  switchApplicationErrorCodeCategory: 
-  switchUserAccountSaveDataSize: 0
-  switchUserAccountSaveDataJournalSize: 0
-  switchApplicationAttribute: 0
-  switchCardSpecSize: -1
-  switchCardSpecClock: -1
-  switchRatingsMask: 0
-  switchRatingsInt_0: 0
-  switchRatingsInt_1: 0
-  switchRatingsInt_2: 0
-  switchRatingsInt_3: 0
-  switchRatingsInt_4: 0
-  switchRatingsInt_5: 0
-  switchRatingsInt_6: 0
-  switchRatingsInt_7: 0
-  switchRatingsInt_8: 0
-  switchRatingsInt_9: 0
-  switchRatingsInt_10: 0
-  switchRatingsInt_11: 0
-  switchRatingsInt_12: 0
-  switchLocalCommunicationIds_0: 
-  switchLocalCommunicationIds_1: 
-  switchLocalCommunicationIds_2: 
-  switchLocalCommunicationIds_3: 
-  switchLocalCommunicationIds_4: 
-  switchLocalCommunicationIds_5: 
-  switchLocalCommunicationIds_6: 
-  switchLocalCommunicationIds_7: 
-  switchParentalControl: 0
-  switchAllowsScreenshot: 1
-  switchAllowsVideoCapturing: 1
-  switchAllowsRuntimeAddOnContentInstall: 0
-  switchDataLossConfirmation: 0
-  switchUserAccountLockEnabled: 0
-  switchSystemResourceMemory: 16777216
-  switchSupportedNpadStyles: 22
-  switchNativeFsCacheSize: 32
-  switchIsHoldTypeHorizontal: 0
-  switchSupportedNpadCount: 8
-  switchSocketConfigEnabled: 0
-  switchTcpInitialSendBufferSize: 32
-  switchTcpInitialReceiveBufferSize: 64
-  switchTcpAutoSendBufferSizeMax: 256
-  switchTcpAutoReceiveBufferSizeMax: 256
-  switchUdpSendBufferSize: 9
-  switchUdpReceiveBufferSize: 42
-  switchSocketBufferEfficiency: 4
-  switchSocketInitializeEnabled: 1
-  switchNetworkInterfaceManagerInitializeEnabled: 1
-  switchPlayerConnectionEnabled: 1
-  switchUseNewStyleFilepaths: 0
-  switchUseMicroSleepForYield: 1
-  switchEnableRamDiskSupport: 0
-  switchMicroSleepForYieldTime: 25
-  switchRamDiskSpaceSize: 12
-  ps4NPAgeRating: 12
-  ps4NPTitleSecret: 
-  ps4NPTrophyPackPath: 
-  ps4ParentalLevel: 11
-  ps4ContentID: ED1633-NPXX51362_00-0000000000000000
-  ps4Category: 0
-  ps4MasterVersion: 01.00
-  ps4AppVersion: 01.00
-  ps4AppType: 0
-  ps4ParamSfxPath: 
-  ps4VideoOutPixelFormat: 0
-  ps4VideoOutInitialWidth: 1920
-  ps4VideoOutBaseModeInitialWidth: 1920
-  ps4VideoOutReprojectionRate: 60
-  ps4PronunciationXMLPath: 
-  ps4PronunciationSIGPath: 
-  ps4BackgroundImagePath: 
-  ps4StartupImagePath: 
-  ps4StartupImagesFolder: 
-  ps4IconImagesFolder: 
-  ps4SaveDataImagePath: 
-  ps4SdkOverride: 
-  ps4BGMPath: 
-  ps4ShareFilePath: 
-  ps4ShareOverlayImagePath: 
-  ps4PrivacyGuardImagePath: 
-  ps4ExtraSceSysFile: 
-  ps4NPtitleDatPath: 
-  ps4RemotePlayKeyAssignment: -1
-  ps4RemotePlayKeyMappingDir: 
-  ps4PlayTogetherPlayerCount: 0
-  ps4EnterButtonAssignment: 1
-  ps4ApplicationParam1: 0
-  ps4ApplicationParam2: 0
-  ps4ApplicationParam3: 0
-  ps4ApplicationParam4: 0
-  ps4DownloadDataSize: 0
-  ps4GarlicHeapSize: 2048
-  ps4ProGarlicHeapSize: 2560
-  playerPrefsMaxSize: 32768
-  ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
-  ps4pnSessions: 1
-  ps4pnPresence: 1
-  ps4pnFriends: 1
-  ps4pnGameCustomData: 1
-  playerPrefsSupport: 0
-  enableApplicationExit: 0
-  resetTempFolder: 1
-  restrictedAudioUsageRights: 0
-  ps4UseResolutionFallback: 0
-  ps4ReprojectionSupport: 0
-  ps4UseAudio3dBackend: 0
-  ps4UseLowGarlicFragmentationMode: 1
-  ps4SocialScreenEnabled: 0
-  ps4ScriptOptimizationLevel: 0
-  ps4Audio3dVirtualSpeakerCount: 14
-  ps4attribCpuUsage: 0
-  ps4PatchPkgPath: 
-  ps4PatchLatestPkgPath: 
-  ps4PatchChangeinfoPath: 
-  ps4PatchDayOne: 0
-  ps4attribUserManagement: 0
-  ps4attribMoveSupport: 0
-  ps4attrib3DSupport: 0
-  ps4attribShareSupport: 0
-  ps4attribExclusiveVR: 0
-  ps4disableAutoHideSplash: 0
-  ps4videoRecordingFeaturesUsed: 0
-  ps4contentSearchFeaturesUsed: 0
-  ps4CompatibilityPS5: 0
-  ps4AllowPS5Detection: 0
-  ps4GPU800MHz: 1
-  ps4attribEyeToEyeDistanceSettingVR: 0
-  ps4IncludedModules: []
-  ps4attribVROutputEnabled: 0
-  monoEnv: 
-  splashScreenBackgroundSourceLandscape: {fileID: 0}
-  splashScreenBackgroundSourcePortrait: {fileID: 0}
-  blurSplashScreenBackground: 1
-  spritePackerPolicy: 
-  webGLMemorySize: 16
-  webGLExceptionSupport: 1
-  webGLNameFilesAsHashes: 0
-  webGLDataCaching: 1
-  webGLDebugSymbols: 0
-  webGLEmscriptenArgs: 
-  webGLModulesDirectory: 
-  webGLTemplate: APPLICATION:Default
-  webGLAnalyzeBuildSize: 0
-  webGLUseEmbeddedResources: 0
-  webGLCompressionFormat: 1
-  webGLWasmArithmeticExceptions: 0
-  webGLLinkerTarget: 1
-  webGLThreadsSupport: 0
-  webGLDecompressionFallback: 0
-  scriptingDefineSymbols:
-    1: MIRROR;MIRROR_17_0_OR_NEWER;MIRROR_18_0_OR_NEWER;MIRROR_24_0_OR_NEWER;MIRROR_26_0_OR_NEWER;MIRROR_27_0_OR_NEWER;MIRROR_28_0_OR_NEWER;MIRROR_29_0_OR_NEWER;MIRROR_30_0_OR_NEWER;MIRROR_30_5_2_OR_NEWER;MIRROR_32_1_2_OR_NEWER;MIRROR_32_1_4_OR_NEWER;MIRROR_35_0_OR_NEWER;MIRROR_35_1_OR_NEWER;MIRROR_37_0_OR_NEWER;MIRROR_38_0_OR_NEWER;MIRROR_39_0_OR_NEWER;MIRROR_40_0_OR_NEWER;MIRROR_41_0_OR_NEWER;MIRROR_42_0_OR_NEWER;MIRROR_43_0_OR_NEWER;MIRROR_44_0_OR_NEWER;MIRROR_46_0_OR_NEWER;MIRROR_47_0_OR_NEWER;MIRROR_53_0_OR_NEWER;MIRROR_55_0_OR_NEWER;MIRROR_57_0_OR_NEWER;MIRROR_58_0_OR_NEWER;MIRROR_65_0_OR_NEWER;MIRROR_66_0_OR_NEWER
-    7: ENABLE_UNITYMESHSIMPLIFIER;MIRROR;MIRROR_17_0_OR_NEWER;MIRROR_18_0_OR_NEWER;MIRROR_24_0_OR_NEWER;MIRROR_26_0_OR_NEWER;MIRROR_27_0_OR_NEWER;MIRROR_28_0_OR_NEWER;MIRROR_29_0_OR_NEWER;MIRROR_30_0_OR_NEWER;MIRROR_30_5_2_OR_NEWER;MIRROR_32_1_2_OR_NEWER;MIRROR_32_1_4_OR_NEWER;MIRROR_35_0_OR_NEWER;MIRROR_35_1_OR_NEWER;MIRROR_37_0_OR_NEWER;MIRROR_38_0_OR_NEWER;MIRROR_39_0_OR_NEWER;MIRROR_40_0_OR_NEWER;MIRROR_41_0_OR_NEWER;MIRROR_42_0_OR_NEWER;MIRROR_43_0_OR_NEWER;MIRROR_44_0_OR_NEWER;MIRROR_46_0_OR_NEWER;MIRROR_47_0_OR_NEWER;MIRROR_53_0_OR_NEWER;MIRROR_55_0_OR_NEWER;MIRROR_57_0_OR_NEWER;MIRROR_58_0_OR_NEWER;MIRROR_65_0_OR_NEWER;MIRROR_66_0_OR_NEWER
-  additionalCompilerArguments: {}
-  platformArchitecture: {}
-  scriptingBackend:
-    Android: 1
-  il2cppCompilerConfiguration: {}
-  managedStrippingLevel: {}
-  incrementalIl2cppBuild: {}
-  suppressCommonWarnings: 1
-  allowUnsafeCode: 0
-  useDeterministicCompilation: 1
-  useReferenceAssemblies: 1
-  enableRoslynAnalyzers: 1
-  additionalIl2CppArgs: 
-  scriptingRuntimeVersion: 1
-  gcIncremental: 1
-  assemblyVersionValidation: 1
-  gcWBarrierValidation: 0
-  apiCompatibilityLevelPerPlatform:
-    Android: 6
-  m_RenderingPath: 1
-  m_MobileRenderingPath: 1
-  metroPackageName: Template_3D
-  metroPackageVersion: 
-  metroCertificatePath: 
-  metroCertificatePassword: 
-  metroCertificateSubject: 
-  metroCertificateIssuer: 
-  metroCertificateNotAfter: 0000000000000000
-  metroApplicationDescription: Template_3D
-  wsaImages: {}
-  metroTileShortName: 
-  metroTileShowName: 0
-  metroMediumTileShowName: 0
-  metroLargeTileShowName: 0
-  metroWideTileShowName: 0
-  metroSupportStreamingInstall: 0
-  metroLastRequiredScene: 0
-  metroDefaultTileSize: 1
-  metroTileForegroundText: 2
-  metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0}
-  metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1}
-  metroSplashScreenUseBackgroundColor: 0
-  platformCapabilities: {}
-  metroTargetDeviceFamilies: {}
-  metroFTAName: 
-  metroFTAFileTypes: []
-  metroProtocolName: 
-  vcxProjDefaultLanguage: 
-  XboxOneProductId: 
-  XboxOneUpdateKey: 
-  XboxOneSandboxId: 
-  XboxOneContentId: 
-  XboxOneTitleId: 
-  XboxOneSCId: 
-  XboxOneGameOsOverridePath: 
-  XboxOnePackagingOverridePath: 
-  XboxOneAppManifestOverridePath: 
-  XboxOneVersion: 1.0.0.0
-  XboxOnePackageEncryption: 0
-  XboxOnePackageUpdateGranularity: 2
-  XboxOneDescription: 
-  XboxOneLanguage:
-  - enus
-  XboxOneCapability: []
-  XboxOneGameRating: {}
-  XboxOneIsContentPackage: 0
-  XboxOneEnhancedXboxCompatibilityMode: 0
-  XboxOneEnableGPUVariability: 1
-  XboxOneSockets: {}
-  XboxOneSplashScreen: {fileID: 0}
-  XboxOneAllowedProductIds: []
-  XboxOnePersistentLocalStorageSize: 0
-  XboxOneXTitleMemory: 8
-  XboxOneOverrideIdentityName: 
-  XboxOneOverrideIdentityPublisher: 
-  vrEditorSettings: {}
-  cloudServicesEnabled:
-    Build: 0
-    Collab: 0
-    Game Performance: 0
-    Legacy Analytics: 1
-    Purchasing: 1
-    UDP: 0
-    UNet: 1
-    Unity Ads: 0
-  luminIcon:
-    m_Name: 
-    m_ModelFolderPath: 
-    m_PortalFolderPath: 
-  luminCert:
-    m_CertPath: 
-    m_SignPackage: 1
-  luminIsChannelApp: 0
-  luminVersion:
-    m_VersionCode: 1
-    m_VersionName: 
-  apiCompatibilityLevel: 6
-  activeInputHandler: 0
-  cloudProjectId: b22c1a69-59e0-4958-bbcf-4855c7a475a5
-  framebufferDepthMemorylessMode: 0
-  qualitySettingsNames: []
-  projectName: UPF
-  organizationId: tw3pdev
-  cloudEnabled: 0
-  legacyClampBlendShapeWeights: 0
-  virtualTexturingSupportEnabled: 0

ProjectSettings/ProjectVersion.sync-conflict-20220828-194102-YYYAVZU.txt

@@ -1,2 +0,0 @@
-m_EditorVersion: 2020.3.32f1
-m_EditorVersionWithRevision: 2020.3.32f1 (12f8b0834f07)

ProjectSettings/ProjectVersion.sync-conflict-20220828-203228-YYYAVZU.txt

@@ -1,2 +0,0 @@
-m_EditorVersion: 2020.3.32f1
-m_EditorVersionWithRevision: 2020.3.32f1 (12f8b0834f07)

upf.sln

@@ -1,90 +1,83 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{81D9F3F8-C93A-B7A8-EA43-2868619EFE2A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{f8f3d981-3ac9-a8b7-ea43-2868619efe2a}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleWebTransport", "SimpleWebTransport.csproj", "{8D7EEFF4-B499-02A2-8A27-32DCFCE49CFE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleWebTransport", "SimpleWebTransport.csproj", "{f4ef7e8d-99b4-a202-8a27-32dcfce49cfe}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mirror.Examples", "Mirror.Examples.csproj", "{DAC71A6F-7D27-44EE-8547-E218C93F84DF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mirror.Examples", "Mirror.Examples.csproj", "{6f1ac7da-277d-ee44-8547-e218c93f84df}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mirror", "Mirror.csproj", "{0F8B44D9-56E4-8FCF-8285-980F3496DF94}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mirror", "Mirror.csproj", "{d9448b0f-e456-cf8f-8285-980f3496df94}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mirror.Components", "Mirror.Components.csproj", "{E7A80302-5562-0B7E-3CBF-ECAE2398312C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Whinarn.UnityMeshSimplifier.Runtime", "Whinarn.UnityMeshSimplifier.Runtime.csproj", "{b99ffb8c-f6f2-f646-802e-7cb2e62d8c0c}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Telepathy", "Telepathy.csproj", "{11D8948C-8879-BF2E-1CC0-26B574688E67}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mirror.Components", "Mirror.Components.csproj", "{0203a8e7-6255-7e0b-3cbf-ecae2398312c}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "kcp2k", "kcp2k.csproj", "{AB2F7FCF-3DD8-66F3-F3B2-9D9E4EDDC3CC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LRM", "LRM.csproj", "{26781e0a-1a67-f20f-caa4-70358928f5ad}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "where-allocations", "where-allocations.csproj", "{2EC220E0-BB60-197A-F116-EF587D3AE77F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Telepathy", "Telepathy.csproj", "{8c94d811-7988-2ebf-1cc0-26b574688e67}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mirror.Authenticators", "Mirror.Authenticators.csproj", "{78A60D52-D50E-5370-5E7F-1A7E3C90B70A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "kcp2k", "kcp2k.csproj", "{cf7f2fab-d83d-f366-f3b2-9d9e4eddc3cc}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Mirror.CodeGen", "Unity.Mirror.CodeGen.csproj", "{AD49B858-EAB7-01E4-5C5B-0056F4CEC462}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "where-allocations", "where-allocations.csproj", "{e020c22e-60bb-7a19-f116-ef587d3ae77f}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mirror.Editor", "Mirror.Editor.csproj", "{D933CB74-FAAA-6F4B-1603-B7B7C41EDD4C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mirror.Authenticators", "Mirror.Authenticators.csproj", "{520da678-0ed5-7053-5e7f-1a7e3c90b70a}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mirror.CompilerSymbols", "Mirror.CompilerSymbols.csproj", "{86E7D3E1-7361-3A5F-7812-807511D3F547}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Mirror.CodeGen", "Unity.Mirror.CodeGen.csproj", "{58b849ad-b7ea-e401-5c5b-0056f4cec462}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{994E7620-A232-3B61-C7BD-2B420A48759F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mirror.Editor", "Mirror.Editor.csproj", "{74cb33d9-aafa-4b6f-1603-b7b7c41edd4c}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mirror.CompilerSymbols", "Mirror.CompilerSymbols.csproj", "{e1d3e786-6173-5f3a-7812-807511d3f547}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.com.consulo.ide.Editor", "Unity.com.consulo.ide.Editor.csproj", "{f3918ae7-b834-5fa8-e000-01833c449c8e}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleMobileAds.Editor", "GoogleMobileAds.Editor.csproj", "{d679f8af-fbd3-35d5-0469-e80b52a245e7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{20764e99-32a2-613b-c7bd-2b420a48759f}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Whinarn.UnityMeshSimplifier.Editor", "Whinarn.UnityMeshSimplifier.Editor.csproj", "{9c3e4793-780d-e333-1ec5-d5e17feec6f2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{81D9F3F8-C93A-B7A8-EA43-2868619EFE2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81D9F3F8-C93A-B7A8-EA43-2868619EFE2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81D9F3F8-C93A-B7A8-EA43-2868619EFE2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81D9F3F8-C93A-B7A8-EA43-2868619EFE2A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8D7EEFF4-B499-02A2-8A27-32DCFCE49CFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D7EEFF4-B499-02A2-8A27-32DCFCE49CFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D7EEFF4-B499-02A2-8A27-32DCFCE49CFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8D7EEFF4-B499-02A2-8A27-32DCFCE49CFE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DAC71A6F-7D27-44EE-8547-E218C93F84DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DAC71A6F-7D27-44EE-8547-E218C93F84DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DAC71A6F-7D27-44EE-8547-E218C93F84DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DAC71A6F-7D27-44EE-8547-E218C93F84DF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0F8B44D9-56E4-8FCF-8285-980F3496DF94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0F8B44D9-56E4-8FCF-8285-980F3496DF94}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0F8B44D9-56E4-8FCF-8285-980F3496DF94}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0F8B44D9-56E4-8FCF-8285-980F3496DF94}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E7A80302-5562-0B7E-3CBF-ECAE2398312C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E7A80302-5562-0B7E-3CBF-ECAE2398312C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E7A80302-5562-0B7E-3CBF-ECAE2398312C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E7A80302-5562-0B7E-3CBF-ECAE2398312C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{11D8948C-8879-BF2E-1CC0-26B574688E67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{11D8948C-8879-BF2E-1CC0-26B574688E67}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11D8948C-8879-BF2E-1CC0-26B574688E67}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{11D8948C-8879-BF2E-1CC0-26B574688E67}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB2F7FCF-3DD8-66F3-F3B2-9D9E4EDDC3CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB2F7FCF-3DD8-66F3-F3B2-9D9E4EDDC3CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB2F7FCF-3DD8-66F3-F3B2-9D9E4EDDC3CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB2F7FCF-3DD8-66F3-F3B2-9D9E4EDDC3CC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2EC220E0-BB60-197A-F116-EF587D3AE77F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2EC220E0-BB60-197A-F116-EF587D3AE77F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2EC220E0-BB60-197A-F116-EF587D3AE77F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2EC220E0-BB60-197A-F116-EF587D3AE77F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{78A60D52-D50E-5370-5E7F-1A7E3C90B70A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{78A60D52-D50E-5370-5E7F-1A7E3C90B70A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{78A60D52-D50E-5370-5E7F-1A7E3C90B70A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{78A60D52-D50E-5370-5E7F-1A7E3C90B70A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AD49B858-EAB7-01E4-5C5B-0056F4CEC462}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AD49B858-EAB7-01E4-5C5B-0056F4CEC462}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AD49B858-EAB7-01E4-5C5B-0056F4CEC462}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AD49B858-EAB7-01E4-5C5B-0056F4CEC462}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D933CB74-FAAA-6F4B-1603-B7B7C41EDD4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D933CB74-FAAA-6F4B-1603-B7B7C41EDD4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D933CB74-FAAA-6F4B-1603-B7B7C41EDD4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D933CB74-FAAA-6F4B-1603-B7B7C41EDD4C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{86E7D3E1-7361-3A5F-7812-807511D3F547}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{86E7D3E1-7361-3A5F-7812-807511D3F547}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{86E7D3E1-7361-3A5F-7812-807511D3F547}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{86E7D3E1-7361-3A5F-7812-807511D3F547}.Release|Any CPU.Build.0 = Release|Any CPU
-		{994E7620-A232-3B61-C7BD-2B420A48759F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{994E7620-A232-3B61-C7BD-2B420A48759F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{994E7620-A232-3B61-C7BD-2B420A48759F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{994E7620-A232-3B61-C7BD-2B420A48759F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{f8f3d981-3ac9-a8b7-ea43-2868619efe2a}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{f8f3d981-3ac9-a8b7-ea43-2868619efe2a}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{f4ef7e8d-99b4-a202-8a27-32dcfce49cfe}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{f4ef7e8d-99b4-a202-8a27-32dcfce49cfe}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6f1ac7da-277d-ee44-8547-e218c93f84df}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6f1ac7da-277d-ee44-8547-e218c93f84df}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{d9448b0f-e456-cf8f-8285-980f3496df94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{d9448b0f-e456-cf8f-8285-980f3496df94}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{b99ffb8c-f6f2-f646-802e-7cb2e62d8c0c}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{b99ffb8c-f6f2-f646-802e-7cb2e62d8c0c}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0203a8e7-6255-7e0b-3cbf-ecae2398312c}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0203a8e7-6255-7e0b-3cbf-ecae2398312c}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26781e0a-1a67-f20f-caa4-70358928f5ad}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26781e0a-1a67-f20f-caa4-70358928f5ad}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8c94d811-7988-2ebf-1cc0-26b574688e67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8c94d811-7988-2ebf-1cc0-26b574688e67}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{cf7f2fab-d83d-f366-f3b2-9d9e4eddc3cc}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{cf7f2fab-d83d-f366-f3b2-9d9e4eddc3cc}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{e020c22e-60bb-7a19-f116-ef587d3ae77f}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{e020c22e-60bb-7a19-f116-ef587d3ae77f}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{520da678-0ed5-7053-5e7f-1a7e3c90b70a}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{520da678-0ed5-7053-5e7f-1a7e3c90b70a}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58b849ad-b7ea-e401-5c5b-0056f4cec462}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58b849ad-b7ea-e401-5c5b-0056f4cec462}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{74cb33d9-aafa-4b6f-1603-b7b7c41edd4c}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{74cb33d9-aafa-4b6f-1603-b7b7c41edd4c}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{e1d3e786-6173-5f3a-7812-807511d3f547}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{e1d3e786-6173-5f3a-7812-807511d3f547}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{f3918ae7-b834-5fa8-e000-01833c449c8e}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{f3918ae7-b834-5fa8-e000-01833c449c8e}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{d679f8af-fbd3-35d5-0469-e80b52a245e7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{d679f8af-fbd3-35d5-0469-e80b52a245e7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20764e99-32a2-613b-c7bd-2b420a48759f}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20764e99-32a2-613b-c7bd-2b420a48759f}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9c3e4793-780d-e333-1ec5-d5e17feec6f2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9c3e4793-780d-e333-1ec5-d5e17feec6f2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE