diff --git a/TouhouStation/.collabignore b/.collabignore similarity index 100% rename from TouhouStation/.collabignore rename to .collabignore diff --git a/TouhouStation/Assets/Art.meta b/Assets/Art.meta similarity index 100% rename from TouhouStation/Assets/Art.meta rename to Assets/Art.meta diff --git a/TouhouStation/Assets/Art/Characters.meta b/Assets/Art/Characters.meta similarity index 100% rename from TouhouStation/Assets/Art/Characters.meta rename to Assets/Art/Characters.meta diff --git a/TouhouStation/Assets/Art/Characters/Marisa.meta b/Assets/Art/Characters/Marisa.meta similarity index 100% rename from TouhouStation/Assets/Art/Characters/Marisa.meta rename to Assets/Art/Characters/Marisa.meta diff --git a/TouhouStation/Assets/Art/Characters/Marisa/marisa_idle-01.png b/Assets/Art/Characters/Marisa/marisa_idle-01.png similarity index 100% rename from TouhouStation/Assets/Art/Characters/Marisa/marisa_idle-01.png rename to Assets/Art/Characters/Marisa/marisa_idle-01.png diff --git a/TouhouStation/Assets/Art/Characters/Marisa/marisa_idle-01.png.meta b/Assets/Art/Characters/Marisa/marisa_idle-01.png.meta similarity index 100% rename from TouhouStation/Assets/Art/Characters/Marisa/marisa_idle-01.png.meta rename to Assets/Art/Characters/Marisa/marisa_idle-01.png.meta diff --git a/TouhouStation/Assets/Art/Characters/Marisa/marisa_idle-02.png b/Assets/Art/Characters/Marisa/marisa_idle-02.png similarity index 100% rename from TouhouStation/Assets/Art/Characters/Marisa/marisa_idle-02.png rename to Assets/Art/Characters/Marisa/marisa_idle-02.png diff --git a/TouhouStation/Assets/Art/Characters/Marisa/marisa_idle-02.png.meta b/Assets/Art/Characters/Marisa/marisa_idle-02.png.meta similarity index 100% rename from TouhouStation/Assets/Art/Characters/Marisa/marisa_idle-02.png.meta rename to Assets/Art/Characters/Marisa/marisa_idle-02.png.meta diff --git a/TouhouStation/Assets/Art/Characters/Marisa/marisa_idle-03.png b/Assets/Art/Characters/Marisa/marisa_idle-03.png similarity index 100% rename from TouhouStation/Assets/Art/Characters/Marisa/marisa_idle-03.png rename to Assets/Art/Characters/Marisa/marisa_idle-03.png diff --git a/TouhouStation/Assets/Art/Characters/Marisa/marisa_idle-03.png.meta b/Assets/Art/Characters/Marisa/marisa_idle-03.png.meta similarity index 100% rename from TouhouStation/Assets/Art/Characters/Marisa/marisa_idle-03.png.meta rename to Assets/Art/Characters/Marisa/marisa_idle-03.png.meta diff --git a/TouhouStation/Assets/Art/Characters/Marisa/marisa_idle-04.png b/Assets/Art/Characters/Marisa/marisa_idle-04.png similarity index 100% rename from TouhouStation/Assets/Art/Characters/Marisa/marisa_idle-04.png rename to Assets/Art/Characters/Marisa/marisa_idle-04.png diff --git a/TouhouStation/Assets/Art/Characters/Marisa/marisa_idle-04.png.meta b/Assets/Art/Characters/Marisa/marisa_idle-04.png.meta similarity index 100% rename from TouhouStation/Assets/Art/Characters/Marisa/marisa_idle-04.png.meta rename to Assets/Art/Characters/Marisa/marisa_idle-04.png.meta diff --git a/TouhouStation/Assets/Art/Characters/Niwatari.meta b/Assets/Art/Characters/Niwatari.meta similarity index 100% rename from TouhouStation/Assets/Art/Characters/Niwatari.meta rename to Assets/Art/Characters/Niwatari.meta diff --git a/TouhouStation/Assets/Art/Characters/Niwatari/niwatori_idle-01.png b/Assets/Art/Characters/Niwatari/niwatori_idle-01.png similarity index 100% rename from TouhouStation/Assets/Art/Characters/Niwatari/niwatori_idle-01.png rename to Assets/Art/Characters/Niwatari/niwatori_idle-01.png diff --git a/TouhouStation/Assets/Art/Characters/Niwatari/niwatori_idle-01.png.meta b/Assets/Art/Characters/Niwatari/niwatori_idle-01.png.meta similarity index 100% rename from TouhouStation/Assets/Art/Characters/Niwatari/niwatori_idle-01.png.meta rename to Assets/Art/Characters/Niwatari/niwatori_idle-01.png.meta diff --git a/TouhouStation/Assets/Art/Characters/Niwatari/niwatori_idle-02.png b/Assets/Art/Characters/Niwatari/niwatori_idle-02.png similarity index 100% rename from TouhouStation/Assets/Art/Characters/Niwatari/niwatori_idle-02.png rename to Assets/Art/Characters/Niwatari/niwatori_idle-02.png diff --git a/TouhouStation/Assets/Art/Characters/Niwatari/niwatori_idle-02.png.meta b/Assets/Art/Characters/Niwatari/niwatori_idle-02.png.meta similarity index 100% rename from TouhouStation/Assets/Art/Characters/Niwatari/niwatori_idle-02.png.meta rename to Assets/Art/Characters/Niwatari/niwatori_idle-02.png.meta diff --git a/TouhouStation/Assets/Art/Characters/Niwatari/niwatori_idle-03.png b/Assets/Art/Characters/Niwatari/niwatori_idle-03.png similarity index 100% rename from TouhouStation/Assets/Art/Characters/Niwatari/niwatori_idle-03.png rename to Assets/Art/Characters/Niwatari/niwatori_idle-03.png diff --git a/TouhouStation/Assets/Art/Characters/Niwatari/niwatori_idle-03.png.meta b/Assets/Art/Characters/Niwatari/niwatori_idle-03.png.meta similarity index 100% rename from TouhouStation/Assets/Art/Characters/Niwatari/niwatori_idle-03.png.meta rename to Assets/Art/Characters/Niwatari/niwatori_idle-03.png.meta diff --git a/TouhouStation/Assets/Art/Characters/Niwatari/niwatori_idle-04.png b/Assets/Art/Characters/Niwatari/niwatori_idle-04.png similarity index 100% rename from TouhouStation/Assets/Art/Characters/Niwatari/niwatori_idle-04.png rename to Assets/Art/Characters/Niwatari/niwatori_idle-04.png diff --git a/TouhouStation/Assets/Art/Characters/Niwatari/niwatori_idle-04.png.meta b/Assets/Art/Characters/Niwatari/niwatori_idle-04.png.meta similarity index 100% rename from TouhouStation/Assets/Art/Characters/Niwatari/niwatori_idle-04.png.meta rename to Assets/Art/Characters/Niwatari/niwatori_idle-04.png.meta diff --git a/TouhouStation/Assets/Art/Characters/Patchy.meta b/Assets/Art/Characters/Patchy.meta similarity index 100% rename from TouhouStation/Assets/Art/Characters/Patchy.meta rename to Assets/Art/Characters/Patchy.meta diff --git a/TouhouStation/Assets/Art/Characters/Patchy/patchouli_ani-001.png b/Assets/Art/Characters/Patchy/patchouli_ani-001.png similarity index 100% rename from TouhouStation/Assets/Art/Characters/Patchy/patchouli_ani-001.png rename to Assets/Art/Characters/Patchy/patchouli_ani-001.png diff --git a/TouhouStation/Assets/Art/Characters/Patchy/patchouli_ani-001.png.meta b/Assets/Art/Characters/Patchy/patchouli_ani-001.png.meta similarity index 100% rename from TouhouStation/Assets/Art/Characters/Patchy/patchouli_ani-001.png.meta rename to Assets/Art/Characters/Patchy/patchouli_ani-001.png.meta diff --git a/TouhouStation/Assets/Art/Characters/Patchy/patchouli_ani-002.png b/Assets/Art/Characters/Patchy/patchouli_ani-002.png similarity index 100% rename from TouhouStation/Assets/Art/Characters/Patchy/patchouli_ani-002.png rename to Assets/Art/Characters/Patchy/patchouli_ani-002.png diff --git a/TouhouStation/Assets/Art/Characters/Patchy/patchouli_ani-002.png.meta b/Assets/Art/Characters/Patchy/patchouli_ani-002.png.meta similarity index 100% rename from TouhouStation/Assets/Art/Characters/Patchy/patchouli_ani-002.png.meta rename to Assets/Art/Characters/Patchy/patchouli_ani-002.png.meta diff --git a/TouhouStation/Assets/Art/Tiles.meta b/Assets/Art/Tiles.meta similarity index 100% rename from TouhouStation/Assets/Art/Tiles.meta rename to Assets/Art/Tiles.meta diff --git a/TouhouStation/Assets/Art/Tiles/lantern_tiles-fire.png b/Assets/Art/Tiles/lantern_tiles-fire.png similarity index 100% rename from TouhouStation/Assets/Art/Tiles/lantern_tiles-fire.png rename to Assets/Art/Tiles/lantern_tiles-fire.png diff --git a/TouhouStation/Assets/Art/Tiles/lantern_tiles-fire.png.meta b/Assets/Art/Tiles/lantern_tiles-fire.png.meta similarity index 100% rename from TouhouStation/Assets/Art/Tiles/lantern_tiles-fire.png.meta rename to Assets/Art/Tiles/lantern_tiles-fire.png.meta diff --git a/TouhouStation/Assets/Art/Tiles/lantern_tiles-lit.png b/Assets/Art/Tiles/lantern_tiles-lit.png similarity index 100% rename from TouhouStation/Assets/Art/Tiles/lantern_tiles-lit.png rename to Assets/Art/Tiles/lantern_tiles-lit.png diff --git a/TouhouStation/Assets/Art/Tiles/lantern_tiles-lit.png.meta b/Assets/Art/Tiles/lantern_tiles-lit.png.meta similarity index 100% rename from TouhouStation/Assets/Art/Tiles/lantern_tiles-lit.png.meta rename to Assets/Art/Tiles/lantern_tiles-lit.png.meta diff --git a/TouhouStation/Assets/Art/Tiles/lantern_tiles.png b/Assets/Art/Tiles/lantern_tiles.png similarity index 100% rename from TouhouStation/Assets/Art/Tiles/lantern_tiles.png rename to Assets/Art/Tiles/lantern_tiles.png diff --git a/TouhouStation/Assets/Art/Tiles/lantern_tiles.png.meta b/Assets/Art/Tiles/lantern_tiles.png.meta similarity index 100% rename from TouhouStation/Assets/Art/Tiles/lantern_tiles.png.meta rename to Assets/Art/Tiles/lantern_tiles.png.meta diff --git a/TouhouStation/Assets/Art/bg_fireworks.png b/Assets/Art/bg_fireworks.png similarity index 100% rename from TouhouStation/Assets/Art/bg_fireworks.png rename to Assets/Art/bg_fireworks.png diff --git a/TouhouStation/Assets/Art/bg_fireworks.png.meta b/Assets/Art/bg_fireworks.png.meta similarity index 100% rename from TouhouStation/Assets/Art/bg_fireworks.png.meta rename to Assets/Art/bg_fireworks.png.meta diff --git a/TouhouStation/Assets/Art/bg_floor.png b/Assets/Art/bg_floor.png similarity index 100% rename from TouhouStation/Assets/Art/bg_floor.png rename to Assets/Art/bg_floor.png diff --git a/TouhouStation/Assets/Art/bg_floor.png.meta b/Assets/Art/bg_floor.png.meta similarity index 100% rename from TouhouStation/Assets/Art/bg_floor.png.meta rename to Assets/Art/bg_floor.png.meta diff --git a/TouhouStation/Assets/Art/bg_lanterns.png b/Assets/Art/bg_lanterns.png similarity index 100% rename from TouhouStation/Assets/Art/bg_lanterns.png rename to Assets/Art/bg_lanterns.png diff --git a/TouhouStation/Assets/Art/bg_lanterns.png.meta b/Assets/Art/bg_lanterns.png.meta similarity index 100% rename from TouhouStation/Assets/Art/bg_lanterns.png.meta rename to Assets/Art/bg_lanterns.png.meta diff --git a/TouhouStation/Assets/Art/bg_lanternstrings.png b/Assets/Art/bg_lanternstrings.png similarity index 100% rename from TouhouStation/Assets/Art/bg_lanternstrings.png rename to Assets/Art/bg_lanternstrings.png diff --git a/TouhouStation/Assets/Art/bg_lanternstrings.png.meta b/Assets/Art/bg_lanternstrings.png.meta similarity index 100% rename from TouhouStation/Assets/Art/bg_lanternstrings.png.meta rename to Assets/Art/bg_lanternstrings.png.meta diff --git a/TouhouStation/Assets/Art/bg_sky-withfireworks.png b/Assets/Art/bg_sky-withfireworks.png similarity index 100% rename from TouhouStation/Assets/Art/bg_sky-withfireworks.png rename to Assets/Art/bg_sky-withfireworks.png diff --git a/TouhouStation/Assets/Art/bg_sky-withfireworks.png.meta b/Assets/Art/bg_sky-withfireworks.png.meta similarity index 100% rename from TouhouStation/Assets/Art/bg_sky-withfireworks.png.meta rename to Assets/Art/bg_sky-withfireworks.png.meta diff --git a/TouhouStation/Assets/Art/bg_sky.png b/Assets/Art/bg_sky.png similarity index 100% rename from TouhouStation/Assets/Art/bg_sky.png rename to Assets/Art/bg_sky.png diff --git a/TouhouStation/Assets/Art/bg_sky.png.meta b/Assets/Art/bg_sky.png.meta similarity index 100% rename from TouhouStation/Assets/Art/bg_sky.png.meta rename to Assets/Art/bg_sky.png.meta diff --git a/TouhouStation/Assets/Art/bg_stalls.png b/Assets/Art/bg_stalls.png similarity index 100% rename from TouhouStation/Assets/Art/bg_stalls.png rename to Assets/Art/bg_stalls.png diff --git a/TouhouStation/Assets/Art/bg_stalls.png.meta b/Assets/Art/bg_stalls.png.meta similarity index 100% rename from TouhouStation/Assets/Art/bg_stalls.png.meta rename to Assets/Art/bg_stalls.png.meta diff --git a/TouhouStation/Assets/Art/marisa_placeholder.png b/Assets/Art/marisa_placeholder.png similarity index 100% rename from TouhouStation/Assets/Art/marisa_placeholder.png rename to Assets/Art/marisa_placeholder.png diff --git a/TouhouStation/Assets/Art/marisa_placeholder.png.meta b/Assets/Art/marisa_placeholder.png.meta similarity index 100% rename from TouhouStation/Assets/Art/marisa_placeholder.png.meta rename to Assets/Art/marisa_placeholder.png.meta diff --git a/TouhouStation/Assets/Art/menu_bg-foreground.png b/Assets/Art/menu_bg-foreground.png similarity index 100% rename from TouhouStation/Assets/Art/menu_bg-foreground.png rename to Assets/Art/menu_bg-foreground.png diff --git a/TouhouStation/Assets/Art/menu_bg-foreground.png.meta b/Assets/Art/menu_bg-foreground.png.meta similarity index 100% rename from TouhouStation/Assets/Art/menu_bg-foreground.png.meta rename to Assets/Art/menu_bg-foreground.png.meta diff --git a/TouhouStation/Assets/Art/menu_object.png b/Assets/Art/menu_object.png similarity index 100% rename from TouhouStation/Assets/Art/menu_object.png rename to Assets/Art/menu_object.png diff --git a/TouhouStation/Assets/Art/menu_object.png.meta b/Assets/Art/menu_object.png.meta similarity index 100% rename from TouhouStation/Assets/Art/menu_object.png.meta rename to Assets/Art/menu_object.png.meta diff --git a/Assets/Art/menu_ok-Z_noZ.png b/Assets/Art/menu_ok-Z_noZ.png new file mode 100644 index 0000000..5dac451 Binary files /dev/null and b/Assets/Art/menu_ok-Z_noZ.png differ diff --git a/TouhouStation/Assets/Art/menu_ok-Z_noZ.png.meta b/Assets/Art/menu_ok-Z_noZ.png.meta similarity index 100% rename from TouhouStation/Assets/Art/menu_ok-Z_noZ.png.meta rename to Assets/Art/menu_ok-Z_noZ.png.meta diff --git a/Assets/Art/menu_ok-Z_noZ_clear.png b/Assets/Art/menu_ok-Z_noZ_clear.png new file mode 100644 index 0000000..1ff983d Binary files /dev/null and b/Assets/Art/menu_ok-Z_noZ_clear.png differ diff --git a/TouhouStation/Assets/Scenes/Board Render/scoreOutlineSliced.png.meta b/Assets/Art/menu_ok-Z_noZ_clear.png.meta similarity index 69% rename from TouhouStation/Assets/Scenes/Board Render/scoreOutlineSliced.png.meta rename to Assets/Art/menu_ok-Z_noZ_clear.png.meta index daa1327..df34bf6 100644 --- a/TouhouStation/Assets/Scenes/Board Render/scoreOutlineSliced.png.meta +++ b/Assets/Art/menu_ok-Z_noZ_clear.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0069949e67b8cc44ba8ae3c8542f07b9 +guid: 1175f966d3318f544be9e6b10c22afdb TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 0 + filterMode: -1 aniso: -1 mipBias: -100 wrapU: 1 @@ -43,10 +43,10 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 3 - spritePivot: {x: 1, y: 1} - spritePixelsToUnits: 40 - spriteBorder: {x: 34, y: 0, z: 4, w: 0} + 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 @@ -70,30 +70,6 @@ TextureImporter: 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: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/TouhouStation/Assets/Art/menu_ok-Z_notext.png b/Assets/Art/menu_ok-Z_notext.png similarity index 100% rename from TouhouStation/Assets/Art/menu_ok-Z_notext.png rename to Assets/Art/menu_ok-Z_notext.png diff --git a/TouhouStation/Assets/Art/menu_ok-Z_notext.png.meta b/Assets/Art/menu_ok-Z_notext.png.meta similarity index 100% rename from TouhouStation/Assets/Art/menu_ok-Z_notext.png.meta rename to Assets/Art/menu_ok-Z_notext.png.meta diff --git a/Assets/Art/menu_white.png b/Assets/Art/menu_white.png new file mode 100644 index 0000000..fcae018 Binary files /dev/null and b/Assets/Art/menu_white.png differ diff --git a/Assets/Art/menu_white.png.meta b/Assets/Art/menu_white.png.meta new file mode 100644 index 0000000..da5c0cb --- /dev/null +++ b/Assets/Art/menu_white.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: c71d5ef618f4e50459a43fd880aa9638 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + 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: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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: diff --git a/TouhouStation/Assets/Art/niwatori_placeholder.png b/Assets/Art/niwatori_placeholder.png similarity index 100% rename from TouhouStation/Assets/Art/niwatori_placeholder.png rename to Assets/Art/niwatori_placeholder.png diff --git a/TouhouStation/Assets/Art/niwatori_placeholder.png.meta b/Assets/Art/niwatori_placeholder.png.meta similarity index 100% rename from TouhouStation/Assets/Art/niwatori_placeholder.png.meta rename to Assets/Art/niwatori_placeholder.png.meta diff --git a/TouhouStation/Assets/Art/patchouli_placeholder.png b/Assets/Art/patchouli_placeholder.png similarity index 100% rename from TouhouStation/Assets/Art/patchouli_placeholder.png rename to Assets/Art/patchouli_placeholder.png diff --git a/TouhouStation/Assets/Art/patchouli_placeholder.png.meta b/Assets/Art/patchouli_placeholder.png.meta similarity index 100% rename from TouhouStation/Assets/Art/patchouli_placeholder.png.meta rename to Assets/Art/patchouli_placeholder.png.meta diff --git a/TouhouStation/Assets/Audio.meta b/Assets/Audio.meta similarity index 100% rename from TouhouStation/Assets/Audio.meta rename to Assets/Audio.meta diff --git a/TouhouStation/Assets/Audio/Chicken.meta b/Assets/Audio/Chicken.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken.meta rename to Assets/Audio/Chicken.meta diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck1.wav b/Assets/Audio/Chicken/angrycluck1.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck1.wav rename to Assets/Audio/Chicken/angrycluck1.wav diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck1.wav.meta b/Assets/Audio/Chicken/angrycluck1.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck1.wav.meta rename to Assets/Audio/Chicken/angrycluck1.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck10.wav b/Assets/Audio/Chicken/angrycluck10.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck10.wav rename to Assets/Audio/Chicken/angrycluck10.wav diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck10.wav.meta b/Assets/Audio/Chicken/angrycluck10.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck10.wav.meta rename to Assets/Audio/Chicken/angrycluck10.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck11.wav b/Assets/Audio/Chicken/angrycluck11.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck11.wav rename to Assets/Audio/Chicken/angrycluck11.wav diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck11.wav.meta b/Assets/Audio/Chicken/angrycluck11.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck11.wav.meta rename to Assets/Audio/Chicken/angrycluck11.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck12.wav b/Assets/Audio/Chicken/angrycluck12.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck12.wav rename to Assets/Audio/Chicken/angrycluck12.wav diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck12.wav.meta b/Assets/Audio/Chicken/angrycluck12.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck12.wav.meta rename to Assets/Audio/Chicken/angrycluck12.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck13.wav b/Assets/Audio/Chicken/angrycluck13.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck13.wav rename to Assets/Audio/Chicken/angrycluck13.wav diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck13.wav.meta b/Assets/Audio/Chicken/angrycluck13.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck13.wav.meta rename to Assets/Audio/Chicken/angrycluck13.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck14.wav b/Assets/Audio/Chicken/angrycluck14.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck14.wav rename to Assets/Audio/Chicken/angrycluck14.wav diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck14.wav.meta b/Assets/Audio/Chicken/angrycluck14.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck14.wav.meta rename to Assets/Audio/Chicken/angrycluck14.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck15.wav b/Assets/Audio/Chicken/angrycluck15.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck15.wav rename to Assets/Audio/Chicken/angrycluck15.wav diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck15.wav.meta b/Assets/Audio/Chicken/angrycluck15.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck15.wav.meta rename to Assets/Audio/Chicken/angrycluck15.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck16.wav b/Assets/Audio/Chicken/angrycluck16.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck16.wav rename to Assets/Audio/Chicken/angrycluck16.wav diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck16.wav.meta b/Assets/Audio/Chicken/angrycluck16.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck16.wav.meta rename to Assets/Audio/Chicken/angrycluck16.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck17.wav b/Assets/Audio/Chicken/angrycluck17.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck17.wav rename to Assets/Audio/Chicken/angrycluck17.wav diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck17.wav.meta b/Assets/Audio/Chicken/angrycluck17.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck17.wav.meta rename to Assets/Audio/Chicken/angrycluck17.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck18.wav b/Assets/Audio/Chicken/angrycluck18.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck18.wav rename to Assets/Audio/Chicken/angrycluck18.wav diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck18.wav.meta b/Assets/Audio/Chicken/angrycluck18.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck18.wav.meta rename to Assets/Audio/Chicken/angrycluck18.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck2.wav b/Assets/Audio/Chicken/angrycluck2.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck2.wav rename to Assets/Audio/Chicken/angrycluck2.wav diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck2.wav.meta b/Assets/Audio/Chicken/angrycluck2.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck2.wav.meta rename to Assets/Audio/Chicken/angrycluck2.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck3.wav b/Assets/Audio/Chicken/angrycluck3.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck3.wav rename to Assets/Audio/Chicken/angrycluck3.wav diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck3.wav.meta b/Assets/Audio/Chicken/angrycluck3.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck3.wav.meta rename to Assets/Audio/Chicken/angrycluck3.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck4.wav b/Assets/Audio/Chicken/angrycluck4.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck4.wav rename to Assets/Audio/Chicken/angrycluck4.wav diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck4.wav.meta b/Assets/Audio/Chicken/angrycluck4.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck4.wav.meta rename to Assets/Audio/Chicken/angrycluck4.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck5.wav b/Assets/Audio/Chicken/angrycluck5.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck5.wav rename to Assets/Audio/Chicken/angrycluck5.wav diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck5.wav.meta b/Assets/Audio/Chicken/angrycluck5.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck5.wav.meta rename to Assets/Audio/Chicken/angrycluck5.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck6.wav b/Assets/Audio/Chicken/angrycluck6.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck6.wav rename to Assets/Audio/Chicken/angrycluck6.wav diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck6.wav.meta b/Assets/Audio/Chicken/angrycluck6.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck6.wav.meta rename to Assets/Audio/Chicken/angrycluck6.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck7.wav b/Assets/Audio/Chicken/angrycluck7.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck7.wav rename to Assets/Audio/Chicken/angrycluck7.wav diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck7.wav.meta b/Assets/Audio/Chicken/angrycluck7.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck7.wav.meta rename to Assets/Audio/Chicken/angrycluck7.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck8.wav b/Assets/Audio/Chicken/angrycluck8.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck8.wav rename to Assets/Audio/Chicken/angrycluck8.wav diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck8.wav.meta b/Assets/Audio/Chicken/angrycluck8.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck8.wav.meta rename to Assets/Audio/Chicken/angrycluck8.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck9.wav b/Assets/Audio/Chicken/angrycluck9.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck9.wav rename to Assets/Audio/Chicken/angrycluck9.wav diff --git a/TouhouStation/Assets/Audio/Chicken/angrycluck9.wav.meta b/Assets/Audio/Chicken/angrycluck9.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angrycluck9.wav.meta rename to Assets/Audio/Chicken/angrycluck9.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/angryloudcluck1.wav b/Assets/Audio/Chicken/angryloudcluck1.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angryloudcluck1.wav rename to Assets/Audio/Chicken/angryloudcluck1.wav diff --git a/TouhouStation/Assets/Audio/Chicken/angryloudcluck1.wav.meta b/Assets/Audio/Chicken/angryloudcluck1.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angryloudcluck1.wav.meta rename to Assets/Audio/Chicken/angryloudcluck1.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/angryloudcluck2.wav b/Assets/Audio/Chicken/angryloudcluck2.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angryloudcluck2.wav rename to Assets/Audio/Chicken/angryloudcluck2.wav diff --git a/TouhouStation/Assets/Audio/Chicken/angryloudcluck2.wav.meta b/Assets/Audio/Chicken/angryloudcluck2.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/angryloudcluck2.wav.meta rename to Assets/Audio/Chicken/angryloudcluck2.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/cluck1.wav b/Assets/Audio/Chicken/cluck1.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck1.wav rename to Assets/Audio/Chicken/cluck1.wav diff --git a/TouhouStation/Assets/Audio/Chicken/cluck1.wav.meta b/Assets/Audio/Chicken/cluck1.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck1.wav.meta rename to Assets/Audio/Chicken/cluck1.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/cluck10.wav b/Assets/Audio/Chicken/cluck10.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck10.wav rename to Assets/Audio/Chicken/cluck10.wav diff --git a/TouhouStation/Assets/Audio/Chicken/cluck10.wav.meta b/Assets/Audio/Chicken/cluck10.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck10.wav.meta rename to Assets/Audio/Chicken/cluck10.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/cluck11.wav b/Assets/Audio/Chicken/cluck11.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck11.wav rename to Assets/Audio/Chicken/cluck11.wav diff --git a/TouhouStation/Assets/Audio/Chicken/cluck11.wav.meta b/Assets/Audio/Chicken/cluck11.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck11.wav.meta rename to Assets/Audio/Chicken/cluck11.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/cluck12.wav b/Assets/Audio/Chicken/cluck12.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck12.wav rename to Assets/Audio/Chicken/cluck12.wav diff --git a/TouhouStation/Assets/Audio/Chicken/cluck12.wav.meta b/Assets/Audio/Chicken/cluck12.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck12.wav.meta rename to Assets/Audio/Chicken/cluck12.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/cluck13.wav b/Assets/Audio/Chicken/cluck13.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck13.wav rename to Assets/Audio/Chicken/cluck13.wav diff --git a/TouhouStation/Assets/Audio/Chicken/cluck13.wav.meta b/Assets/Audio/Chicken/cluck13.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck13.wav.meta rename to Assets/Audio/Chicken/cluck13.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/cluck14.wav b/Assets/Audio/Chicken/cluck14.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck14.wav rename to Assets/Audio/Chicken/cluck14.wav diff --git a/TouhouStation/Assets/Audio/Chicken/cluck14.wav.meta b/Assets/Audio/Chicken/cluck14.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck14.wav.meta rename to Assets/Audio/Chicken/cluck14.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/cluck15.wav b/Assets/Audio/Chicken/cluck15.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck15.wav rename to Assets/Audio/Chicken/cluck15.wav diff --git a/TouhouStation/Assets/Audio/Chicken/cluck15.wav.meta b/Assets/Audio/Chicken/cluck15.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck15.wav.meta rename to Assets/Audio/Chicken/cluck15.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/cluck16.wav b/Assets/Audio/Chicken/cluck16.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck16.wav rename to Assets/Audio/Chicken/cluck16.wav diff --git a/TouhouStation/Assets/Audio/Chicken/cluck16.wav.meta b/Assets/Audio/Chicken/cluck16.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck16.wav.meta rename to Assets/Audio/Chicken/cluck16.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/cluck17.wav b/Assets/Audio/Chicken/cluck17.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck17.wav rename to Assets/Audio/Chicken/cluck17.wav diff --git a/TouhouStation/Assets/Audio/Chicken/cluck17.wav.meta b/Assets/Audio/Chicken/cluck17.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck17.wav.meta rename to Assets/Audio/Chicken/cluck17.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/cluck18.wav b/Assets/Audio/Chicken/cluck18.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck18.wav rename to Assets/Audio/Chicken/cluck18.wav diff --git a/TouhouStation/Assets/Audio/Chicken/cluck18.wav.meta b/Assets/Audio/Chicken/cluck18.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck18.wav.meta rename to Assets/Audio/Chicken/cluck18.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/cluck2.wav b/Assets/Audio/Chicken/cluck2.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck2.wav rename to Assets/Audio/Chicken/cluck2.wav diff --git a/TouhouStation/Assets/Audio/Chicken/cluck2.wav.meta b/Assets/Audio/Chicken/cluck2.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck2.wav.meta rename to Assets/Audio/Chicken/cluck2.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/cluck3.wav b/Assets/Audio/Chicken/cluck3.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck3.wav rename to Assets/Audio/Chicken/cluck3.wav diff --git a/TouhouStation/Assets/Audio/Chicken/cluck3.wav.meta b/Assets/Audio/Chicken/cluck3.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck3.wav.meta rename to Assets/Audio/Chicken/cluck3.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/cluck4.wav b/Assets/Audio/Chicken/cluck4.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck4.wav rename to Assets/Audio/Chicken/cluck4.wav diff --git a/TouhouStation/Assets/Audio/Chicken/cluck4.wav.meta b/Assets/Audio/Chicken/cluck4.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck4.wav.meta rename to Assets/Audio/Chicken/cluck4.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/cluck5.wav b/Assets/Audio/Chicken/cluck5.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck5.wav rename to Assets/Audio/Chicken/cluck5.wav diff --git a/TouhouStation/Assets/Audio/Chicken/cluck5.wav.meta b/Assets/Audio/Chicken/cluck5.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck5.wav.meta rename to Assets/Audio/Chicken/cluck5.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/cluck6.wav b/Assets/Audio/Chicken/cluck6.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck6.wav rename to Assets/Audio/Chicken/cluck6.wav diff --git a/TouhouStation/Assets/Audio/Chicken/cluck6.wav.meta b/Assets/Audio/Chicken/cluck6.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck6.wav.meta rename to Assets/Audio/Chicken/cluck6.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/cluck7.wav b/Assets/Audio/Chicken/cluck7.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck7.wav rename to Assets/Audio/Chicken/cluck7.wav diff --git a/TouhouStation/Assets/Audio/Chicken/cluck7.wav.meta b/Assets/Audio/Chicken/cluck7.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck7.wav.meta rename to Assets/Audio/Chicken/cluck7.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/cluck8.wav b/Assets/Audio/Chicken/cluck8.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck8.wav rename to Assets/Audio/Chicken/cluck8.wav diff --git a/TouhouStation/Assets/Audio/Chicken/cluck8.wav.meta b/Assets/Audio/Chicken/cluck8.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck8.wav.meta rename to Assets/Audio/Chicken/cluck8.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/cluck9.wav b/Assets/Audio/Chicken/cluck9.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck9.wav rename to Assets/Audio/Chicken/cluck9.wav diff --git a/TouhouStation/Assets/Audio/Chicken/cluck9.wav.meta b/Assets/Audio/Chicken/cluck9.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/cluck9.wav.meta rename to Assets/Audio/Chicken/cluck9.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/loudcluck1.wav b/Assets/Audio/Chicken/loudcluck1.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/loudcluck1.wav rename to Assets/Audio/Chicken/loudcluck1.wav diff --git a/TouhouStation/Assets/Audio/Chicken/loudcluck1.wav.meta b/Assets/Audio/Chicken/loudcluck1.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/loudcluck1.wav.meta rename to Assets/Audio/Chicken/loudcluck1.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/loudcluck2.wav b/Assets/Audio/Chicken/loudcluck2.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/loudcluck2.wav rename to Assets/Audio/Chicken/loudcluck2.wav diff --git a/TouhouStation/Assets/Audio/Chicken/loudcluck2.wav.meta b/Assets/Audio/Chicken/loudcluck2.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/loudcluck2.wav.meta rename to Assets/Audio/Chicken/loudcluck2.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/loudcluck3.wav b/Assets/Audio/Chicken/loudcluck3.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/loudcluck3.wav rename to Assets/Audio/Chicken/loudcluck3.wav diff --git a/TouhouStation/Assets/Audio/Chicken/loudcluck3.wav.meta b/Assets/Audio/Chicken/loudcluck3.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/loudcluck3.wav.meta rename to Assets/Audio/Chicken/loudcluck3.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/loudcluck4.wav b/Assets/Audio/Chicken/loudcluck4.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/loudcluck4.wav rename to Assets/Audio/Chicken/loudcluck4.wav diff --git a/TouhouStation/Assets/Audio/Chicken/loudcluck4.wav.meta b/Assets/Audio/Chicken/loudcluck4.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/loudcluck4.wav.meta rename to Assets/Audio/Chicken/loudcluck4.wav.meta diff --git a/TouhouStation/Assets/Audio/Chicken/loudcluck5.wav b/Assets/Audio/Chicken/loudcluck5.wav similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/loudcluck5.wav rename to Assets/Audio/Chicken/loudcluck5.wav diff --git a/TouhouStation/Assets/Audio/Chicken/loudcluck5.wav.meta b/Assets/Audio/Chicken/loudcluck5.wav.meta similarity index 100% rename from TouhouStation/Assets/Audio/Chicken/loudcluck5.wav.meta rename to Assets/Audio/Chicken/loudcluck5.wav.meta diff --git a/TouhouStation/Assets/Audio/og.meta b/Assets/Audio/og.meta similarity index 100% rename from TouhouStation/Assets/Audio/og.meta rename to Assets/Audio/og.meta diff --git a/TouhouStation/Assets/Audio/og/Angry-chicken.mp3 b/Assets/Audio/og/Angry-chicken.mp3 similarity index 100% rename from TouhouStation/Assets/Audio/og/Angry-chicken.mp3 rename to Assets/Audio/og/Angry-chicken.mp3 diff --git a/TouhouStation/Assets/Audio/og/Angry-chicken.mp3.meta b/Assets/Audio/og/Angry-chicken.mp3.meta similarity index 100% rename from TouhouStation/Assets/Audio/og/Angry-chicken.mp3.meta rename to Assets/Audio/og/Angry-chicken.mp3.meta diff --git a/TouhouStation/Assets/Audio/og/Chicken-noises.mp3 b/Assets/Audio/og/Chicken-noises.mp3 similarity index 100% rename from TouhouStation/Assets/Audio/og/Chicken-noises.mp3 rename to Assets/Audio/og/Chicken-noises.mp3 diff --git a/TouhouStation/Assets/Audio/og/Chicken-noises.mp3.meta b/Assets/Audio/og/Chicken-noises.mp3.meta similarity index 100% rename from TouhouStation/Assets/Audio/og/Chicken-noises.mp3.meta rename to Assets/Audio/og/Chicken-noises.mp3.meta diff --git a/TouhouStation/Assets/Audio/og/Read.txt b/Assets/Audio/og/Read.txt similarity index 100% rename from TouhouStation/Assets/Audio/og/Read.txt rename to Assets/Audio/og/Read.txt diff --git a/TouhouStation/Assets/Audio/og/Read.txt.meta b/Assets/Audio/og/Read.txt.meta similarity index 100% rename from TouhouStation/Assets/Audio/og/Read.txt.meta rename to Assets/Audio/og/Read.txt.meta diff --git a/TouhouStation/Assets/Code.meta b/Assets/Code.meta similarity index 100% rename from TouhouStation/Assets/Code.meta rename to Assets/Code.meta diff --git a/TouhouStation/Assets/Code/Localization.meta b/Assets/Code/Localization.meta similarity index 100% rename from TouhouStation/Assets/Code/Localization.meta rename to Assets/Code/Localization.meta diff --git a/TouhouStation/Assets/Code/Localization/Editor.meta b/Assets/Code/Localization/Editor.meta similarity index 100% rename from TouhouStation/Assets/Code/Localization/Editor.meta rename to Assets/Code/Localization/Editor.meta diff --git a/TouhouStation/Assets/Code/Localization/Editor/GoogleSheetsHelper.cs b/Assets/Code/Localization/Editor/GoogleSheetsHelper.cs similarity index 100% rename from TouhouStation/Assets/Code/Localization/Editor/GoogleSheetsHelper.cs rename to Assets/Code/Localization/Editor/GoogleSheetsHelper.cs diff --git a/TouhouStation/Assets/Code/Localization/Editor/GoogleSheetsHelper.cs.meta b/Assets/Code/Localization/Editor/GoogleSheetsHelper.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Localization/Editor/GoogleSheetsHelper.cs.meta rename to Assets/Code/Localization/Editor/GoogleSheetsHelper.cs.meta diff --git a/TouhouStation/Assets/Code/Localization/Editor/LocalizationEditorWindow.cs b/Assets/Code/Localization/Editor/LocalizationEditorWindow.cs similarity index 100% rename from TouhouStation/Assets/Code/Localization/Editor/LocalizationEditorWindow.cs rename to Assets/Code/Localization/Editor/LocalizationEditorWindow.cs diff --git a/TouhouStation/Assets/Code/Localization/Editor/LocalizationEditorWindow.cs.meta b/Assets/Code/Localization/Editor/LocalizationEditorWindow.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Localization/Editor/LocalizationEditorWindow.cs.meta rename to Assets/Code/Localization/Editor/LocalizationEditorWindow.cs.meta diff --git a/TouhouStation/Assets/Code/Localization/Editor/clients_secrets.json b/Assets/Code/Localization/Editor/clients_secrets.json similarity index 100% rename from TouhouStation/Assets/Code/Localization/Editor/clients_secrets.json rename to Assets/Code/Localization/Editor/clients_secrets.json diff --git a/TouhouStation/Assets/Code/Localization/Editor/clients_secrets.json.meta b/Assets/Code/Localization/Editor/clients_secrets.json.meta similarity index 100% rename from TouhouStation/Assets/Code/Localization/Editor/clients_secrets.json.meta rename to Assets/Code/Localization/Editor/clients_secrets.json.meta diff --git a/TouhouStation/Assets/Code/Localization/Localization.cs b/Assets/Code/Localization/Localization.cs similarity index 100% rename from TouhouStation/Assets/Code/Localization/Localization.cs rename to Assets/Code/Localization/Localization.cs diff --git a/TouhouStation/Assets/Code/Localization/Localization.cs.meta b/Assets/Code/Localization/Localization.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Localization/Localization.cs.meta rename to Assets/Code/Localization/Localization.cs.meta diff --git a/TouhouStation/Assets/Code/Localization/LocalizationButtonInjector.cs b/Assets/Code/Localization/LocalizationButtonInjector.cs similarity index 82% rename from TouhouStation/Assets/Code/Localization/LocalizationButtonInjector.cs rename to Assets/Code/Localization/LocalizationButtonInjector.cs index 338e11c..4aa92f5 100644 --- a/TouhouStation/Assets/Code/Localization/LocalizationButtonInjector.cs +++ b/Assets/Code/Localization/LocalizationButtonInjector.cs @@ -14,6 +14,6 @@ public class LocalizationButtonInjector : MonoBehaviour { } public void UpdateText() { - text.text = Localization.GetString(key); + text.text = Localization.GetString(key).Replace("\\n", "\n"); } } diff --git a/TouhouStation/Assets/Code/Localization/LocalizationButtonInjector.cs.meta b/Assets/Code/Localization/LocalizationButtonInjector.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Localization/LocalizationButtonInjector.cs.meta rename to Assets/Code/Localization/LocalizationButtonInjector.cs.meta diff --git a/TouhouStation/Assets/Code/Networking.meta b/Assets/Code/Networking.meta similarity index 100% rename from TouhouStation/Assets/Code/Networking.meta rename to Assets/Code/Networking.meta diff --git a/TouhouStation/Assets/Code/Networking/Entity.meta b/Assets/Code/Networking/Entity.meta similarity index 100% rename from TouhouStation/Assets/Code/Networking/Entity.meta rename to Assets/Code/Networking/Entity.meta diff --git a/TouhouStation/Assets/Code/Networking/Entity/EntityBase.cs b/Assets/Code/Networking/Entity/EntityBase.cs similarity index 100% rename from TouhouStation/Assets/Code/Networking/Entity/EntityBase.cs rename to Assets/Code/Networking/Entity/EntityBase.cs diff --git a/TouhouStation/Assets/Code/Networking/Entity/EntityBase.cs.meta b/Assets/Code/Networking/Entity/EntityBase.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Networking/Entity/EntityBase.cs.meta rename to Assets/Code/Networking/Entity/EntityBase.cs.meta diff --git a/TouhouStation/Assets/Code/Networking/Entity/EntityManager.cs b/Assets/Code/Networking/Entity/EntityManager.cs similarity index 100% rename from TouhouStation/Assets/Code/Networking/Entity/EntityManager.cs rename to Assets/Code/Networking/Entity/EntityManager.cs diff --git a/TouhouStation/Assets/Code/Networking/Entity/EntityManager.cs.meta b/Assets/Code/Networking/Entity/EntityManager.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Networking/Entity/EntityManager.cs.meta rename to Assets/Code/Networking/Entity/EntityManager.cs.meta diff --git a/TouhouStation/Assets/Code/Networking/Helpers.meta b/Assets/Code/Networking/Helpers.meta similarity index 100% rename from TouhouStation/Assets/Code/Networking/Helpers.meta rename to Assets/Code/Networking/Helpers.meta diff --git a/TouhouStation/Assets/Code/Networking/Helpers/HashtableExtension.cs b/Assets/Code/Networking/Helpers/HashtableExtension.cs similarity index 100% rename from TouhouStation/Assets/Code/Networking/Helpers/HashtableExtension.cs rename to Assets/Code/Networking/Helpers/HashtableExtension.cs diff --git a/TouhouStation/Assets/Code/Networking/Helpers/HashtableExtension.cs.meta b/Assets/Code/Networking/Helpers/HashtableExtension.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Networking/Helpers/HashtableExtension.cs.meta rename to Assets/Code/Networking/Helpers/HashtableExtension.cs.meta diff --git a/TouhouStation/Assets/Code/Networking/Helpers/PhotonConstants.cs b/Assets/Code/Networking/Helpers/PhotonConstants.cs similarity index 100% rename from TouhouStation/Assets/Code/Networking/Helpers/PhotonConstants.cs rename to Assets/Code/Networking/Helpers/PhotonConstants.cs diff --git a/TouhouStation/Assets/Code/Networking/Helpers/PhotonConstants.cs.meta b/Assets/Code/Networking/Helpers/PhotonConstants.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Networking/Helpers/PhotonConstants.cs.meta rename to Assets/Code/Networking/Helpers/PhotonConstants.cs.meta diff --git a/TouhouStation/Assets/Code/Networking/Helpers/StreamCustomTypes.cs b/Assets/Code/Networking/Helpers/StreamCustomTypes.cs similarity index 100% rename from TouhouStation/Assets/Code/Networking/Helpers/StreamCustomTypes.cs rename to Assets/Code/Networking/Helpers/StreamCustomTypes.cs diff --git a/TouhouStation/Assets/Code/Networking/Helpers/StreamCustomTypes.cs.meta b/Assets/Code/Networking/Helpers/StreamCustomTypes.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Networking/Helpers/StreamCustomTypes.cs.meta rename to Assets/Code/Networking/Helpers/StreamCustomTypes.cs.meta diff --git a/TouhouStation/Assets/Code/Networking/NetProperties.meta b/Assets/Code/Networking/NetProperties.meta similarity index 100% rename from TouhouStation/Assets/Code/Networking/NetProperties.meta rename to Assets/Code/Networking/NetProperties.meta diff --git a/TouhouStation/Assets/Code/Networking/NetProperties/PlayerProperties.cs b/Assets/Code/Networking/NetProperties/PlayerProperties.cs similarity index 100% rename from TouhouStation/Assets/Code/Networking/NetProperties/PlayerProperties.cs rename to Assets/Code/Networking/NetProperties/PlayerProperties.cs diff --git a/TouhouStation/Assets/Code/Networking/NetProperties/PlayerProperties.cs.meta b/Assets/Code/Networking/NetProperties/PlayerProperties.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Networking/NetProperties/PlayerProperties.cs.meta rename to Assets/Code/Networking/NetProperties/PlayerProperties.cs.meta diff --git a/TouhouStation/Assets/Code/Networking/NetProperties/RoomProperties.cs b/Assets/Code/Networking/NetProperties/RoomProperties.cs similarity index 100% rename from TouhouStation/Assets/Code/Networking/NetProperties/RoomProperties.cs rename to Assets/Code/Networking/NetProperties/RoomProperties.cs diff --git a/TouhouStation/Assets/Code/Networking/NetProperties/RoomProperties.cs.meta b/Assets/Code/Networking/NetProperties/RoomProperties.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Networking/NetProperties/RoomProperties.cs.meta rename to Assets/Code/Networking/NetProperties/RoomProperties.cs.meta diff --git a/TouhouStation/Assets/Code/Networking/NetworkManager.cs b/Assets/Code/Networking/NetworkManager.cs similarity index 100% rename from TouhouStation/Assets/Code/Networking/NetworkManager.cs rename to Assets/Code/Networking/NetworkManager.cs diff --git a/TouhouStation/Assets/Code/Networking/NetworkManager.cs.meta b/Assets/Code/Networking/NetworkManager.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Networking/NetworkManager.cs.meta rename to Assets/Code/Networking/NetworkManager.cs.meta diff --git a/TouhouStation/Assets/Code/Networking/NetworkManagerDebug.cs b/Assets/Code/Networking/NetworkManagerDebug.cs similarity index 100% rename from TouhouStation/Assets/Code/Networking/NetworkManagerDebug.cs rename to Assets/Code/Networking/NetworkManagerDebug.cs diff --git a/TouhouStation/Assets/Code/Networking/NetworkManagerDebug.cs.meta b/Assets/Code/Networking/NetworkManagerDebug.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Networking/NetworkManagerDebug.cs.meta rename to Assets/Code/Networking/NetworkManagerDebug.cs.meta diff --git a/TouhouStation/Assets/Code/Networking/NetworkManagerDummy.prefab b/Assets/Code/Networking/NetworkManagerDummy.prefab similarity index 100% rename from TouhouStation/Assets/Code/Networking/NetworkManagerDummy.prefab rename to Assets/Code/Networking/NetworkManagerDummy.prefab diff --git a/TouhouStation/Assets/Code/Networking/NetworkManagerDummy.prefab.meta b/Assets/Code/Networking/NetworkManagerDummy.prefab.meta similarity index 100% rename from TouhouStation/Assets/Code/Networking/NetworkManagerDummy.prefab.meta rename to Assets/Code/Networking/NetworkManagerDummy.prefab.meta diff --git a/TouhouStation/Assets/Code/Networking/QuickJoin.cs b/Assets/Code/Networking/QuickJoin.cs similarity index 100% rename from TouhouStation/Assets/Code/Networking/QuickJoin.cs rename to Assets/Code/Networking/QuickJoin.cs diff --git a/TouhouStation/Assets/Code/Networking/QuickJoin.cs.meta b/Assets/Code/Networking/QuickJoin.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Networking/QuickJoin.cs.meta rename to Assets/Code/Networking/QuickJoin.cs.meta diff --git a/TouhouStation/Assets/Code/Networking/RoomCode.prefab b/Assets/Code/Networking/RoomCode.prefab similarity index 100% rename from TouhouStation/Assets/Code/Networking/RoomCode.prefab rename to Assets/Code/Networking/RoomCode.prefab diff --git a/TouhouStation/Assets/Code/Networking/RoomCode.prefab.meta b/Assets/Code/Networking/RoomCode.prefab.meta similarity index 100% rename from TouhouStation/Assets/Code/Networking/RoomCode.prefab.meta rename to Assets/Code/Networking/RoomCode.prefab.meta diff --git a/TouhouStation/Assets/Code/Networking/RoomCodeDisplay.cs b/Assets/Code/Networking/RoomCodeDisplay.cs similarity index 100% rename from TouhouStation/Assets/Code/Networking/RoomCodeDisplay.cs rename to Assets/Code/Networking/RoomCodeDisplay.cs diff --git a/TouhouStation/Assets/Code/Networking/RoomCodeDisplay.cs.meta b/Assets/Code/Networking/RoomCodeDisplay.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Networking/RoomCodeDisplay.cs.meta rename to Assets/Code/Networking/RoomCodeDisplay.cs.meta diff --git a/TouhouStation/Assets/Code/Photon.meta b/Assets/Code/Photon.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon.meta rename to Assets/Code/Photon.meta diff --git a/TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi.meta b/Assets/Code/Photon/PhotonLoadbalancingApi.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi.meta rename to Assets/Code/Photon/PhotonLoadbalancingApi.meta diff --git a/TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/Extensions.cs b/Assets/Code/Photon/PhotonLoadbalancingApi/Extensions.cs similarity index 100% rename from TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/Extensions.cs rename to Assets/Code/Photon/PhotonLoadbalancingApi/Extensions.cs diff --git a/TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/Extensions.cs.meta b/Assets/Code/Photon/PhotonLoadbalancingApi/Extensions.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/Extensions.cs.meta rename to Assets/Code/Photon/PhotonLoadbalancingApi/Extensions.cs.meta diff --git a/TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/FriendInfo.cs b/Assets/Code/Photon/PhotonLoadbalancingApi/FriendInfo.cs similarity index 100% rename from TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/FriendInfo.cs rename to Assets/Code/Photon/PhotonLoadbalancingApi/FriendInfo.cs diff --git a/TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/FriendInfo.cs.meta b/Assets/Code/Photon/PhotonLoadbalancingApi/FriendInfo.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/FriendInfo.cs.meta rename to Assets/Code/Photon/PhotonLoadbalancingApi/FriendInfo.cs.meta diff --git a/TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/LoadBalancingClient.cs b/Assets/Code/Photon/PhotonLoadbalancingApi/LoadBalancingClient.cs similarity index 100% rename from TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/LoadBalancingClient.cs rename to Assets/Code/Photon/PhotonLoadbalancingApi/LoadBalancingClient.cs diff --git a/TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/LoadBalancingClient.cs.meta b/Assets/Code/Photon/PhotonLoadbalancingApi/LoadBalancingClient.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/LoadBalancingClient.cs.meta rename to Assets/Code/Photon/PhotonLoadbalancingApi/LoadBalancingClient.cs.meta diff --git a/TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/LoadBalancingPeer.cs b/Assets/Code/Photon/PhotonLoadbalancingApi/LoadBalancingPeer.cs similarity index 100% rename from TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/LoadBalancingPeer.cs rename to Assets/Code/Photon/PhotonLoadbalancingApi/LoadBalancingPeer.cs diff --git a/TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/LoadBalancingPeer.cs.meta b/Assets/Code/Photon/PhotonLoadbalancingApi/LoadBalancingPeer.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/LoadBalancingPeer.cs.meta rename to Assets/Code/Photon/PhotonLoadbalancingApi/LoadBalancingPeer.cs.meta diff --git a/TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/Player.cs b/Assets/Code/Photon/PhotonLoadbalancingApi/Player.cs similarity index 100% rename from TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/Player.cs rename to Assets/Code/Photon/PhotonLoadbalancingApi/Player.cs diff --git a/TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/Player.cs.meta b/Assets/Code/Photon/PhotonLoadbalancingApi/Player.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/Player.cs.meta rename to Assets/Code/Photon/PhotonLoadbalancingApi/Player.cs.meta diff --git a/TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/Room.cs b/Assets/Code/Photon/PhotonLoadbalancingApi/Room.cs similarity index 100% rename from TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/Room.cs rename to Assets/Code/Photon/PhotonLoadbalancingApi/Room.cs diff --git a/TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/Room.cs.meta b/Assets/Code/Photon/PhotonLoadbalancingApi/Room.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/Room.cs.meta rename to Assets/Code/Photon/PhotonLoadbalancingApi/Room.cs.meta diff --git a/TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/RoomInfo.cs b/Assets/Code/Photon/PhotonLoadbalancingApi/RoomInfo.cs similarity index 100% rename from TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/RoomInfo.cs rename to Assets/Code/Photon/PhotonLoadbalancingApi/RoomInfo.cs diff --git a/TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/RoomInfo.cs.meta b/Assets/Code/Photon/PhotonLoadbalancingApi/RoomInfo.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/RoomInfo.cs.meta rename to Assets/Code/Photon/PhotonLoadbalancingApi/RoomInfo.cs.meta diff --git a/TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/WebRpc.cs b/Assets/Code/Photon/PhotonLoadbalancingApi/WebRpc.cs similarity index 100% rename from TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/WebRpc.cs rename to Assets/Code/Photon/PhotonLoadbalancingApi/WebRpc.cs diff --git a/TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/WebRpc.cs.meta b/Assets/Code/Photon/PhotonLoadbalancingApi/WebRpc.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/PhotonLoadbalancingApi/WebRpc.cs.meta rename to Assets/Code/Photon/PhotonLoadbalancingApi/WebRpc.cs.meta diff --git a/TouhouStation/Assets/Code/Photon/Plugins.meta b/Assets/Code/Photon/Plugins.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins.meta rename to Assets/Code/Photon/Plugins.meta diff --git a/TouhouStation/Assets/Code/Photon/Plugins/Photon3Unity3D.dll b/Assets/Code/Photon/Plugins/Photon3Unity3D.dll similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/Photon3Unity3D.dll rename to Assets/Code/Photon/Plugins/Photon3Unity3D.dll diff --git a/TouhouStation/Assets/Code/Photon/Plugins/Photon3Unity3D.dll.meta b/Assets/Code/Photon/Plugins/Photon3Unity3D.dll.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/Photon3Unity3D.dll.meta rename to Assets/Code/Photon/Plugins/Photon3Unity3D.dll.meta diff --git a/TouhouStation/Assets/Code/Photon/Plugins/Photon3Unity3D.xml b/Assets/Code/Photon/Plugins/Photon3Unity3D.xml similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/Photon3Unity3D.xml rename to Assets/Code/Photon/Plugins/Photon3Unity3D.xml diff --git a/TouhouStation/Assets/Code/Photon/Plugins/Photon3Unity3D.xml.meta b/Assets/Code/Photon/Plugins/Photon3Unity3D.xml.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/Photon3Unity3D.xml.meta rename to Assets/Code/Photon/Plugins/Photon3Unity3D.xml.meta diff --git a/TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket.meta b/Assets/Code/Photon/Plugins/PhotonWebSocket.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket.meta rename to Assets/Code/Photon/Plugins/PhotonWebSocket.meta diff --git a/TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/PingHttp.cs b/Assets/Code/Photon/Plugins/PhotonWebSocket/PingHttp.cs similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/PingHttp.cs rename to Assets/Code/Photon/Plugins/PhotonWebSocket/PingHttp.cs diff --git a/TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/PingHttp.cs.meta b/Assets/Code/Photon/Plugins/PhotonWebSocket/PingHttp.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/PingHttp.cs.meta rename to Assets/Code/Photon/Plugins/PhotonWebSocket/PingHttp.cs.meta diff --git a/TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/Readme-Photon-WebSocket.txt b/Assets/Code/Photon/Plugins/PhotonWebSocket/Readme-Photon-WebSocket.txt similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/Readme-Photon-WebSocket.txt rename to Assets/Code/Photon/Plugins/PhotonWebSocket/Readme-Photon-WebSocket.txt diff --git a/TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/Readme-Photon-WebSocket.txt.meta b/Assets/Code/Photon/Plugins/PhotonWebSocket/Readme-Photon-WebSocket.txt.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/Readme-Photon-WebSocket.txt.meta rename to Assets/Code/Photon/Plugins/PhotonWebSocket/Readme-Photon-WebSocket.txt.meta diff --git a/TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/SocketWebTcpCoroutine.cs b/Assets/Code/Photon/Plugins/PhotonWebSocket/SocketWebTcpCoroutine.cs similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/SocketWebTcpCoroutine.cs rename to Assets/Code/Photon/Plugins/PhotonWebSocket/SocketWebTcpCoroutine.cs diff --git a/TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/SocketWebTcpCoroutine.cs.meta b/Assets/Code/Photon/Plugins/PhotonWebSocket/SocketWebTcpCoroutine.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/SocketWebTcpCoroutine.cs.meta rename to Assets/Code/Photon/Plugins/PhotonWebSocket/SocketWebTcpCoroutine.cs.meta diff --git a/TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/SocketWebTcpThread.cs b/Assets/Code/Photon/Plugins/PhotonWebSocket/SocketWebTcpThread.cs similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/SocketWebTcpThread.cs rename to Assets/Code/Photon/Plugins/PhotonWebSocket/SocketWebTcpThread.cs diff --git a/TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/SocketWebTcpThread.cs.meta b/Assets/Code/Photon/Plugins/PhotonWebSocket/SocketWebTcpThread.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/SocketWebTcpThread.cs.meta rename to Assets/Code/Photon/Plugins/PhotonWebSocket/SocketWebTcpThread.cs.meta diff --git a/TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket.meta b/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket.meta rename to Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket.meta diff --git a/TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/WebSocket.cs b/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/WebSocket.cs similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/WebSocket.cs rename to Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/WebSocket.cs diff --git a/TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/WebSocket.cs.meta b/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/WebSocket.cs.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/WebSocket.cs.meta rename to Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/WebSocket.cs.meta diff --git a/TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/WebSocket.jslib b/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/WebSocket.jslib similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/WebSocket.jslib rename to Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/WebSocket.jslib diff --git a/TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/WebSocket.jslib.meta b/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/WebSocket.jslib.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/WebSocket.jslib.meta rename to Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/WebSocket.jslib.meta diff --git a/TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/websocket-sharp.README b/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/websocket-sharp.README similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/websocket-sharp.README rename to Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/websocket-sharp.README diff --git a/TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/websocket-sharp.README.meta b/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/websocket-sharp.README.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/websocket-sharp.README.meta rename to Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/websocket-sharp.README.meta diff --git a/TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/websocket-sharp.dll b/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/websocket-sharp.dll similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/websocket-sharp.dll rename to Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/websocket-sharp.dll diff --git a/TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/websocket-sharp.dll.meta b/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/websocket-sharp.dll.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/websocket-sharp.dll.meta rename to Assets/Code/Photon/Plugins/PhotonWebSocket/WebSocket/websocket-sharp.dll.meta diff --git a/TouhouStation/Assets/Code/Photon/Plugins/Wsa.meta b/Assets/Code/Photon/Plugins/Wsa.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/Wsa.meta rename to Assets/Code/Photon/Plugins/Wsa.meta diff --git a/TouhouStation/Assets/Code/Photon/Plugins/Wsa/Photon3Unity3D.dll b/Assets/Code/Photon/Plugins/Wsa/Photon3Unity3D.dll similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/Wsa/Photon3Unity3D.dll rename to Assets/Code/Photon/Plugins/Wsa/Photon3Unity3D.dll diff --git a/TouhouStation/Assets/Code/Photon/Plugins/Wsa/Photon3Unity3D.dll.meta b/Assets/Code/Photon/Plugins/Wsa/Photon3Unity3D.dll.meta similarity index 100% rename from TouhouStation/Assets/Code/Photon/Plugins/Wsa/Photon3Unity3D.dll.meta rename to Assets/Code/Photon/Plugins/Wsa/Photon3Unity3D.dll.meta diff --git a/TouhouStation/Assets/Font.meta b/Assets/Font.meta similarity index 100% rename from TouhouStation/Assets/Font.meta rename to Assets/Font.meta diff --git a/TouhouStation/Assets/Font/NikkyouSans-B6aV.ttf b/Assets/Font/NikkyouSans-B6aV.ttf similarity index 100% rename from TouhouStation/Assets/Font/NikkyouSans-B6aV.ttf rename to Assets/Font/NikkyouSans-B6aV.ttf diff --git a/TouhouStation/Assets/Font/NikkyouSans-B6aV.ttf.meta b/Assets/Font/NikkyouSans-B6aV.ttf.meta similarity index 100% rename from TouhouStation/Assets/Font/NikkyouSans-B6aV.ttf.meta rename to Assets/Font/NikkyouSans-B6aV.ttf.meta diff --git a/TouhouStation/Assets/Font/NikkyouSans-Japanese.asset b/Assets/Font/NikkyouSans-Japanese.asset similarity index 100% rename from TouhouStation/Assets/Font/NikkyouSans-Japanese.asset rename to Assets/Font/NikkyouSans-Japanese.asset diff --git a/TouhouStation/Assets/Font/NikkyouSans-Japanese.asset.meta b/Assets/Font/NikkyouSans-Japanese.asset.meta similarity index 100% rename from TouhouStation/Assets/Font/NikkyouSans-Japanese.asset.meta rename to Assets/Font/NikkyouSans-Japanese.asset.meta diff --git a/TouhouStation/Assets/Font/NikkyouSans-Outline.mat b/Assets/Font/NikkyouSans-Outline.mat similarity index 96% rename from TouhouStation/Assets/Font/NikkyouSans-Outline.mat rename to Assets/Font/NikkyouSans-Outline.mat index 43b6d40..d416128 100644 --- a/TouhouStation/Assets/Font/NikkyouSans-Outline.mat +++ b/Assets/Font/NikkyouSans-Outline.mat @@ -32,7 +32,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: -448706042923343624, guid: 9ebc212c8c041f94fa41d5b15645fee6, + m_Texture: {fileID: -1506699682034714140, guid: 9ebc212c8c041f94fa41d5b15645fee6, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} diff --git a/TouhouStation/Assets/Font/NikkyouSans-Outline.mat.meta b/Assets/Font/NikkyouSans-Outline.mat.meta similarity index 100% rename from TouhouStation/Assets/Font/NikkyouSans-Outline.mat.meta rename to Assets/Font/NikkyouSans-Outline.mat.meta diff --git a/TouhouStation/Assets/Font/NikkyouSans-OutlineBlueTemp.mat b/Assets/Font/NikkyouSans-OutlineBlueTemp.mat similarity index 96% rename from TouhouStation/Assets/Font/NikkyouSans-OutlineBlueTemp.mat rename to Assets/Font/NikkyouSans-OutlineBlueTemp.mat index 9186ffa..2d09351 100644 --- a/TouhouStation/Assets/Font/NikkyouSans-OutlineBlueTemp.mat +++ b/Assets/Font/NikkyouSans-OutlineBlueTemp.mat @@ -32,7 +32,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: -448706042923343624, guid: 9ebc212c8c041f94fa41d5b15645fee6, + m_Texture: {fileID: -1506699682034714140, guid: 9ebc212c8c041f94fa41d5b15645fee6, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} diff --git a/TouhouStation/Assets/Font/NikkyouSans-OutlineBlueTemp.mat.meta b/Assets/Font/NikkyouSans-OutlineBlueTemp.mat.meta similarity index 100% rename from TouhouStation/Assets/Font/NikkyouSans-OutlineBlueTemp.mat.meta rename to Assets/Font/NikkyouSans-OutlineBlueTemp.mat.meta diff --git a/TouhouStation/Assets/Font/NikkyouSans-UI.mat b/Assets/Font/NikkyouSans-UI.mat similarity index 96% rename from TouhouStation/Assets/Font/NikkyouSans-UI.mat rename to Assets/Font/NikkyouSans-UI.mat index 42a4b87..50c2497 100644 --- a/TouhouStation/Assets/Font/NikkyouSans-UI.mat +++ b/Assets/Font/NikkyouSans-UI.mat @@ -32,7 +32,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: -448706042923343624, guid: 9ebc212c8c041f94fa41d5b15645fee6, + m_Texture: {fileID: -1506699682034714140, guid: 9ebc212c8c041f94fa41d5b15645fee6, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} diff --git a/TouhouStation/Assets/Font/NikkyouSans-UI.mat.meta b/Assets/Font/NikkyouSans-UI.mat.meta similarity index 100% rename from TouhouStation/Assets/Font/NikkyouSans-UI.mat.meta rename to Assets/Font/NikkyouSans-UI.mat.meta diff --git a/TouhouStation/Assets/Font/NikkyouSans-UIOutline.mat b/Assets/Font/NikkyouSans-UIOutline.mat similarity index 96% rename from TouhouStation/Assets/Font/NikkyouSans-UIOutline.mat rename to Assets/Font/NikkyouSans-UIOutline.mat index df416fd..7ab0ba6 100644 --- a/TouhouStation/Assets/Font/NikkyouSans-UIOutline.mat +++ b/Assets/Font/NikkyouSans-UIOutline.mat @@ -32,7 +32,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: -448706042923343624, guid: 9ebc212c8c041f94fa41d5b15645fee6, + m_Texture: {fileID: -1506699682034714140, guid: 9ebc212c8c041f94fa41d5b15645fee6, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} diff --git a/TouhouStation/Assets/Font/NikkyouSans-UIOutline.mat.meta b/Assets/Font/NikkyouSans-UIOutline.mat.meta similarity index 100% rename from TouhouStation/Assets/Font/NikkyouSans-UIOutline.mat.meta rename to Assets/Font/NikkyouSans-UIOutline.mat.meta diff --git a/Assets/Font/NikkyouSans-Underlay.mat b/Assets/Font/NikkyouSans-Underlay.mat new file mode 100644 index 0000000..dee728b --- /dev/null +++ b/Assets/Font/NikkyouSans-Underlay.mat @@ -0,0 +1,104 @@ +%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: NikkyouSans-Underlay + m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_ShaderKeywords: UNDERLAY_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Cube: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FaceTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: -1506699682034714140, guid: 9ebc212c8c041f94fa41d5b15645fee6, + type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Ambient: 0.5 + - _Bevel: 0.5 + - _BevelClamp: 0 + - _BevelOffset: 0 + - _BevelRoundness: 0 + - _BevelWidth: 0 + - _BumpFace: 0 + - _BumpOutline: 0 + - _ColorMask: 15 + - _Diffuse: 0.5 + - _FaceDilate: 0 + - _FaceUVSpeedX: 0 + - _FaceUVSpeedY: 0 + - _GlowInner: 0.05 + - _GlowOffset: 0 + - _GlowOuter: 0.05 + - _GlowPower: 0.75 + - _GradientScale: 11 + - _LightAngle: 3.1416 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _OutlineSoftness: 0 + - _OutlineUVSpeedX: 0 + - _OutlineUVSpeedY: 0 + - _OutlineWidth: 0 + - _PerspectiveFilter: 0.875 + - _Reflectivity: 10 + - _ScaleRatioA: 0.90909094 + - _ScaleRatioB: 0.7386364 + - _ScaleRatioC: 0.7386364 + - _ScaleX: 1 + - _ScaleY: 1 + - _ShaderFlags: 0 + - _Sharpness: 0 + - _SpecularPower: 2 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _TextureHeight: 512 + - _TextureWidth: 1024 + - _UnderlayDilate: 0 + - _UnderlayOffsetX: 0.45 + - _UnderlayOffsetY: -0.45 + - _UnderlaySoftness: 0 + - _VertexOffsetX: 0 + - _VertexOffsetY: 0 + - _WeightBold: 0.75 + - _WeightNormal: 0 + m_Colors: + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} + - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} + - _FaceColor: {r: 1, g: 1, b: 1, a: 1} + - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5} + - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} + - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} diff --git a/Assets/Font/NikkyouSans-Underlay.mat.meta b/Assets/Font/NikkyouSans-Underlay.mat.meta new file mode 100644 index 0000000..111796d --- /dev/null +++ b/Assets/Font/NikkyouSans-Underlay.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eaf1a0175ca5b834ea9cae9ba101f0b7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TouhouStation/Assets/Font/NikkyouSans.asset b/Assets/Font/NikkyouSans.asset similarity index 99% rename from TouhouStation/Assets/Font/NikkyouSans.asset rename to Assets/Font/NikkyouSans.asset index 0777311..6059765 100644 --- a/TouhouStation/Assets/Font/NikkyouSans.asset +++ b/Assets/Font/NikkyouSans.asset @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: NikkyouSans-B6aV SDF Material m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} - m_ShaderKeywords: UNDERLAY_ON + m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: -448706042923343624} + m_Texture: {fileID: -1506699682034714140} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OutlineTex: @@ -101,13 +101,13 @@ Material: - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} ---- !u!28 &-448706042923343624 +--- !u!28 &-1506699682034714140 Texture2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: NikkyouSans-B6aV SDF Atlas + m_Name: NikkyouSans Atlas m_ImageContentsHash: serializedVersion: 2 Hash: 00000000000000000000000000000000 @@ -1930,34 +1930,506 @@ MonoBehaviour: m_GlyphIndex: 743 m_Scale: 1 m_AtlasTextures: - - {fileID: -448706042923343624} + - {fileID: -1506699682034714140} m_AtlasTextureIndex: 0 m_UsedGlyphRects: - m_X: 0 m_Y: 0 - m_Width: 64 - m_Height: 61 - - m_X: 0 - m_Y: 61 - m_Width: 59 - m_Height: 61 - - m_X: 64 + m_Width: 69 + m_Height: 73 + - m_X: 69 m_Y: 0 - m_Width: 52 - m_Height: 61 + m_Width: 70 + m_Height: 66 + - m_X: 139 + m_Y: 0 + m_Width: 70 + m_Height: 66 + - m_X: 0 + m_Y: 73 + m_Width: 57 + m_Height: 76 + - m_X: 0 + m_Y: 149 + m_Width: 57 + m_Height: 76 + - m_X: 0 + m_Y: 225 + m_Width: 57 + m_Height: 73 + - m_X: 209 + m_Y: 0 + m_Width: 61 + m_Height: 66 + - m_X: 270 + m_Y: 0 + m_Width: 61 + m_Height: 66 + - m_X: 331 + m_Y: 0 + m_Width: 61 + m_Height: 66 + - m_X: 0 + m_Y: 298 + m_Width: 53 + m_Height: 73 + - m_X: 0 + m_Y: 371 + m_Width: 53 + m_Height: 73 + - m_X: 392 + m_Y: 0 + m_Width: 58 + m_Height: 66 + - m_X: 450 + m_Y: 0 + m_Width: 57 + m_Height: 66 + - m_X: 507 + m_Y: 0 + m_Width: 57 + m_Height: 66 + - m_X: 564 + m_Y: 0 + m_Width: 57 + m_Height: 66 + - m_X: 621 + m_Y: 0 + m_Width: 56 + m_Height: 66 + - m_X: 677 + m_Y: 0 + m_Width: 56 + m_Height: 66 + - m_X: 733 + m_Y: 0 + m_Width: 56 + m_Height: 66 + - m_X: 789 + m_Y: 0 + m_Width: 56 + m_Height: 66 + - m_X: 845 + m_Y: 0 + m_Width: 56 + m_Height: 66 + - m_X: 901 + m_Y: 0 + m_Width: 56 + m_Height: 66 + - m_X: 957 + m_Y: 0 + m_Width: 55 + m_Height: 66 + - m_X: 0 + m_Y: 444 + m_Width: 53 + m_Height: 66 + - m_X: 57 + m_Y: 73 + m_Width: 36 + m_Height: 78 + - m_X: 57 + m_Y: 151 + m_Width: 36 + m_Height: 78 + - m_X: 93 + m_Y: 66 + m_Width: 55 + m_Height: 66 + - m_X: 93 + m_Y: 132 + m_Width: 55 + m_Height: 66 + - m_X: 148 + m_Y: 66 + m_Width: 54 + m_Height: 66 + - m_X: 148 + m_Y: 132 + m_Width: 54 + m_Height: 66 + - m_X: 202 + m_Y: 66 + m_Width: 54 + m_Height: 66 + - m_X: 202 + m_Y: 132 + m_Width: 54 + m_Height: 66 + - m_X: 256 + m_Y: 66 + m_Width: 54 + m_Height: 66 + - m_X: 256 + m_Y: 132 + m_Width: 54 + m_Height: 66 + - m_X: 310 + m_Y: 66 + m_Width: 54 + m_Height: 66 + - m_X: 310 + m_Y: 132 + m_Width: 54 + m_Height: 66 + - m_X: 364 + m_Y: 66 + m_Width: 54 + m_Height: 66 + - m_X: 364 + m_Y: 132 + m_Width: 54 + m_Height: 66 + - m_X: 418 + m_Y: 66 + m_Width: 54 + m_Height: 66 + - m_X: 418 + m_Y: 132 + m_Width: 54 + m_Height: 66 + - m_X: 472 + m_Y: 66 + m_Width: 54 + m_Height: 66 + - m_X: 472 + m_Y: 132 + m_Width: 54 + m_Height: 66 + - m_X: 526 + m_Y: 66 + m_Width: 54 + m_Height: 66 + - m_X: 526 + m_Y: 132 + m_Width: 54 + m_Height: 66 + - m_X: 580 + m_Y: 66 + m_Width: 54 + m_Height: 66 + - m_X: 580 + m_Y: 132 + m_Width: 54 + m_Height: 66 + - m_X: 634 + m_Y: 66 + m_Width: 54 + m_Height: 66 + - m_X: 634 + m_Y: 132 + m_Width: 54 + m_Height: 66 + - m_X: 688 + m_Y: 66 + m_Width: 54 + m_Height: 66 + - m_X: 688 + m_Y: 132 + m_Width: 54 + m_Height: 66 + - m_X: 742 + m_Y: 66 + m_Width: 54 + m_Height: 66 + - m_X: 742 + m_Y: 132 + m_Width: 54 + m_Height: 66 + - m_X: 796 + m_Y: 66 + m_Width: 54 + m_Height: 66 + - m_X: 796 + m_Y: 132 + m_Width: 54 + m_Height: 66 + - m_X: 850 + m_Y: 66 + m_Width: 54 + m_Height: 66 + - m_X: 850 + m_Y: 132 + m_Width: 54 + m_Height: 66 + - m_X: 904 + m_Y: 66 + m_Width: 54 + m_Height: 66 + - m_X: 904 + m_Y: 132 + m_Width: 54 + m_Height: 66 + - m_X: 958 + m_Y: 66 + m_Width: 54 + m_Height: 66 + - m_X: 958 + m_Y: 132 + m_Width: 54 + m_Height: 66 + - m_X: 57 + m_Y: 229 + m_Width: 38 + m_Height: 75 + - m_X: 53 + m_Y: 304 + m_Width: 41 + m_Height: 78 + - m_X: 53 + m_Y: 382 + m_Width: 40 + m_Height: 78 + - m_X: 93 + m_Y: 198 + m_Width: 58 + m_Height: 31 + - m_X: 95 + m_Y: 229 + m_Width: 53 + m_Height: 66 + - m_X: 151 + m_Y: 198 + m_Width: 67 + m_Height: 32 + - m_X: 148 + m_Y: 230 + m_Width: 53 + m_Height: 66 + - m_X: 53 + m_Y: 460 + m_Width: 45 + m_Height: 47 + - m_X: 218 + m_Y: 198 + m_Width: 55 + m_Height: 31 + - m_X: 201 + m_Y: 230 + m_Width: 31 + m_Height: 70 + - m_X: 232 + m_Y: 229 + m_Width: 37 + m_Height: 75 + - m_X: 273 + m_Y: 198 + m_Width: 51 + m_Height: 66 + - m_X: 324 + m_Y: 198 + m_Width: 51 + m_Height: 66 + - m_X: 375 + m_Y: 198 + m_Width: 51 + m_Height: 66 + - m_X: 426 + m_Y: 198 + m_Width: 51 + m_Height: 66 + - m_X: 477 + m_Y: 198 + m_Width: 51 + m_Height: 66 + - m_X: 528 + m_Y: 198 + m_Width: 51 + m_Height: 66 + - m_X: 579 + m_Y: 198 + m_Width: 48 + m_Height: 66 + - m_X: 627 + m_Y: 198 + m_Width: 48 + m_Height: 66 + - m_X: 675 + m_Y: 198 + m_Width: 41 + m_Height: 66 + - m_X: 716 + m_Y: 198 + m_Width: 41 + m_Height: 66 + - m_X: 757 + m_Y: 198 + m_Width: 36 + m_Height: 66 + - m_X: 793 + m_Y: 198 + m_Width: 37 + m_Height: 62 + - m_X: 830 + m_Y: 198 + m_Width: 45 + m_Height: 52 + - m_X: 875 + m_Y: 198 + m_Width: 45 + m_Height: 52 + - m_X: 920 + m_Y: 198 + m_Width: 47 + m_Height: 46 + - m_X: 967 + m_Y: 198 + m_Width: 47 + m_Height: 42 + - m_X: 94 + m_Y: 304 + m_Width: 31 + m_Height: 76 + - m_X: 269 + m_Y: 264 + m_Width: 44 + m_Height: 36 + - m_X: 313 + m_Y: 264 + m_Width: 47 + m_Height: 30 + - m_X: 360 + m_Y: 264 + m_Width: 39 + m_Height: 31 + - m_X: 399 + m_Y: 264 + m_Width: 37 + m_Height: 36 + - m_X: 436 + m_Y: 264 + m_Width: 37 + m_Height: 36 + - m_X: 473 + m_Y: 264 + m_Width: 37 + m_Height: 36 + - m_X: 510 + m_Y: 264 + m_Width: 31 + m_Height: 60 + - m_X: 541 + m_Y: 264 + m_Width: 31 + m_Height: 32 m_FreeGlyphRects: - m_X: 0 - m_Y: 122 + m_Y: 510 m_Width: 1023 - m_Height: 389 - - m_X: 59 - m_Y: 61 - m_Width: 964 - m_Height: 450 - - m_X: 116 + m_Height: 1 + - m_X: 69 + m_Y: 66 + m_Width: 24 + m_Height: 7 + - m_X: 53 + m_Y: 298 + m_Width: 4 + m_Height: 6 + - m_X: 148 + m_Y: 229 + m_Width: 3 + m_Height: 1 + - m_X: 53 + m_Y: 507 + m_Width: 970 + m_Height: 4 + - m_X: 93 + m_Y: 382 + m_Width: 930 + m_Height: 78 + - m_X: 218 + m_Y: 229 + m_Width: 14 + m_Height: 1 + - m_X: 793 + m_Y: 260 + m_Width: 230 + m_Height: 251 + - m_X: 830 + m_Y: 250 + m_Width: 193 + m_Height: 261 + - m_X: 920 + m_Y: 244 + m_Width: 103 + m_Height: 267 + - m_X: 1012 m_Y: 0 - m_Width: 907 + m_Width: 11 + m_Height: 198 + - m_X: 1014 + m_Y: 0 + m_Width: 9 m_Height: 511 + - m_X: 967 + m_Y: 240 + m_Width: 56 + m_Height: 271 + - m_X: 94 + m_Y: 380 + m_Width: 929 + m_Height: 80 + - m_X: 95 + m_Y: 295 + m_Width: 53 + m_Height: 9 + - m_X: 125 + m_Y: 295 + m_Width: 23 + m_Height: 216 + - m_X: 95 + m_Y: 296 + m_Width: 106 + m_Height: 8 + - m_X: 125 + m_Y: 296 + m_Width: 76 + m_Height: 215 + - m_X: 95 + m_Y: 300 + m_Width: 137 + m_Height: 4 + - m_X: 98 + m_Y: 380 + m_Width: 925 + m_Height: 131 + - m_X: 125 + m_Y: 300 + m_Width: 107 + m_Height: 211 + - m_X: 269 + m_Y: 229 + m_Width: 4 + m_Height: 35 + - m_X: 313 + m_Y: 294 + m_Width: 47 + m_Height: 217 + - m_X: 313 + m_Y: 295 + m_Width: 86 + m_Height: 216 + - m_X: 125 + m_Y: 324 + m_Width: 898 + m_Height: 187 + - m_X: 125 + m_Y: 304 + m_Width: 385 + m_Height: 207 + - m_X: 269 + m_Y: 300 + m_Width: 241 + m_Height: 211 + - m_X: 541 + m_Y: 296 + m_Width: 482 + m_Height: 215 + - m_X: 572 + m_Y: 264 + m_Width: 451 + m_Height: 247 m_fontInfo: Name: PointSize: 0 @@ -2004,7 +2476,7 @@ MonoBehaviour: atlasHeight: 512 characterSetSelectionMode: 0 characterSequence: 32 - 126, 160, 8203, 8230, 9633 - referencedFontAssetGUID: + referencedFontAssetGUID: 9ebc212c8c041f94fa41d5b15645fee6 referencedTextAssetGUID: cda946aca488fc54c878cb01405332b0 fontStyle: 0 fontStyleModifier: 0 diff --git a/TouhouStation/Assets/Font/NikkyouSans.asset.meta b/Assets/Font/NikkyouSans.asset.meta similarity index 100% rename from TouhouStation/Assets/Font/NikkyouSans.asset.meta rename to Assets/Font/NikkyouSans.asset.meta diff --git a/TouhouStation/Assets/Font/characters.txt b/Assets/Font/characters.txt similarity index 100% rename from TouhouStation/Assets/Font/characters.txt rename to Assets/Font/characters.txt diff --git a/TouhouStation/Assets/Font/characters.txt.meta b/Assets/Font/characters.txt.meta similarity index 100% rename from TouhouStation/Assets/Font/characters.txt.meta rename to Assets/Font/characters.txt.meta diff --git a/TouhouStation/Assets/Font/japanese_standard.txt b/Assets/Font/japanese_standard.txt similarity index 100% rename from TouhouStation/Assets/Font/japanese_standard.txt rename to Assets/Font/japanese_standard.txt diff --git a/TouhouStation/Assets/Font/japanese_standard.txt.meta b/Assets/Font/japanese_standard.txt.meta similarity index 100% rename from TouhouStation/Assets/Font/japanese_standard.txt.meta rename to Assets/Font/japanese_standard.txt.meta diff --git a/TouhouStation/Assets/PlayerBoards.prefab b/Assets/PlayerBoards.prefab similarity index 88% rename from TouhouStation/Assets/PlayerBoards.prefab rename to Assets/PlayerBoards.prefab index 52ed895..0b265d1 100644 --- a/TouhouStation/Assets/PlayerBoards.prefab +++ b/Assets/PlayerBoards.prefab @@ -1,5 +1,413 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &333090777 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 333090778} + - component: {fileID: 333090780} + - component: {fileID: 333090782} + - component: {fileID: 333090781} + - component: {fileID: 333090779} + m_Layer: 0 + m_Name: Nickname + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &333090778 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 333090777} + 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: 4556693130865902303} + 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} + m_AnchoredPosition: {x: 0, y: 3.1} + m_SizeDelta: {x: 3, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &333090780 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 333090777} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: eaf1a0175ca5b834ea9cae9ba101f0b7, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &333090782 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 333090777} + m_Mesh: {fileID: 0} +--- !u!222 &333090781 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 333090777} + m_CullTransparentMesh: 0 +--- !u!114 &333090779 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 333090777} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: HAACHAMA + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9ebc212c8c041f94fa41d5b15645fee6, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: eaf1a0175ca5b834ea9cae9ba101f0b7, 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_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 4 + m_fontSizeBase: 4 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_textAlignment: 1028 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_firstOverflowCharacterIndex: 0 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_VertexBufferAutoSizeReduction: 1 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 333090779} + characterCount: 8 + spriteCount: 0 + spaceCount: 0 + wordCount: 1 + linkCount: 0 + lineCount: 1 + pageCount: 1 + materialCount: 1 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 333090780} + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_maskType: 0 +--- !u!1 &1549891555 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1549891556} + - component: {fileID: 1549891560} + - component: {fileID: 1549891559} + - component: {fileID: 1549891558} + - component: {fileID: 1549891557} + m_Layer: 0 + m_Name: Nickname + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1549891556 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549891555} + 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: 4556693131448965115} + 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} + m_AnchoredPosition: {x: 0, y: 3.1} + m_SizeDelta: {x: 3, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &1549891560 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549891555} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: eaf1a0175ca5b834ea9cae9ba101f0b7, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1549891559 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549891555} + m_Mesh: {fileID: 0} +--- !u!222 &1549891558 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549891555} + m_CullTransparentMesh: 0 +--- !u!114 &1549891557 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549891555} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: HAACHAMA + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9ebc212c8c041f94fa41d5b15645fee6, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: eaf1a0175ca5b834ea9cae9ba101f0b7, 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_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 4 + m_fontSizeBase: 4 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_textAlignment: 1025 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_firstOverflowCharacterIndex: 0 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_VertexBufferAutoSizeReduction: 1 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 1549891557} + characterCount: 8 + spriteCount: 0 + spaceCount: 0 + wordCount: 1 + linkCount: 0 + lineCount: 1 + pageCount: 1 + materialCount: 1 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 1549891560} + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_maskType: 0 --- !u!1 &493877210141092579 GameObject: m_ObjectHideFlags: 0 @@ -672,6 +1080,7 @@ MonoBehaviour: m_EditorClassIdentifier: ScoreText: {fileID: 4556693131005803447} ComboText: {fileID: 3108174010608557144} + NickNameText: {fileID: 333090779} basePoint: {fileID: 4556693131374189392} width: 0.5 height: 0.5 @@ -711,6 +1120,7 @@ Transform: - {fileID: 4556693131763957666} - {fileID: 2271300010485021552} - {fileID: 4556693132529611827} + - {fileID: 333090778} m_Father: {fileID: 4556693130643049114} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1413,6 +1823,7 @@ Transform: - {fileID: 4556693132381042425} - {fileID: 4554344259290858250} - {fileID: 4556693131415523136} + - {fileID: 1549891556} m_Father: {fileID: 4556693131862667307} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1663,6 +2074,7 @@ MonoBehaviour: m_EditorClassIdentifier: ScoreText: {fileID: 4556693132029777363} ComboText: {fileID: 7550074039370791397} + NickNameText: {fileID: 1549891557} basePoint: {fileID: 4556693131025700620} width: 0.5 height: 0.5 @@ -1809,7 +2221,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 81e1a226b06b85e4fadaac9c2f719ef7, type: 2} + - {fileID: -6521947056360891184, guid: 9ebc212c8c041f94fa41d5b15645fee6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1867,7 +2279,8 @@ MonoBehaviour: m_text: score m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9ebc212c8c041f94fa41d5b15645fee6, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 81e1a226b06b85e4fadaac9c2f719ef7, type: 2} + m_sharedMaterial: {fileID: -6521947056360891184, guid: 9ebc212c8c041f94fa41d5b15645fee6, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/TouhouStation/Assets/PlayerBoards.prefab.meta b/Assets/PlayerBoards.prefab.meta similarity index 100% rename from TouhouStation/Assets/PlayerBoards.prefab.meta rename to Assets/PlayerBoards.prefab.meta diff --git a/TouhouStation/Assets/Plugins.meta b/Assets/Plugins.meta similarity index 100% rename from TouhouStation/Assets/Plugins.meta rename to Assets/Plugins.meta diff --git a/TouhouStation/Assets/Plugins/Google.Apis.Auth.dll b/Assets/Plugins/Google.Apis.Auth.dll similarity index 100% rename from TouhouStation/Assets/Plugins/Google.Apis.Auth.dll rename to Assets/Plugins/Google.Apis.Auth.dll diff --git a/TouhouStation/Assets/Plugins/Google.Apis.Auth.dll.meta b/Assets/Plugins/Google.Apis.Auth.dll.meta similarity index 100% rename from TouhouStation/Assets/Plugins/Google.Apis.Auth.dll.meta rename to Assets/Plugins/Google.Apis.Auth.dll.meta diff --git a/TouhouStation/Assets/Plugins/Google.Apis.Core.dll b/Assets/Plugins/Google.Apis.Core.dll similarity index 100% rename from TouhouStation/Assets/Plugins/Google.Apis.Core.dll rename to Assets/Plugins/Google.Apis.Core.dll diff --git a/TouhouStation/Assets/Plugins/Google.Apis.Core.dll.meta b/Assets/Plugins/Google.Apis.Core.dll.meta similarity index 100% rename from TouhouStation/Assets/Plugins/Google.Apis.Core.dll.meta rename to Assets/Plugins/Google.Apis.Core.dll.meta diff --git a/TouhouStation/Assets/Plugins/Google.Apis.Sheets.v4.dll b/Assets/Plugins/Google.Apis.Sheets.v4.dll similarity index 100% rename from TouhouStation/Assets/Plugins/Google.Apis.Sheets.v4.dll rename to Assets/Plugins/Google.Apis.Sheets.v4.dll diff --git a/TouhouStation/Assets/Plugins/Google.Apis.Sheets.v4.dll.meta b/Assets/Plugins/Google.Apis.Sheets.v4.dll.meta similarity index 100% rename from TouhouStation/Assets/Plugins/Google.Apis.Sheets.v4.dll.meta rename to Assets/Plugins/Google.Apis.Sheets.v4.dll.meta diff --git a/TouhouStation/Assets/Plugins/Google.Apis.dll b/Assets/Plugins/Google.Apis.dll similarity index 100% rename from TouhouStation/Assets/Plugins/Google.Apis.dll rename to Assets/Plugins/Google.Apis.dll diff --git a/TouhouStation/Assets/Plugins/Google.Apis.dll.meta b/Assets/Plugins/Google.Apis.dll.meta similarity index 100% rename from TouhouStation/Assets/Plugins/Google.Apis.dll.meta rename to Assets/Plugins/Google.Apis.dll.meta diff --git a/TouhouStation/Assets/Plugins/Newtonsoft.Json.dll b/Assets/Plugins/Newtonsoft.Json.dll similarity index 100% rename from TouhouStation/Assets/Plugins/Newtonsoft.Json.dll rename to Assets/Plugins/Newtonsoft.Json.dll diff --git a/TouhouStation/Assets/Plugins/Newtonsoft.Json.dll.meta b/Assets/Plugins/Newtonsoft.Json.dll.meta similarity index 100% rename from TouhouStation/Assets/Plugins/Newtonsoft.Json.dll.meta rename to Assets/Plugins/Newtonsoft.Json.dll.meta diff --git a/TouhouStation/Assets/RealCode.meta b/Assets/RealCode.meta similarity index 100% rename from TouhouStation/Assets/RealCode.meta rename to Assets/RealCode.meta diff --git a/TouhouStation/Assets/RealCode/Animations.meta b/Assets/RealCode/Animations.meta similarity index 100% rename from TouhouStation/Assets/RealCode/Animations.meta rename to Assets/RealCode/Animations.meta diff --git a/TouhouStation/Assets/RealCode/Animations/SimpleAnimationLoop.cs b/Assets/RealCode/Animations/SimpleAnimationLoop.cs similarity index 100% rename from TouhouStation/Assets/RealCode/Animations/SimpleAnimationLoop.cs rename to Assets/RealCode/Animations/SimpleAnimationLoop.cs diff --git a/TouhouStation/Assets/RealCode/Animations/SimpleAnimationLoop.cs.meta b/Assets/RealCode/Animations/SimpleAnimationLoop.cs.meta similarity index 100% rename from TouhouStation/Assets/RealCode/Animations/SimpleAnimationLoop.cs.meta rename to Assets/RealCode/Animations/SimpleAnimationLoop.cs.meta diff --git a/TouhouStation/Assets/RealCode/Animations/SimpleScrollLoop.cs b/Assets/RealCode/Animations/SimpleScrollLoop.cs similarity index 100% rename from TouhouStation/Assets/RealCode/Animations/SimpleScrollLoop.cs rename to Assets/RealCode/Animations/SimpleScrollLoop.cs diff --git a/TouhouStation/Assets/RealCode/Animations/SimpleScrollLoop.cs.meta b/Assets/RealCode/Animations/SimpleScrollLoop.cs.meta similarity index 100% rename from TouhouStation/Assets/RealCode/Animations/SimpleScrollLoop.cs.meta rename to Assets/RealCode/Animations/SimpleScrollLoop.cs.meta diff --git a/TouhouStation/Assets/RealCode/GameBoard.cs b/Assets/RealCode/GameBoard.cs similarity index 99% rename from TouhouStation/Assets/RealCode/GameBoard.cs rename to Assets/RealCode/GameBoard.cs index 3172104..2d12bb5 100644 --- a/TouhouStation/Assets/RealCode/GameBoard.cs +++ b/Assets/RealCode/GameBoard.cs @@ -577,7 +577,10 @@ public class GameBoard : EntityBase, IAutoSerialize, IAutoDeserialize { private float nextNetworkTick; public void Update() { - if (!active) return; + if (!active) { + render.RenderName(); + return; + } if (isMine) { //checkDirty(); @@ -594,6 +597,8 @@ public class GameBoard : EntityBase, IAutoSerialize, IAutoDeserialize { render.Render(board); // HACK So uh, there's an issue with air tiles taking two renders to be removed right, so uh, two renders it is. - Texel // Seriously I can't believe this works this is dirty + + // It does make it render twice as fast, I have idea render.Render(board); render.SetComboLevel(Combo); @@ -602,6 +607,8 @@ public class GameBoard : EntityBase, IAutoSerialize, IAutoDeserialize { var pair = currentPair; var pairp = GetPlacePosition(board, playerRotation, dropColumn); render.RenderPlacement(pair.left, pair.right, pairp.left, pairp.right); + + render.RenderName(); } public override void Awake() { diff --git a/TouhouStation/Assets/RealCode/GameBoard.cs.meta b/Assets/RealCode/GameBoard.cs.meta similarity index 100% rename from TouhouStation/Assets/RealCode/GameBoard.cs.meta rename to Assets/RealCode/GameBoard.cs.meta diff --git a/TouhouStation/Assets/RealCode/GameBoardExtension.cs b/Assets/RealCode/GameBoardExtension.cs similarity index 100% rename from TouhouStation/Assets/RealCode/GameBoardExtension.cs rename to Assets/RealCode/GameBoardExtension.cs diff --git a/TouhouStation/Assets/RealCode/GameBoardExtension.cs.meta b/Assets/RealCode/GameBoardExtension.cs.meta similarity index 100% rename from TouhouStation/Assets/RealCode/GameBoardExtension.cs.meta rename to Assets/RealCode/GameBoardExtension.cs.meta diff --git a/TouhouStation/Assets/RealCode/GameBoardInstance.cs b/Assets/RealCode/GameBoardInstance.cs similarity index 100% rename from TouhouStation/Assets/RealCode/GameBoardInstance.cs rename to Assets/RealCode/GameBoardInstance.cs diff --git a/TouhouStation/Assets/RealCode/GameBoardInstance.cs.meta b/Assets/RealCode/GameBoardInstance.cs.meta similarity index 100% rename from TouhouStation/Assets/RealCode/GameBoardInstance.cs.meta rename to Assets/RealCode/GameBoardInstance.cs.meta diff --git a/TouhouStation/Assets/RealCode/GameBoardRender.cs b/Assets/RealCode/GameBoardRender.cs similarity index 96% rename from TouhouStation/Assets/RealCode/GameBoardRender.cs rename to Assets/RealCode/GameBoardRender.cs index b62586f..972a9e0 100644 --- a/TouhouStation/Assets/RealCode/GameBoardRender.cs +++ b/Assets/RealCode/GameBoardRender.cs @@ -14,6 +14,7 @@ public class GameBoardRender : MonoBehaviour { public TMPro.TextMeshPro ScoreText; public TMPro.TextMeshPro ComboText; + public TextMeshPro NickNameText; [Header("Positioning")] public Transform basePoint; @@ -99,6 +100,13 @@ public class GameBoardRender : MonoBehaviour { } } + public void RenderName(){ + if (NetworkManager.inRoom && board.authorityID != -1){ + var player = NetworkManager.net.CurrentRoom.GetPlayer(board.authorityID); + NickNameText.text = player.NickName; + } + } + // Spawn a fading 'ghost' of a tile as an activator for the cool effect public void Ghost(TileInfo tile, (int x, int y) ghostPos) { //var tileGo = Instantiate(tilePrefab,corner); diff --git a/TouhouStation/Assets/RealCode/GameBoardRender.cs.meta b/Assets/RealCode/GameBoardRender.cs.meta similarity index 100% rename from TouhouStation/Assets/RealCode/GameBoardRender.cs.meta rename to Assets/RealCode/GameBoardRender.cs.meta diff --git a/TouhouStation/Assets/RealCode/Menu.meta b/Assets/RealCode/Menu.meta similarity index 100% rename from TouhouStation/Assets/RealCode/Menu.meta rename to Assets/RealCode/Menu.meta diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS.meta b/Assets/RealCode/Menu/ButtonS.meta similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/ButtonS.meta rename to Assets/RealCode/Menu/ButtonS.meta diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonConnectArcade.cs b/Assets/RealCode/Menu/ButtonS/ButtonConnectArcade.cs similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonConnectArcade.cs rename to Assets/RealCode/Menu/ButtonS/ButtonConnectArcade.cs diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonConnectArcade.cs.meta b/Assets/RealCode/Menu/ButtonS/ButtonConnectArcade.cs.meta similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonConnectArcade.cs.meta rename to Assets/RealCode/Menu/ButtonS/ButtonConnectArcade.cs.meta diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonConnectOnline.cs b/Assets/RealCode/Menu/ButtonS/ButtonConnectOnline.cs similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonConnectOnline.cs rename to Assets/RealCode/Menu/ButtonS/ButtonConnectOnline.cs diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonConnectOnline.cs.meta b/Assets/RealCode/Menu/ButtonS/ButtonConnectOnline.cs.meta similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonConnectOnline.cs.meta rename to Assets/RealCode/Menu/ButtonS/ButtonConnectOnline.cs.meta diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonCreateLobby.cs b/Assets/RealCode/Menu/ButtonS/ButtonCreateLobby.cs similarity index 97% rename from TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonCreateLobby.cs rename to Assets/RealCode/Menu/ButtonS/ButtonCreateLobby.cs index 4267c49..e63c5ed 100644 --- a/TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonCreateLobby.cs +++ b/Assets/RealCode/Menu/ButtonS/ButtonCreateLobby.cs @@ -27,6 +27,8 @@ public class ButtonCreateLobby : ButtonOnClick { roomCode = string.Format("{0}{1}{2}{3}", RandomDigit(), RandomDigit(), RandomDigit(), RandomDigit()); } while (roomList.Contains(roomCode)); + LobbySetup.Instance.Setup(); + var success = NetworkManager.net.OpCreateRoomWithProperties(roomCode, ro, ExitGames.Client.Photon.LoadBalancing.TypedLobby.Default); if (success) { Debug.Log("Room created"); diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonCreateLobby.cs.meta b/Assets/RealCode/Menu/ButtonS/ButtonCreateLobby.cs.meta similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonCreateLobby.cs.meta rename to Assets/RealCode/Menu/ButtonS/ButtonCreateLobby.cs.meta diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonDisconnect.cs b/Assets/RealCode/Menu/ButtonS/ButtonDisconnect.cs similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonDisconnect.cs rename to Assets/RealCode/Menu/ButtonS/ButtonDisconnect.cs diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonDisconnect.cs.meta b/Assets/RealCode/Menu/ButtonS/ButtonDisconnect.cs.meta similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonDisconnect.cs.meta rename to Assets/RealCode/Menu/ButtonS/ButtonDisconnect.cs.meta diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonJoinLobby.cs b/Assets/RealCode/Menu/ButtonS/ButtonJoinLobby.cs similarity index 94% rename from TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonJoinLobby.cs rename to Assets/RealCode/Menu/ButtonS/ButtonJoinLobby.cs index c1ada92..d9c10e7 100644 --- a/TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonJoinLobby.cs +++ b/Assets/RealCode/Menu/ButtonS/ButtonJoinLobby.cs @@ -11,6 +11,8 @@ public class ButtonJoinLobby : ButtonOnClick { if (GameTransition.Instance.state == GameState.Multiplayer){ GameTransition.Instance.state = GameState.ConnectionInProgress; + LobbySetup.Instance.Setup(); + var roomCode = joinField.text; Debug.LogFormat("Joining room '{0}'", roomCode); if (NetworkManager.net.OpJoinRoomWithProperties(roomCode)) { diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonJoinLobby.cs.meta b/Assets/RealCode/Menu/ButtonS/ButtonJoinLobby.cs.meta similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonJoinLobby.cs.meta rename to Assets/RealCode/Menu/ButtonS/ButtonJoinLobby.cs.meta diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonLeaveLobby.cs b/Assets/RealCode/Menu/ButtonS/ButtonLeaveLobby.cs similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonLeaveLobby.cs rename to Assets/RealCode/Menu/ButtonS/ButtonLeaveLobby.cs diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonLeaveLobby.cs.meta b/Assets/RealCode/Menu/ButtonS/ButtonLeaveLobby.cs.meta similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonLeaveLobby.cs.meta rename to Assets/RealCode/Menu/ButtonS/ButtonLeaveLobby.cs.meta diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonOnClick.cs b/Assets/RealCode/Menu/ButtonS/ButtonOnClick.cs similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonOnClick.cs rename to Assets/RealCode/Menu/ButtonS/ButtonOnClick.cs diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonOnClick.cs.meta b/Assets/RealCode/Menu/ButtonS/ButtonOnClick.cs.meta similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonOnClick.cs.meta rename to Assets/RealCode/Menu/ButtonS/ButtonOnClick.cs.meta diff --git a/Assets/RealCode/Menu/ButtonS/ButtonReadyUp.cs b/Assets/RealCode/Menu/ButtonS/ButtonReadyUp.cs new file mode 100644 index 0000000..da49224 --- /dev/null +++ b/Assets/RealCode/Menu/ButtonS/ButtonReadyUp.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ButtonReadyUp : ButtonOnClick { + + public override void OnClick() { + if (GameTransition.Instance.state == GameState.Lobby) + PlayerProperties.lobbyStatus.SetLocal(!PlayerProperties.lobbyStatus.GetLocal()); + } + +} diff --git a/Assets/RealCode/Menu/ButtonS/ButtonReadyUp.cs.meta b/Assets/RealCode/Menu/ButtonS/ButtonReadyUp.cs.meta new file mode 100644 index 0000000..650c98d --- /dev/null +++ b/Assets/RealCode/Menu/ButtonS/ButtonReadyUp.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 16215d74378700844ae416c1de7db07d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonSelectRegionMaster.cs b/Assets/RealCode/Menu/ButtonS/ButtonSelectRegionMaster.cs similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonSelectRegionMaster.cs rename to Assets/RealCode/Menu/ButtonS/ButtonSelectRegionMaster.cs diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonSelectRegionMaster.cs.meta b/Assets/RealCode/Menu/ButtonS/ButtonSelectRegionMaster.cs.meta similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonSelectRegionMaster.cs.meta rename to Assets/RealCode/Menu/ButtonS/ButtonSelectRegionMaster.cs.meta diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonSwitchLanguages.cs b/Assets/RealCode/Menu/ButtonS/ButtonSwitchLanguages.cs similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonSwitchLanguages.cs rename to Assets/RealCode/Menu/ButtonS/ButtonSwitchLanguages.cs diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonSwitchLanguages.cs.meta b/Assets/RealCode/Menu/ButtonS/ButtonSwitchLanguages.cs.meta similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/ButtonS/ButtonSwitchLanguages.cs.meta rename to Assets/RealCode/Menu/ButtonS/ButtonSwitchLanguages.cs.meta diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS/MainMenuButton.cs b/Assets/RealCode/Menu/ButtonS/MainMenuButton.cs similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/ButtonS/MainMenuButton.cs rename to Assets/RealCode/Menu/ButtonS/MainMenuButton.cs diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS/MainMenuButton.cs.meta b/Assets/RealCode/Menu/ButtonS/MainMenuButton.cs.meta similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/ButtonS/MainMenuButton.cs.meta rename to Assets/RealCode/Menu/ButtonS/MainMenuButton.cs.meta diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS/NicknameField.cs b/Assets/RealCode/Menu/ButtonS/NicknameField.cs similarity index 56% rename from TouhouStation/Assets/RealCode/Menu/ButtonS/NicknameField.cs rename to Assets/RealCode/Menu/ButtonS/NicknameField.cs index 08a674a..0aeac19 100644 --- a/TouhouStation/Assets/RealCode/Menu/ButtonS/NicknameField.cs +++ b/Assets/RealCode/Menu/ButtonS/NicknameField.cs @@ -8,16 +8,13 @@ public class NicknameField : MonoBehaviour { public TMP_InputField field; private void Start() { - var nn = PlayerPrefs.GetString("nickname", PlayerProperties.getRandomTouhou); - field.text = nn; - PlayerProperties.localPlayer.NickName = nn; + field.text = PlayerProperties.GetPlayerNickname(); } private void Update() { var nn = field.text; if (PlayerProperties.localPlayer.NickName != nn){ - PlayerProperties.localPlayer.NickName = nn; - PlayerPrefs.SetString("nickname", nn); + PlayerProperties.SetPlayerNickname(nn); } } diff --git a/TouhouStation/Assets/RealCode/Menu/ButtonS/NicknameField.cs.meta b/Assets/RealCode/Menu/ButtonS/NicknameField.cs.meta similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/ButtonS/NicknameField.cs.meta rename to Assets/RealCode/Menu/ButtonS/NicknameField.cs.meta diff --git a/TouhouStation/Assets/RealCode/Menu/Canvas.prefab b/Assets/RealCode/Menu/Canvas.prefab similarity index 95% rename from TouhouStation/Assets/RealCode/Menu/Canvas.prefab rename to Assets/RealCode/Menu/Canvas.prefab index aad567b..d8d59c1 100644 --- a/TouhouStation/Assets/RealCode/Menu/Canvas.prefab +++ b/Assets/RealCode/Menu/Canvas.prefab @@ -1,5 +1,174 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &147666450 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 147666451} + - component: {fileID: 147666454} + - component: {fileID: 147666453} + - component: {fileID: 147666452} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &147666451 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147666450} + m_LocalRotation: {x: 0, y: 0, z: 0.065403156, w: 0.99785894} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 220214627} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 7.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 10, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &147666454 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147666450} + m_CullTransparentMesh: 0 +--- !u!114 &147666453 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147666450} + 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: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: ready\nup + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9ebc212c8c041f94fa41d5b15645fee6, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 933b57d6796b1494ba7f8d561e8ede85, 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_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 44 + m_fontSizeBase: 44 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_textAlignment: 514 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_firstOverflowCharacterIndex: -1 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_VertexBufferAutoSizeReduction: 1 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 147666453} + characterCount: 8 + spriteCount: 0 + spaceCount: 1 + wordCount: 2 + linkCount: 0 + lineCount: 2 + pageCount: 1 + materialCount: 1 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_hasFontAssetChanged: 0 + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &147666452 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147666450} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5677471e505742c4aaed5eef60cd05ff, type: 3} + m_Name: + m_EditorClassIdentifier: + key: MULTIPLAYER_READY --- !u!1 &156228715 GameObject: m_ObjectHideFlags: 0 @@ -274,6 +443,43 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &220214626 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 220214627} + m_Layer: 5 + m_Name: Create + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &220214627 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 220214626} + 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: 2115893203} + - {fileID: 147666451} + m_Father: {fileID: 1237100308} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -20, y: 136.35} + m_SizeDelta: {x: 160, y: 160} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &294239648 GameObject: m_ObjectHideFlags: 0 @@ -1357,6 +1563,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1237100308} + - component: {fileID: 1237100309} m_Layer: 5 m_Name: Ready Check m_TagString: Untagged @@ -1378,14 +1585,35 @@ RectTransform: - {fileID: 422620444} - {fileID: 677345925} - {fileID: 822320895} + - {fileID: 220214627} m_Father: {fileID: 1736330635485585599} m_RootOrder: 6 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: 50} + m_AnchoredPosition: {x: 0, y: 400} m_SizeDelta: {x: 400, y: 50} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1237100309 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1237100307} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc6fbe0d7ac22c949ab3227d60cd4152, type: 3} + m_Name: + m_EditorClassIdentifier: + readyCheck1: {fileID: 677345925} + readyCheck2: {fileID: 822320895} + readyImage1: {fileID: 571261724} + readyImage2: {fileID: 888607095} + readyStatus: {fileID: 422620445} + waitingKey: MULTIPLAYER_READYWAITING + dotMax: 3 + dotDuration: 1 --- !u!1 &1431784655 GameObject: m_ObjectHideFlags: 0 @@ -2129,9 +2357,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} + m_Mode: 4 + m_SelectOnUp: {fileID: 2115893205} + m_SelectOnDown: {fileID: 2115893205} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} m_Transition: 0 @@ -2267,6 +2495,159 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2115893202 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2115893203} + - component: {fileID: 2115893208} + - component: {fileID: 2115893207} + - component: {fileID: 2115893206} + - component: {fileID: 2115893205} + - component: {fileID: 2115893204} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2115893203 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2115893202} + 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: 220214627} + m_RootOrder: 0 + 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!222 &2115893208 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2115893202} + m_CullTransparentMesh: 0 +--- !u!114 &2115893207 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2115893202} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bcbd46c9872ea004ba60441124c200df, type: 3} + m_Name: + m_EditorClassIdentifier: + targetGraphic: {fileID: 2115893206} + targetTransform: {fileID: 220214627} + pointerSelected: 0 + keyboardSelected: 0 + pressed: 0 + baseColor: {r: 1, g: 0, b: 1, a: 1} + selectedColor: {r: 0.40392157, g: 0.59607846, b: 1, a: 1} + baseWidth: 160 + selectedWidth: 200 + tintColor: {r: 0.87, g: 0.87, b: 0.87, a: 1} +--- !u!114 &2115893206 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2115893202} + 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: 0, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 1175f966d3318f544be9e6b10c22afdb, 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!114 &2115893205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2115893202} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 4 + m_SelectOnUp: {fileID: 2100258618} + m_SelectOnDown: {fileID: 2100258618} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2115893206} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &2115893204 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2115893202} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16215d74378700844ae416c1de7db07d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1736330633559397463 GameObject: m_ObjectHideFlags: 0 @@ -7802,6 +8183,10 @@ MonoBehaviour: states: 00000000 selectedPosition: {x: -20, y: 0} firstSelectedGameObject: {fileID: 0} + - target: {fileID: 1237100308} + states: 03000000 + selectedPosition: {x: -20, y: 0} + firstSelectedGameObject: {fileID: 2115893202} tDisplays: - target: {fileID: 0} position: {x: 0, y: -3.75, z: 0} diff --git a/TouhouStation/Assets/RealCode/Menu/Canvas.prefab.meta b/Assets/RealCode/Menu/Canvas.prefab.meta similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/Canvas.prefab.meta rename to Assets/RealCode/Menu/Canvas.prefab.meta diff --git a/TouhouStation/Assets/RealCode/Menu/GameTransition.cs b/Assets/RealCode/Menu/GameTransition.cs similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/GameTransition.cs rename to Assets/RealCode/Menu/GameTransition.cs diff --git a/TouhouStation/Assets/RealCode/Menu/GameTransition.cs.meta b/Assets/RealCode/Menu/GameTransition.cs.meta similarity index 100% rename from TouhouStation/Assets/RealCode/Menu/GameTransition.cs.meta rename to Assets/RealCode/Menu/GameTransition.cs.meta diff --git a/Assets/RealCode/Menu/LobbySetup.cs b/Assets/RealCode/Menu/LobbySetup.cs new file mode 100644 index 0000000..7d659c4 --- /dev/null +++ b/Assets/RealCode/Menu/LobbySetup.cs @@ -0,0 +1,77 @@ +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; +using UnityEngine.UI; +using TMPro; + +public class LobbySetup : MonoBehaviour { + + public static LobbySetup Instance { get; private set; } + + public Transform readyCheck1, readyCheck2; + public Image readyImage1, readyImage2; + public TextMeshProUGUI readyStatus; + + [Header("Messages")] + public string waitingKey; + + public int dotMax = 3; + public float dotDuration = 1f; + + + private void Awake() { + Instance = this; + } + + public void Setup(){ + PlayerProperties.CreatePlayerHashtable(); + } + + // Update is called once per frame + void Update() { + var delta = Time.deltaTime * 180f; + + if (NetworkManager.inRoom && GameTransition.Instance.state == GameState.Lobby){ + // we setting player values by their id order + + var players = NetworkManager.net.CurrentRoom.Players.Values.OrderBy(p => p.ID); + var p1 = players.ElementAtOrDefault(0); + var p2 = players.ElementAtOrDefault(1); + + // displays + if (p1 != null){ + if (p1.IsLocal){ + PlayerProperties.playerCharacter.SetLocal(0); + GameBoardInstance.instance.player1.authorityID = p1.ID; + } + var pready = PlayerProperties.lobbyStatus.Get(p1); + readyCheck1.localRotation = Quaternion.RotateTowards(readyCheck1.localRotation, pready ? Quaternion.identity : Quaternion.Euler(0f, 0f, 45f), delta); + readyImage1.color = pready ? Color.green : Color.red; + } + + // displays + if (p2 != null){ + readyCheck2.gameObject.SetActive(true); + if (p2.IsLocal) { + PlayerProperties.playerCharacter.SetLocal(1); + GameBoardInstance.instance.player2.authorityID = p2.ID; + } + var pready = PlayerProperties.lobbyStatus.Get(p1); + readyCheck2.localRotation = Quaternion.RotateTowards(readyCheck1.localRotation, pready ? Quaternion.identity : Quaternion.Euler(0f, 0f, 45f), delta); + readyImage2.color = pready ? Color.green : Color.red; + } else { + GameBoardInstance.instance.player2.authorityID = -1; + readyCheck2.gameObject.SetActive(false); + } + + readyStatus.text = Localization.GetString(waitingKey) + new string('.', Mathf.RoundToInt(Time.time / dotDuration) % dotMax); + + if (PlayerProperties.GetAllLobbyStatus()){ + GameBoardInstance.instance.SetupGame(); + } + + } + } + +} diff --git a/Assets/RealCode/Menu/LobbySetup.cs.meta b/Assets/RealCode/Menu/LobbySetup.cs.meta new file mode 100644 index 0000000..b80df90 --- /dev/null +++ b/Assets/RealCode/Menu/LobbySetup.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dc6fbe0d7ac22c949ab3227d60cd4152 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TouhouStation/Assets/RealCode/TileInfo.cs b/Assets/RealCode/TileInfo.cs similarity index 100% rename from TouhouStation/Assets/RealCode/TileInfo.cs rename to Assets/RealCode/TileInfo.cs diff --git a/TouhouStation/Assets/RealCode/TileInfo.cs.meta b/Assets/RealCode/TileInfo.cs.meta similarity index 100% rename from TouhouStation/Assets/RealCode/TileInfo.cs.meta rename to Assets/RealCode/TileInfo.cs.meta diff --git a/TouhouStation/Assets/RealCode/TileRender.cs b/Assets/RealCode/TileRender.cs similarity index 100% rename from TouhouStation/Assets/RealCode/TileRender.cs rename to Assets/RealCode/TileRender.cs diff --git a/TouhouStation/Assets/RealCode/TileRender.cs.meta b/Assets/RealCode/TileRender.cs.meta similarity index 100% rename from TouhouStation/Assets/RealCode/TileRender.cs.meta rename to Assets/RealCode/TileRender.cs.meta diff --git a/TouhouStation/Assets/Resources.meta b/Assets/Resources.meta similarity index 100% rename from TouhouStation/Assets/Resources.meta rename to Assets/Resources.meta diff --git a/TouhouStation/Assets/Resources/Localization.asset b/Assets/Resources/Localization.asset similarity index 91% rename from TouhouStation/Assets/Resources/Localization.asset rename to Assets/Resources/Localization.asset index 69667c9..5b1c0ff 100644 --- a/TouhouStation/Assets/Resources/Localization.asset +++ b/Assets/Resources/Localization.asset @@ -47,6 +47,10 @@ MonoBehaviour: text: ENGLISH ONLY - key: MULTIPLAYER_LEAVE text: LEAVE + - key: MULTIPLAYER_READY + text: READY\nUP + - key: MULTIPLAYER_READYWAITING + text: WAITING japaneseLocals: - key: GAME_SCORE text: "\u30B9\u30B3\u30A2" @@ -82,6 +86,10 @@ MonoBehaviour: text: - key: MULTIPLAYER_LEAVE text: + - key: MULTIPLAYER_READY + text: + - key: MULTIPLAYER_READYWAITING + text: spanishLocals: - key: GAME_SCORE text: @@ -117,3 +125,7 @@ MonoBehaviour: text: - key: MULTIPLAYER_LEAVE text: + - key: MULTIPLAYER_READY + text: + - key: MULTIPLAYER_READYWAITING + text: diff --git a/TouhouStation/Assets/Resources/Localization.asset.meta b/Assets/Resources/Localization.asset.meta similarity index 100% rename from TouhouStation/Assets/Resources/Localization.asset.meta rename to Assets/Resources/Localization.asset.meta diff --git a/TouhouStation/Assets/Scenes.meta b/Assets/Scenes.meta similarity index 100% rename from TouhouStation/Assets/Scenes.meta rename to Assets/Scenes.meta diff --git a/TouhouStation/Assets/Scenes/Board Render.meta b/Assets/Scenes/Board Render.meta similarity index 100% rename from TouhouStation/Assets/Scenes/Board Render.meta rename to Assets/Scenes/Board Render.meta diff --git a/TouhouStation/Assets/Scenes/Board Render/BoardRender.unity b/Assets/Scenes/Board Render/BoardRender.unity similarity index 86% rename from TouhouStation/Assets/Scenes/Board Render/BoardRender.unity rename to Assets/Scenes/Board Render/BoardRender.unity index fcb92a4..ee1cc48 100644 --- a/TouhouStation/Assets/Scenes/Board Render/BoardRender.unity +++ b/Assets/Scenes/Board Render/BoardRender.unity @@ -1410,6 +1410,186 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1736330633638169071, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330633638169071, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330633638169071, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330633760980512, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330633760980512, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330633760980512, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330633775482130, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330633775482130, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330633775482130, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330633916843623, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330633916843623, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330633916843623, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330634003904156, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330634003904156, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330634003904156, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330634159991433, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330634159991433, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330634159991433, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330634177679782, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330634177679782, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330634177679782, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330634248025819, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330634248025819, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330634248025819, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330634454597124, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330634454597124, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330634454597124, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330634653605562, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330634653605562, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330634653605562, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330634900042864, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330634900042864, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330634900042864, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330635014798853, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330635014798853, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330635014798853, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1736330635070797285, guid: adba91609cb1e5448b76682be198fc9b, type: 3} propertyPath: m_Name @@ -1520,6 +1700,21 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1736330635428427867, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330635428427867, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736330635428427867, guid: adba91609cb1e5448b76682be198fc9b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1736330635485585598, guid: adba91609cb1e5448b76682be198fc9b, type: 3} propertyPath: tDisplays.Array.data[0].target @@ -1564,6 +1759,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 333090782, guid: 40e81298fef34864e981a27f7ebaf494, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} + - target: {fileID: 1549891559, guid: 40e81298fef34864e981a27f7ebaf494, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 1335355456932333501, guid: 40e81298fef34864e981a27f7ebaf494, type: 3} propertyPath: m_LocalPosition.x @@ -1629,11 +1832,6 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 0} - - target: {fileID: 4556693130643049114, guid: 40e81298fef34864e981a27f7ebaf494, - type: 3} - propertyPath: m_LocalPosition.x - value: -5 - objectReference: {fileID: 0} - target: {fileID: 4556693131005803445, guid: 40e81298fef34864e981a27f7ebaf494, type: 3} propertyPath: m_Mesh diff --git a/TouhouStation/Assets/Scenes/Board Render/BoardRender.unity.meta b/Assets/Scenes/Board Render/BoardRender.unity.meta similarity index 100% rename from TouhouStation/Assets/Scenes/Board Render/BoardRender.unity.meta rename to Assets/Scenes/Board Render/BoardRender.unity.meta diff --git a/TouhouStation/Assets/Scenes/Board Render/Materials.meta b/Assets/Scenes/Board Render/Materials.meta similarity index 100% rename from TouhouStation/Assets/Scenes/Board Render/Materials.meta rename to Assets/Scenes/Board Render/Materials.meta diff --git a/TouhouStation/Assets/Scenes/Board Render/Materials/Tile.mat b/Assets/Scenes/Board Render/Materials/Tile.mat similarity index 100% rename from TouhouStation/Assets/Scenes/Board Render/Materials/Tile.mat rename to Assets/Scenes/Board Render/Materials/Tile.mat diff --git a/TouhouStation/Assets/Scenes/Board Render/Materials/Tile.mat.meta b/Assets/Scenes/Board Render/Materials/Tile.mat.meta similarity index 100% rename from TouhouStation/Assets/Scenes/Board Render/Materials/Tile.mat.meta rename to Assets/Scenes/Board Render/Materials/Tile.mat.meta diff --git a/TouhouStation/Assets/Scenes/Board Render/Tile.prefab b/Assets/Scenes/Board Render/Tile.prefab similarity index 100% rename from TouhouStation/Assets/Scenes/Board Render/Tile.prefab rename to Assets/Scenes/Board Render/Tile.prefab diff --git a/TouhouStation/Assets/Scenes/Board Render/Tile.prefab.meta b/Assets/Scenes/Board Render/Tile.prefab.meta similarity index 100% rename from TouhouStation/Assets/Scenes/Board Render/Tile.prefab.meta rename to Assets/Scenes/Board Render/Tile.prefab.meta diff --git a/TouhouStation/Assets/Scenes/Board Render/board.png b/Assets/Scenes/Board Render/board.png similarity index 100% rename from TouhouStation/Assets/Scenes/Board Render/board.png rename to Assets/Scenes/Board Render/board.png diff --git a/TouhouStation/Assets/Scenes/Board Render/board.png.meta b/Assets/Scenes/Board Render/board.png.meta similarity index 100% rename from TouhouStation/Assets/Scenes/Board Render/board.png.meta rename to Assets/Scenes/Board Render/board.png.meta diff --git a/TouhouStation/Assets/Scenes/Board Render/boardoutline.png b/Assets/Scenes/Board Render/boardoutline.png similarity index 100% rename from TouhouStation/Assets/Scenes/Board Render/boardoutline.png rename to Assets/Scenes/Board Render/boardoutline.png diff --git a/TouhouStation/Assets/Scenes/Board Render/boardoutline.png.meta b/Assets/Scenes/Board Render/boardoutline.png.meta similarity index 100% rename from TouhouStation/Assets/Scenes/Board Render/boardoutline.png.meta rename to Assets/Scenes/Board Render/boardoutline.png.meta diff --git a/TouhouStation/Assets/Scenes/Board Render/boardscore.png b/Assets/Scenes/Board Render/boardscore.png similarity index 100% rename from TouhouStation/Assets/Scenes/Board Render/boardscore.png rename to Assets/Scenes/Board Render/boardscore.png diff --git a/TouhouStation/Assets/Scenes/Board Render/boardscore.png.meta b/Assets/Scenes/Board Render/boardscore.png.meta similarity index 100% rename from TouhouStation/Assets/Scenes/Board Render/boardscore.png.meta rename to Assets/Scenes/Board Render/boardscore.png.meta diff --git a/TouhouStation/Assets/Scenes/Board Render/boardscoreLip.png b/Assets/Scenes/Board Render/boardscoreLip.png similarity index 100% rename from TouhouStation/Assets/Scenes/Board Render/boardscoreLip.png rename to Assets/Scenes/Board Render/boardscoreLip.png diff --git a/TouhouStation/Assets/Scenes/Board Render/boardscoreLip.png.meta b/Assets/Scenes/Board Render/boardscoreLip.png.meta similarity index 100% rename from TouhouStation/Assets/Scenes/Board Render/boardscoreLip.png.meta rename to Assets/Scenes/Board Render/boardscoreLip.png.meta diff --git a/TouhouStation/Assets/Scenes/Board Render/boardscoreoutline.png b/Assets/Scenes/Board Render/boardscoreoutline.png similarity index 100% rename from TouhouStation/Assets/Scenes/Board Render/boardscoreoutline.png rename to Assets/Scenes/Board Render/boardscoreoutline.png diff --git a/TouhouStation/Assets/Scenes/Board Render/boardscoreoutline.png.meta b/Assets/Scenes/Board Render/boardscoreoutline.png.meta similarity index 100% rename from TouhouStation/Assets/Scenes/Board Render/boardscoreoutline.png.meta rename to Assets/Scenes/Board Render/boardscoreoutline.png.meta diff --git a/TouhouStation/Assets/Scenes/Board Render/boardtiles.png b/Assets/Scenes/Board Render/boardtiles.png similarity index 100% rename from TouhouStation/Assets/Scenes/Board Render/boardtiles.png rename to Assets/Scenes/Board Render/boardtiles.png diff --git a/TouhouStation/Assets/Scenes/Board Render/boardtiles.png.meta b/Assets/Scenes/Board Render/boardtiles.png.meta similarity index 100% rename from TouhouStation/Assets/Scenes/Board Render/boardtiles.png.meta rename to Assets/Scenes/Board Render/boardtiles.png.meta diff --git a/TouhouStation/Assets/Scenes/Menu.meta b/Assets/Scenes/Menu.meta similarity index 100% rename from TouhouStation/Assets/Scenes/Menu.meta rename to Assets/Scenes/Menu.meta diff --git a/TouhouStation/Assets/Scenes/Menu/menu_button-unselected.png b/Assets/Scenes/Menu/menu_button-unselected.png similarity index 100% rename from TouhouStation/Assets/Scenes/Menu/menu_button-unselected.png rename to Assets/Scenes/Menu/menu_button-unselected.png diff --git a/TouhouStation/Assets/Scenes/Menu/menu_button-unselected.png.meta b/Assets/Scenes/Menu/menu_button-unselected.png.meta similarity index 100% rename from TouhouStation/Assets/Scenes/Menu/menu_button-unselected.png.meta rename to Assets/Scenes/Menu/menu_button-unselected.png.meta diff --git a/TouhouStation/Assets/Scenes/Menu/toggle.png b/Assets/Scenes/Menu/toggle.png similarity index 100% rename from TouhouStation/Assets/Scenes/Menu/toggle.png rename to Assets/Scenes/Menu/toggle.png diff --git a/TouhouStation/Assets/Scenes/Menu/toggle.png.meta b/Assets/Scenes/Menu/toggle.png.meta similarity index 100% rename from TouhouStation/Assets/Scenes/Menu/toggle.png.meta rename to Assets/Scenes/Menu/toggle.png.meta diff --git a/TouhouStation/Assets/Scenes/Menu/togglefill.png b/Assets/Scenes/Menu/togglefill.png similarity index 100% rename from TouhouStation/Assets/Scenes/Menu/togglefill.png rename to Assets/Scenes/Menu/togglefill.png diff --git a/TouhouStation/Assets/Scenes/Menu/togglefill.png.meta b/Assets/Scenes/Menu/togglefill.png.meta similarity index 100% rename from TouhouStation/Assets/Scenes/Menu/togglefill.png.meta rename to Assets/Scenes/Menu/togglefill.png.meta diff --git a/TouhouStation/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity similarity index 100% rename from TouhouStation/Assets/Scenes/SampleScene.unity rename to Assets/Scenes/SampleScene.unity diff --git a/TouhouStation/Assets/Scenes/SampleScene.unity.meta b/Assets/Scenes/SampleScene.unity.meta similarity index 100% rename from TouhouStation/Assets/Scenes/SampleScene.unity.meta rename to Assets/Scenes/SampleScene.unity.meta diff --git a/TouhouStation/Assets/TextMesh Pro.meta b/Assets/TextMesh Pro.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro.meta rename to Assets/TextMesh Pro.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Documentation.meta b/Assets/TextMesh Pro/Documentation.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Documentation.meta rename to Assets/TextMesh Pro/Documentation.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf b/Assets/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf rename to Assets/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf diff --git a/TouhouStation/Assets/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf.meta b/Assets/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf.meta rename to Assets/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Fonts.meta b/Assets/TextMesh Pro/Fonts.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Fonts.meta rename to Assets/TextMesh Pro/Fonts.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Fonts/LiberationSans - OFL.txt b/Assets/TextMesh Pro/Fonts/LiberationSans - OFL.txt similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Fonts/LiberationSans - OFL.txt rename to Assets/TextMesh Pro/Fonts/LiberationSans - OFL.txt diff --git a/TouhouStation/Assets/TextMesh Pro/Fonts/LiberationSans - OFL.txt.meta b/Assets/TextMesh Pro/Fonts/LiberationSans - OFL.txt.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Fonts/LiberationSans - OFL.txt.meta rename to Assets/TextMesh Pro/Fonts/LiberationSans - OFL.txt.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Fonts/LiberationSans.ttf b/Assets/TextMesh Pro/Fonts/LiberationSans.ttf similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Fonts/LiberationSans.ttf rename to Assets/TextMesh Pro/Fonts/LiberationSans.ttf diff --git a/TouhouStation/Assets/TextMesh Pro/Fonts/LiberationSans.ttf.meta b/Assets/TextMesh Pro/Fonts/LiberationSans.ttf.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Fonts/LiberationSans.ttf.meta rename to Assets/TextMesh Pro/Fonts/LiberationSans.ttf.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources.meta b/Assets/TextMesh Pro/Resources.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources.meta rename to Assets/TextMesh Pro/Resources.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Fonts & Materials.meta b/Assets/TextMesh Pro/Resources/Fonts & Materials.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Fonts & Materials.meta rename to Assets/TextMesh Pro/Resources/Fonts & Materials.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat rename to Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat.meta b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat.meta rename to Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset rename to Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta rename to Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat rename to Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat.meta b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat.meta rename to Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset rename to Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset.meta b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset.meta rename to Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/LineBreaking Following Characters.txt b/Assets/TextMesh Pro/Resources/LineBreaking Following Characters.txt similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/LineBreaking Following Characters.txt rename to Assets/TextMesh Pro/Resources/LineBreaking Following Characters.txt diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/LineBreaking Following Characters.txt.meta b/Assets/TextMesh Pro/Resources/LineBreaking Following Characters.txt.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/LineBreaking Following Characters.txt.meta rename to Assets/TextMesh Pro/Resources/LineBreaking Following Characters.txt.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/LineBreaking Leading Characters.txt b/Assets/TextMesh Pro/Resources/LineBreaking Leading Characters.txt similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/LineBreaking Leading Characters.txt rename to Assets/TextMesh Pro/Resources/LineBreaking Leading Characters.txt diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/LineBreaking Leading Characters.txt.meta b/Assets/TextMesh Pro/Resources/LineBreaking Leading Characters.txt.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/LineBreaking Leading Characters.txt.meta rename to Assets/TextMesh Pro/Resources/LineBreaking Leading Characters.txt.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders.meta b/Assets/TextMesh Pro/Resources/Shaders.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders.meta rename to Assets/TextMesh Pro/Resources/Shaders.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap-Custom-Atlas.shader b/Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap-Custom-Atlas.shader similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap-Custom-Atlas.shader rename to Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap-Custom-Atlas.shader diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap-Custom-Atlas.shader.meta b/Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap-Custom-Atlas.shader.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap-Custom-Atlas.shader.meta rename to Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap-Custom-Atlas.shader.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap-Mobile.shader b/Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap-Mobile.shader similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap-Mobile.shader rename to Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap-Mobile.shader diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap-Mobile.shader.meta b/Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap-Mobile.shader.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap-Mobile.shader.meta rename to Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap-Mobile.shader.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap.shader b/Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap.shader similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap.shader rename to Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap.shader diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap.shader.meta b/Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap.shader.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap.shader.meta rename to Assets/TextMesh Pro/Resources/Shaders/TMP_Bitmap.shader.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF Overlay.shader b/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF Overlay.shader similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF Overlay.shader rename to Assets/TextMesh Pro/Resources/Shaders/TMP_SDF Overlay.shader diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF Overlay.shader.meta b/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF Overlay.shader.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF Overlay.shader.meta rename to Assets/TextMesh Pro/Resources/Shaders/TMP_SDF Overlay.shader.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Masking.shader b/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Masking.shader similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Masking.shader rename to Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Masking.shader diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Masking.shader.meta b/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Masking.shader.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Masking.shader.meta rename to Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Masking.shader.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Overlay.shader b/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Overlay.shader similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Overlay.shader rename to Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Overlay.shader diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Overlay.shader.meta b/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Overlay.shader.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Overlay.shader.meta rename to Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Overlay.shader.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile.shader b/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile.shader similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile.shader rename to Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile.shader diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile.shader.meta b/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile.shader.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile.shader.meta rename to Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile.shader.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface-Mobile.shader b/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface-Mobile.shader similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface-Mobile.shader rename to Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface-Mobile.shader diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface-Mobile.shader.meta b/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface-Mobile.shader.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface-Mobile.shader.meta rename to Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface-Mobile.shader.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface.shader b/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface.shader similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface.shader rename to Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface.shader diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface.shader.meta b/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface.shader.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface.shader.meta rename to Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface.shader.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF.shader b/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF.shader similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF.shader rename to Assets/TextMesh Pro/Resources/Shaders/TMP_SDF.shader diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF.shader.meta b/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF.shader.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_SDF.shader.meta rename to Assets/TextMesh Pro/Resources/Shaders/TMP_SDF.shader.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_Sprite.shader b/Assets/TextMesh Pro/Resources/Shaders/TMP_Sprite.shader similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_Sprite.shader rename to Assets/TextMesh Pro/Resources/Shaders/TMP_Sprite.shader diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_Sprite.shader.meta b/Assets/TextMesh Pro/Resources/Shaders/TMP_Sprite.shader.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMP_Sprite.shader.meta rename to Assets/TextMesh Pro/Resources/Shaders/TMP_Sprite.shader.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMPro.cginc b/Assets/TextMesh Pro/Resources/Shaders/TMPro.cginc similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMPro.cginc rename to Assets/TextMesh Pro/Resources/Shaders/TMPro.cginc diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMPro.cginc.meta b/Assets/TextMesh Pro/Resources/Shaders/TMPro.cginc.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMPro.cginc.meta rename to Assets/TextMesh Pro/Resources/Shaders/TMPro.cginc.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc b/Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc rename to Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc.meta b/Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc.meta rename to Assets/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMPro_Surface.cginc b/Assets/TextMesh Pro/Resources/Shaders/TMPro_Surface.cginc similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMPro_Surface.cginc rename to Assets/TextMesh Pro/Resources/Shaders/TMPro_Surface.cginc diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMPro_Surface.cginc.meta b/Assets/TextMesh Pro/Resources/Shaders/TMPro_Surface.cginc.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Shaders/TMPro_Surface.cginc.meta rename to Assets/TextMesh Pro/Resources/Shaders/TMPro_Surface.cginc.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Sprite Assets.meta b/Assets/TextMesh Pro/Resources/Sprite Assets.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Sprite Assets.meta rename to Assets/TextMesh Pro/Resources/Sprite Assets.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset b/Assets/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset rename to Assets/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset.meta b/Assets/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset.meta rename to Assets/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Style Sheets.meta b/Assets/TextMesh Pro/Resources/Style Sheets.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Style Sheets.meta rename to Assets/TextMesh Pro/Resources/Style Sheets.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset b/Assets/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset rename to Assets/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset.meta b/Assets/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset.meta rename to Assets/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/TMP Settings.asset b/Assets/TextMesh Pro/Resources/TMP Settings.asset similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/TMP Settings.asset rename to Assets/TextMesh Pro/Resources/TMP Settings.asset diff --git a/TouhouStation/Assets/TextMesh Pro/Resources/TMP Settings.asset.meta b/Assets/TextMesh Pro/Resources/TMP Settings.asset.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Resources/TMP Settings.asset.meta rename to Assets/TextMesh Pro/Resources/TMP Settings.asset.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Sprites.meta b/Assets/TextMesh Pro/Sprites.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Sprites.meta rename to Assets/TextMesh Pro/Sprites.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Sprites/EmojiOne Attribution.txt b/Assets/TextMesh Pro/Sprites/EmojiOne Attribution.txt similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Sprites/EmojiOne Attribution.txt rename to Assets/TextMesh Pro/Sprites/EmojiOne Attribution.txt diff --git a/TouhouStation/Assets/TextMesh Pro/Sprites/EmojiOne Attribution.txt.meta b/Assets/TextMesh Pro/Sprites/EmojiOne Attribution.txt.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Sprites/EmojiOne Attribution.txt.meta rename to Assets/TextMesh Pro/Sprites/EmojiOne Attribution.txt.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Sprites/EmojiOne.json b/Assets/TextMesh Pro/Sprites/EmojiOne.json similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Sprites/EmojiOne.json rename to Assets/TextMesh Pro/Sprites/EmojiOne.json diff --git a/TouhouStation/Assets/TextMesh Pro/Sprites/EmojiOne.json.meta b/Assets/TextMesh Pro/Sprites/EmojiOne.json.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Sprites/EmojiOne.json.meta rename to Assets/TextMesh Pro/Sprites/EmojiOne.json.meta diff --git a/TouhouStation/Assets/TextMesh Pro/Sprites/EmojiOne.png b/Assets/TextMesh Pro/Sprites/EmojiOne.png similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Sprites/EmojiOne.png rename to Assets/TextMesh Pro/Sprites/EmojiOne.png diff --git a/TouhouStation/Assets/TextMesh Pro/Sprites/EmojiOne.png.meta b/Assets/TextMesh Pro/Sprites/EmojiOne.png.meta similarity index 100% rename from TouhouStation/Assets/TextMesh Pro/Sprites/EmojiOne.png.meta rename to Assets/TextMesh Pro/Sprites/EmojiOne.png.meta diff --git a/TouhouStation/Assets/menu_titleback.png b/Assets/menu_titleback.png similarity index 100% rename from TouhouStation/Assets/menu_titleback.png rename to Assets/menu_titleback.png diff --git a/TouhouStation/Assets/menu_titleback.png.meta b/Assets/menu_titleback.png.meta similarity index 100% rename from TouhouStation/Assets/menu_titleback.png.meta rename to Assets/menu_titleback.png.meta diff --git a/TouhouStation/Packages/manifest.json b/Packages/manifest.json similarity index 100% rename from TouhouStation/Packages/manifest.json rename to Packages/manifest.json diff --git a/TouhouStation/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset similarity index 100% rename from TouhouStation/ProjectSettings/AudioManager.asset rename to ProjectSettings/AudioManager.asset diff --git a/TouhouStation/ProjectSettings/ClusterInputManager.asset b/ProjectSettings/ClusterInputManager.asset similarity index 100% rename from TouhouStation/ProjectSettings/ClusterInputManager.asset rename to ProjectSettings/ClusterInputManager.asset diff --git a/TouhouStation/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset similarity index 100% rename from TouhouStation/ProjectSettings/DynamicsManager.asset rename to ProjectSettings/DynamicsManager.asset diff --git a/TouhouStation/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset similarity index 100% rename from TouhouStation/ProjectSettings/EditorBuildSettings.asset rename to ProjectSettings/EditorBuildSettings.asset diff --git a/TouhouStation/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset similarity index 100% rename from TouhouStation/ProjectSettings/EditorSettings.asset rename to ProjectSettings/EditorSettings.asset diff --git a/TouhouStation/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset similarity index 100% rename from TouhouStation/ProjectSettings/GraphicsSettings.asset rename to ProjectSettings/GraphicsSettings.asset diff --git a/TouhouStation/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset similarity index 100% rename from TouhouStation/ProjectSettings/InputManager.asset rename to ProjectSettings/InputManager.asset diff --git a/TouhouStation/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset similarity index 100% rename from TouhouStation/ProjectSettings/NavMeshAreas.asset rename to ProjectSettings/NavMeshAreas.asset diff --git a/TouhouStation/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset similarity index 100% rename from TouhouStation/ProjectSettings/Physics2DSettings.asset rename to ProjectSettings/Physics2DSettings.asset diff --git a/TouhouStation/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset similarity index 100% rename from TouhouStation/ProjectSettings/PresetManager.asset rename to ProjectSettings/PresetManager.asset diff --git a/TouhouStation/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset similarity index 100% rename from TouhouStation/ProjectSettings/ProjectSettings.asset rename to ProjectSettings/ProjectSettings.asset diff --git a/TouhouStation/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt similarity index 100% rename from TouhouStation/ProjectSettings/ProjectVersion.txt rename to ProjectSettings/ProjectVersion.txt diff --git a/TouhouStation/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset similarity index 100% rename from TouhouStation/ProjectSettings/QualitySettings.asset rename to ProjectSettings/QualitySettings.asset diff --git a/TouhouStation/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset similarity index 100% rename from TouhouStation/ProjectSettings/TagManager.asset rename to ProjectSettings/TagManager.asset diff --git a/TouhouStation/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset similarity index 100% rename from TouhouStation/ProjectSettings/TimeManager.asset rename to ProjectSettings/TimeManager.asset diff --git a/TouhouStation/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset similarity index 100% rename from TouhouStation/ProjectSettings/UnityConnectSettings.asset rename to ProjectSettings/UnityConnectSettings.asset diff --git a/TouhouStation/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset similarity index 100% rename from TouhouStation/ProjectSettings/VFXManager.asset rename to ProjectSettings/VFXManager.asset diff --git a/TouhouStation/ProjectSettings/XRSettings.asset b/ProjectSettings/XRSettings.asset similarity index 100% rename from TouhouStation/ProjectSettings/XRSettings.asset rename to ProjectSettings/XRSettings.asset diff --git a/TouhouStation/Assets/Art/menu_ok-Z_noZ.png b/TouhouStation/Assets/Art/menu_ok-Z_noZ.png deleted file mode 100644 index f33c9ea..0000000 Binary files a/TouhouStation/Assets/Art/menu_ok-Z_noZ.png and /dev/null differ diff --git a/TouhouStation/Assets/Scenes/Board Render/scoreOutlineSliced.png b/TouhouStation/Assets/Scenes/Board Render/scoreOutlineSliced.png deleted file mode 100644 index 9fbb990..0000000 Binary files a/TouhouStation/Assets/Scenes/Board Render/scoreOutlineSliced.png and /dev/null differ diff --git a/TouhouStation/Logs/Packages-Update.log b/TouhouStation/Logs/Packages-Update.log deleted file mode 100644 index 4e5591a..0000000 --- a/TouhouStation/Logs/Packages-Update.log +++ /dev/null @@ -1,45 +0,0 @@ - -=== Wed Aug 19 21:15:30 2020 - -Packages were changed. -Update Mode: mergeDefaultDependencies - -The following packages were added: - com.unity.textmeshpro@2.0.1 - com.unity.collab-proxy@1.2.16 - com.unity.test-framework@1.1.3 - com.unity.timeline@1.2.6 - com.unity.ide.vscode@1.1.3 - com.unity.ide.rider@1.1.4 - com.unity.ugui@1.0.0 - com.unity.modules.ai@1.0.0 - com.unity.modules.animation@1.0.0 - com.unity.modules.androidjni@1.0.0 - com.unity.modules.assetbundle@1.0.0 - com.unity.modules.audio@1.0.0 - com.unity.modules.cloth@1.0.0 - com.unity.modules.director@1.0.0 - com.unity.modules.imageconversion@1.0.0 - com.unity.modules.imgui@1.0.0 - com.unity.modules.jsonserialize@1.0.0 - com.unity.modules.particlesystem@1.0.0 - com.unity.modules.physics@1.0.0 - com.unity.modules.physics2d@1.0.0 - com.unity.modules.screencapture@1.0.0 - com.unity.modules.terrain@1.0.0 - com.unity.modules.terrainphysics@1.0.0 - com.unity.modules.tilemap@1.0.0 - com.unity.modules.ui@1.0.0 - com.unity.modules.uielements@1.0.0 - com.unity.modules.umbra@1.0.0 - com.unity.modules.unityanalytics@1.0.0 - com.unity.modules.unitywebrequest@1.0.0 - com.unity.modules.unitywebrequestassetbundle@1.0.0 - com.unity.modules.unitywebrequestaudio@1.0.0 - com.unity.modules.unitywebrequesttexture@1.0.0 - com.unity.modules.unitywebrequestwww@1.0.0 - com.unity.modules.vehicles@1.0.0 - com.unity.modules.video@1.0.0 - com.unity.modules.vr@1.0.0 - com.unity.modules.wind@1.0.0 - com.unity.modules.xr@1.0.0 diff --git a/TouhouStation/ProjectSettings/NetworkManager.asset b/TouhouStation/ProjectSettings/NetworkManager.asset deleted file mode 100644 index 5dc6a83..0000000 --- a/TouhouStation/ProjectSettings/NetworkManager.asset +++ /dev/null @@ -1,8 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!149 &1 -NetworkManager: - m_ObjectHideFlags: 0 - m_DebugLevel: 0 - m_Sendrate: 15 - m_AssetToPrefab: {}