diff --git a/.editorconfig b/.editorconfig index b9b421d44b3..18d130ef99c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,7 +5,7 @@ root = true charset = utf-8 end_of_line = lf insert_final_newline = true -tab_width = 8 +tab_width = 4 trim_trailing_whitespace = true [*.{cs,csproj,md,xml}] @@ -41,3 +41,8 @@ quote_type = double [*.sln] indent_style = tab + +[*.{yaml, yml}] +indent_size = 2 +quote_type = double +tab_width = 2 diff --git a/.gitattributes b/.gitattributes index 8d9bc7827f5..6299718528d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,6 @@ nekoyume/Assets/Plugins/**/*.so filter=lfs diff=lfs merge=lfs -text tools/**/*.exe filter=lfs diff=lfs merge=lfs -text +nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.so filter=lfs diff=lfs merge=lfs -text +nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.so filter=lfs diff=lfs merge=lfs -text +nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.bundle filter=lfs diff=lfs merge=lfs -text +nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.bundle filter=lfs diff=lfs merge=lfs -text diff --git a/.github/workflows/build-via-workflow-dispatch.yaml b/.github/workflows/build-via-workflow-dispatch.yaml new file mode 100644 index 00000000000..1de7d41763e --- /dev/null +++ b/.github/workflows/build-via-workflow-dispatch.yaml @@ -0,0 +1,93 @@ +name: Build via Workflow Dispatch +on: + workflow_dispatch: + inputs: + targetPlatform: + description: "Target Platform" + required: true + type: choice + default: "Android" + options: + - "Android(AAB)" + - "Android(APK)" + - "StandaloneWindows" + - "StandaloneLinux64" + - "StandaloneOSX" + clo: + description: "Assets/StreamingAssets/clo.json" + required: false + type: string + default: "" + +jobs: + build: + name: Build for ${{ github.event.inputs.targetPlatform }} + env: + TARGET_PLATFORM: ${{ + startsWith(github.event.inputs.targetPlatform, 'Android') + && 'Android' + || github.event.inputs.targetPlatform + }} + UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} + UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} + UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }} + runs-on: + labels: ["linux", "8cores"] + steps: + - uses: actions/checkout@v3 + with: + lfs: true + submodules: true + + - uses: actions/cache@v3 + with: + path: nekoyume/Library + key: Library-nekoyume-ubuntu-${{ github.env.TARGET_PLATFORM }} + restore-keys: | + Library-nekoyume-ubuntu- + Library- + + - name: Copy clo.json + run: | + if [ -n "${{ github.event.inputs.clo }}" ]; then + echo ${{ github.event.inputs.clo }} > nekoyume/Assets/StreamingAssets/clo.json + fi + + - uses: game-ci/unity-builder@v2 + with: + androidAppBundle: ${{ github.event.inputs.targetPlatform == 'Android(AAB)' }} + androidKeystoreName: 9c-aos-signing-keystore.keystore # This file won't exist, but this property needs to exist. + androidKeystoreBase64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }} + androidKeystorePass: ${{ secrets.ANDROID_KEYSTORE_PASS }} + androidKeyaliasName: ${{ secrets.ANDROID_KEY_ALIAS_NAME }} + androidKeyaliasPass: ${{ secrets.ANDROID_KEY_ALIAS_PASS }} + buildMethod: "Editor.Builder.Build${{ github.env.TARGET_PLATFORM }}" + buildName: ${{ github.env.TARGET_PLATFORM }} + projectPath: nekoyume + targetPlatform: ${{ github.env.TARGET_PLATFORM }} + + - uses: actions/setup-python@v4 + with: + python-version: 3.11.0 + + - name: Pack + run: | + if [ github.env.TARGET_PLATFORM == "Android" ]; then + tr -d "\r" < .github/bin/pack.sh > .github/bin/pack_trimed.sh + rm .github/bin/pack.sh + mv .github/bin/pack_trimed.sh .github/bin/pack.sh + fi + + sudo mv $GITHUB_WORKSPACE/build /tmp/player + pip3 install wheel + sudo bash .github/bin/pack.sh \ + /tmp/packages \ + "${{ github.env.TARGET_PLATFORM }}" \ + "/tmp/player" + + - uses: actions/upload-artifact@v3 + with: + name: Build-${{ github.env.TARGET_PLATFORM }} + path: /tmp/packages + retention-days: 7 + if-no-files-found: error diff --git a/.gitignore b/.gitignore index b2c8d3b3a21..8d0cb626141 100644 --- a/.gitignore +++ b/.gitignore @@ -112,3 +112,4 @@ nekoyume/Assets/StreamingAssets/9c_dev* # Keystores *.keystore +*.keystore.meta diff --git a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/CombinationBtn.prefab b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/CombinationBtn.prefab index 2407aadd10a..885032ba1ef 100644 --- a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/CombinationBtn.prefab +++ b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/CombinationBtn.prefab @@ -12582,12 +12582,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7004156271689514272} - m_RootOrder: 4 + m_Father: {fileID: 8338442938563373544} + 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: 173.53996, y: -36.620007} + m_AnchoredPosition: {x: 115.53996, y: -36.620007} m_SizeDelta: {x: 130, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8338442937347405793 @@ -12961,6 +12961,7 @@ RectTransform: - {fileID: 1148819529888051777} - {fileID: 5204584470288503779} - {fileID: 7004156271689514272} + - {fileID: 8338442937347405798} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -13484,7 +13485,6 @@ RectTransform: - {fileID: 8338442937243993079} - {fileID: 1944878149879175434} - {fileID: 4116474407613894361} - - {fileID: 8338442937347405798} m_Father: {fileID: 8338442938563373544} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/RaidBtn.prefab b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/RaidBtn.prefab index e393e438ca2..dd21993eaf4 100644 --- a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/RaidBtn.prefab +++ b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/RaidBtn.prefab @@ -29368,12 +29368,12 @@ RectTransform: m_LocalScale: {x: 1.1, y: 1.1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4617867177338651019} - m_RootOrder: 5 + m_Father: {fileID: 6684225965647263715} + m_RootOrder: 2 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: -48} + m_AnchoredPosition: {x: 0, y: -78.00001} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6752938357428850992 @@ -49761,7 +49761,6 @@ RectTransform: - {fileID: 2289669823915776800} - {fileID: 6210845405394287771} - {fileID: 8822888979465370497} - - {fileID: 6659974995213235428} m_Father: {fileID: 6684225965647263715} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -65620,6 +65619,7 @@ RectTransform: m_Children: - {fileID: 4617867177338651019} - {fileID: 8088310778780114024} + - {fileID: 6659974995213235428} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/RankingBtn.prefab b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/RankingBtn.prefab index 099be887ac0..c7b96ecb7cf 100644 --- a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/RankingBtn.prefab +++ b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/RankingBtn.prefab @@ -388,6 +388,7 @@ RectTransform: - {fileID: 21887679660293355} - {fileID: 2505441311892281251} - {fileID: 8232355514928224794} + - {fileID: 6864952659803937324} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1576,7 +1577,7 @@ RectTransform: m_LocalScale: {x: 1.1, y: 1.1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2505441311892281251} + m_Father: {fileID: 21887680680723080} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2587,7 +2588,6 @@ RectTransform: - {fileID: 21887681494209307} - {fileID: 7604452899302235937} - {fileID: 654358469586272635} - - {fileID: 6864952659803937324} m_Father: {fileID: 21887680680723080} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/ShopBtn.prefab b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/ShopBtn.prefab index 6575dab6ca8..94d02bf2c98 100644 --- a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/ShopBtn.prefab +++ b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/ShopBtn.prefab @@ -1337,6 +1337,7 @@ RectTransform: - {fileID: 2117963323469927503} - {fileID: 8347244533818123768} - {fileID: 7716833337508423867} + - {fileID: 9044489233577518989} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2320,7 +2321,6 @@ RectTransform: - {fileID: 2543131741972588869} - {fileID: 2543131741813834659} - {fileID: 9184220585697022119} - - {fileID: 9044489233577518989} m_Father: {fileID: 1806947039787728185} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4401,8 +4401,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2117963323469927503} - m_RootOrder: 3 + m_Father: {fileID: 1806947039787728185} + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/StakingBtn.prefab b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/StakingBtn.prefab index 54405c11d0c..6cd48c76ed5 100644 --- a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/StakingBtn.prefab +++ b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/StakingBtn.prefab @@ -106,7 +106,7 @@ RectTransform: m_Children: - {fileID: 8054985533658865450} m_Father: {fileID: 7702144876723794782} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -150,6 +150,7 @@ RectTransform: - {fileID: 3317755364091931427} - {fileID: 7702144876723794782} - {fileID: 814064675049409318} + - {fileID: 3028424330904642687} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -330,12 +331,12 @@ RectTransform: m_LocalScale: {x: 1.1, y: 1.1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7702144876723794782} - m_RootOrder: 0 + m_Father: {fileID: 2674885860706672921} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -21.999989} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1806462785869275233 @@ -494,7 +495,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3028424330904642687} - {fileID: 2660394460532417418} m_Father: {fileID: 2674885860706672921} m_RootOrder: 1 diff --git a/nekoyume/Assets/Editor Default Resources/Firebase.meta b/nekoyume/Assets/Editor Default Resources/Firebase.meta new file mode 100644 index 00000000000..7fe5b5c8080 --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8fd581a450dee4a92a55abe8099d41af +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_analytics.png b/nekoyume/Assets/Editor Default Resources/Firebase/fb_analytics.png new file mode 100755 index 00000000000..3f19563a023 Binary files /dev/null and b/nekoyume/Assets/Editor Default Resources/Firebase/fb_analytics.png differ diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_analytics.png.meta b/nekoyume/Assets/Editor Default Resources/Firebase/fb_analytics.png.meta new file mode 100644 index 00000000000..e6b3094db6d --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase/fb_analytics.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: dc218b335b1d14cd5ae532f65042d829 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_analytics.png +timeCreated: 1473376337 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_analytics_dark.png b/nekoyume/Assets/Editor Default Resources/Firebase/fb_analytics_dark.png new file mode 100755 index 00000000000..e6b922e93e8 Binary files /dev/null and b/nekoyume/Assets/Editor Default Resources/Firebase/fb_analytics_dark.png differ diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_analytics_dark.png.meta b/nekoyume/Assets/Editor Default Resources/Firebase/fb_analytics_dark.png.meta new file mode 100644 index 00000000000..2bca21643fc --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase/fb_analytics_dark.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 9fe4b3bd3b7d2477dac92fb7429d1d1b +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_analytics_dark.png +timeCreated: 1472679008 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_auth.png b/nekoyume/Assets/Editor Default Resources/Firebase/fb_auth.png new file mode 100755 index 00000000000..b5ccfe98d33 Binary files /dev/null and b/nekoyume/Assets/Editor Default Resources/Firebase/fb_auth.png differ diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_auth.png.meta b/nekoyume/Assets/Editor Default Resources/Firebase/fb_auth.png.meta new file mode 100644 index 00000000000..be627201602 --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase/fb_auth.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 394b3ec4d60c24476a12e4ba696d9e5d +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_auth.png +timeCreated: 1473376335 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_auth_dark.png b/nekoyume/Assets/Editor Default Resources/Firebase/fb_auth_dark.png new file mode 100755 index 00000000000..e90ec77138b Binary files /dev/null and b/nekoyume/Assets/Editor Default Resources/Firebase/fb_auth_dark.png differ diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_auth_dark.png.meta b/nekoyume/Assets/Editor Default Resources/Firebase/fb_auth_dark.png.meta new file mode 100644 index 00000000000..8cd87a2693f --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase/fb_auth_dark.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 3a9e1ef6287664c389bb09e2ac1b23b7 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_auth_dark.png +timeCreated: 1472679008 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_cloud_messaging.png b/nekoyume/Assets/Editor Default Resources/Firebase/fb_cloud_messaging.png new file mode 100755 index 00000000000..350c03f7eb9 Binary files /dev/null and b/nekoyume/Assets/Editor Default Resources/Firebase/fb_cloud_messaging.png differ diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_cloud_messaging.png.meta b/nekoyume/Assets/Editor Default Resources/Firebase/fb_cloud_messaging.png.meta new file mode 100644 index 00000000000..10e6195fa53 --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase/fb_cloud_messaging.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 837e8e1f35e334e81931d0857680cebf +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_cloud_messaging.png +timeCreated: 1473376336 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_cloud_messaging_dark.png b/nekoyume/Assets/Editor Default Resources/Firebase/fb_cloud_messaging_dark.png new file mode 100755 index 00000000000..1fbb8dc7c3f Binary files /dev/null and b/nekoyume/Assets/Editor Default Resources/Firebase/fb_cloud_messaging_dark.png differ diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_cloud_messaging_dark.png.meta b/nekoyume/Assets/Editor Default Resources/Firebase/fb_cloud_messaging_dark.png.meta new file mode 100644 index 00000000000..cde454ad442 --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase/fb_cloud_messaging_dark.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 20c5b8a1f82cb4aadb77ca20683d2a6e +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_cloud_messaging_dark.png +timeCreated: 1472679008 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_config.png b/nekoyume/Assets/Editor Default Resources/Firebase/fb_config.png new file mode 100755 index 00000000000..3c69287360c Binary files /dev/null and b/nekoyume/Assets/Editor Default Resources/Firebase/fb_config.png differ diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_config.png.meta b/nekoyume/Assets/Editor Default Resources/Firebase/fb_config.png.meta new file mode 100644 index 00000000000..290c18139b8 --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase/fb_config.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 415eaec414af14d11955222a282aca08 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_config.png +timeCreated: 1473376335 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_config_dark.png b/nekoyume/Assets/Editor Default Resources/Firebase/fb_config_dark.png new file mode 100755 index 00000000000..5441081da38 Binary files /dev/null and b/nekoyume/Assets/Editor Default Resources/Firebase/fb_config_dark.png differ diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_config_dark.png.meta b/nekoyume/Assets/Editor Default Resources/Firebase/fb_config_dark.png.meta new file mode 100644 index 00000000000..df488dfc23d --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase/fb_config_dark.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 0ad9ef5fff5524355a9670c90a99cbba +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_config_dark.png +timeCreated: 1472679008 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_crashlytics.png b/nekoyume/Assets/Editor Default Resources/Firebase/fb_crashlytics.png new file mode 100755 index 00000000000..e9b7cad8b29 Binary files /dev/null and b/nekoyume/Assets/Editor Default Resources/Firebase/fb_crashlytics.png differ diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_crashlytics.png.meta b/nekoyume/Assets/Editor Default Resources/Firebase/fb_crashlytics.png.meta new file mode 100644 index 00000000000..180e69c2783 --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase/fb_crashlytics.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 008a5e76206e49f9b06d8ba144aabb38 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_crashlytics.png +timeCreated: 1473376335 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_crashlytics_dark.png b/nekoyume/Assets/Editor Default Resources/Firebase/fb_crashlytics_dark.png new file mode 100755 index 00000000000..52f5d48f910 Binary files /dev/null and b/nekoyume/Assets/Editor Default Resources/Firebase/fb_crashlytics_dark.png differ diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_crashlytics_dark.png.meta b/nekoyume/Assets/Editor Default Resources/Firebase/fb_crashlytics_dark.png.meta new file mode 100644 index 00000000000..90df78232d4 --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase/fb_crashlytics_dark.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 214009068900439da4a9cded17d58090 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_crashlytics_dark.png +timeCreated: 1472679008 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_database.png b/nekoyume/Assets/Editor Default Resources/Firebase/fb_database.png new file mode 100755 index 00000000000..a2a186de39d Binary files /dev/null and b/nekoyume/Assets/Editor Default Resources/Firebase/fb_database.png differ diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_database.png.meta b/nekoyume/Assets/Editor Default Resources/Firebase/fb_database.png.meta new file mode 100644 index 00000000000..b7fb841eb72 --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase/fb_database.png.meta @@ -0,0 +1,69 @@ +fileFormatVersion: 2 +guid: 3eea7b558c67b48e18acf3c278392e3d +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_database.png +timeCreated: 1476203961 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_database_dark.png b/nekoyume/Assets/Editor Default Resources/Firebase/fb_database_dark.png new file mode 100755 index 00000000000..ecc572e6f4e Binary files /dev/null and b/nekoyume/Assets/Editor Default Resources/Firebase/fb_database_dark.png differ diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_database_dark.png.meta b/nekoyume/Assets/Editor Default Resources/Firebase/fb_database_dark.png.meta new file mode 100644 index 00000000000..9e2300aba37 --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase/fb_database_dark.png.meta @@ -0,0 +1,69 @@ +fileFormatVersion: 2 +guid: 9f6bfa9d8aefb40dc92461c372c73b0f +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_database_dark.png +timeCreated: 1476203949 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_dynamic_links.png b/nekoyume/Assets/Editor Default Resources/Firebase/fb_dynamic_links.png new file mode 100755 index 00000000000..a06148e07ce Binary files /dev/null and b/nekoyume/Assets/Editor Default Resources/Firebase/fb_dynamic_links.png differ diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_dynamic_links.png.meta b/nekoyume/Assets/Editor Default Resources/Firebase/fb_dynamic_links.png.meta new file mode 100644 index 00000000000..80d842b92a7 --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase/fb_dynamic_links.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: df6f219c396f4ad9b5048bae6944cb8e +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_dynamic_links.png +timeCreated: 1473376335 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_dynamic_links_dark.png b/nekoyume/Assets/Editor Default Resources/Firebase/fb_dynamic_links_dark.png new file mode 100755 index 00000000000..a35cb52577a Binary files /dev/null and b/nekoyume/Assets/Editor Default Resources/Firebase/fb_dynamic_links_dark.png differ diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_dynamic_links_dark.png.meta b/nekoyume/Assets/Editor Default Resources/Firebase/fb_dynamic_links_dark.png.meta new file mode 100644 index 00000000000..27a8b853383 --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase/fb_dynamic_links_dark.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 9355a4671cfe4eef90879863318d1a4b +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_dynamic_links_dark.png +timeCreated: 1472679009 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_functions.png b/nekoyume/Assets/Editor Default Resources/Firebase/fb_functions.png new file mode 100755 index 00000000000..776283e5cc8 Binary files /dev/null and b/nekoyume/Assets/Editor Default Resources/Firebase/fb_functions.png differ diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_functions.png.meta b/nekoyume/Assets/Editor Default Resources/Firebase/fb_functions.png.meta new file mode 100644 index 00000000000..de7d548c43f --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase/fb_functions.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 953367231f9e3e22e70e5d1c91a40fe5 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_functions.png +timeCreated: 1473376335 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_functions_dark.png b/nekoyume/Assets/Editor Default Resources/Firebase/fb_functions_dark.png new file mode 100755 index 00000000000..64741fc6b7e Binary files /dev/null and b/nekoyume/Assets/Editor Default Resources/Firebase/fb_functions_dark.png differ diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_functions_dark.png.meta b/nekoyume/Assets/Editor Default Resources/Firebase/fb_functions_dark.png.meta new file mode 100644 index 00000000000..81533b3f502 --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase/fb_functions_dark.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: b5aa3e4f7432e1c5698417cc13f85271 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_functions_dark.png +timeCreated: 1472679008 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_invites.png b/nekoyume/Assets/Editor Default Resources/Firebase/fb_invites.png new file mode 100755 index 00000000000..be9a9b9629c Binary files /dev/null and b/nekoyume/Assets/Editor Default Resources/Firebase/fb_invites.png differ diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_invites.png.meta b/nekoyume/Assets/Editor Default Resources/Firebase/fb_invites.png.meta new file mode 100644 index 00000000000..ca501609934 --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase/fb_invites.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 741b269777f30488482ef4937b456b28 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_invites.png +timeCreated: 1473376335 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_invites_dark.png b/nekoyume/Assets/Editor Default Resources/Firebase/fb_invites_dark.png new file mode 100755 index 00000000000..1bd1a90410f Binary files /dev/null and b/nekoyume/Assets/Editor Default Resources/Firebase/fb_invites_dark.png differ diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_invites_dark.png.meta b/nekoyume/Assets/Editor Default Resources/Firebase/fb_invites_dark.png.meta new file mode 100644 index 00000000000..5caa5291f81 --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase/fb_invites_dark.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: a734ad7414926404e90f8b5be37b7e23 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_invites_dark.png +timeCreated: 1472679009 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_storage.png b/nekoyume/Assets/Editor Default Resources/Firebase/fb_storage.png new file mode 100755 index 00000000000..ef8e129e272 Binary files /dev/null and b/nekoyume/Assets/Editor Default Resources/Firebase/fb_storage.png differ diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_storage.png.meta b/nekoyume/Assets/Editor Default Resources/Firebase/fb_storage.png.meta new file mode 100644 index 00000000000..784dc06a4c4 --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase/fb_storage.png.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: 573eb851c99f948f4bf2de49322bfd53 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_storage.png +timeCreated: 1481243899 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_storage_dark.png b/nekoyume/Assets/Editor Default Resources/Firebase/fb_storage_dark.png new file mode 100755 index 00000000000..b18ac5e29d2 Binary files /dev/null and b/nekoyume/Assets/Editor Default Resources/Firebase/fb_storage_dark.png differ diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/fb_storage_dark.png.meta b/nekoyume/Assets/Editor Default Resources/Firebase/fb_storage_dark.png.meta new file mode 100644 index 00000000000..a95e288548b --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase/fb_storage_dark.png.meta @@ -0,0 +1,78 @@ +fileFormatVersion: 2 +guid: 2955864b938094f579ea9902b65ac10c +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Editor Default Resources/Firebase/fb_storage_dark.png +timeCreated: 1481243898 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/firebase_lockup.png b/nekoyume/Assets/Editor Default Resources/Firebase/firebase_lockup.png new file mode 100755 index 00000000000..26fdb0946d2 Binary files /dev/null and b/nekoyume/Assets/Editor Default Resources/Firebase/firebase_lockup.png differ diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/firebase_lockup.png.meta b/nekoyume/Assets/Editor Default Resources/Firebase/firebase_lockup.png.meta new file mode 100644 index 00000000000..c93786f21b4 --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase/firebase_lockup.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 9f058f25e8e2d47cfb894951d4d7e48a +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Editor Default Resources/Firebase/firebase_lockup.png +timeCreated: 1473376336 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png b/nekoyume/Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png new file mode 100755 index 00000000000..c02c0b7e017 Binary files /dev/null and b/nekoyume/Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png differ diff --git a/nekoyume/Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png.meta b/nekoyume/Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png.meta new file mode 100644 index 00000000000..8f05fa970e0 --- /dev/null +++ b/nekoyume/Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: b93330fc8ea08407dbc514b5101afa14 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Editor Default Resources/Firebase/firebase_lockup_dark.png +timeCreated: 1472601251 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: + x: 0.5 + y: 0.5 + spriteBorder: + x: 0 + y: 0 + z: 0 + w: 0 + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/ExternalDependencyManager.meta b/nekoyume/Assets/ExternalDependencyManager.meta new file mode 100644 index 00000000000..b6ff762dec9 --- /dev/null +++ b/nekoyume/Assets/ExternalDependencyManager.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4355d3d33d85544d4834556e43b5d32d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor.meta b/nekoyume/Assets/ExternalDependencyManager/Editor.meta new file mode 100644 index 00000000000..49645f9ab81 --- /dev/null +++ b/nekoyume/Assets/ExternalDependencyManager/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 84d3739032fd8466297d3ebfd8957ae1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176.meta b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176.meta new file mode 100644 index 00000000000..b3fe06670e4 --- /dev/null +++ b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 52a924449c19a4fbea2399e33d46f810 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.IOSResolver.dll b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.IOSResolver.dll new file mode 100755 index 00000000000..7af51b9e09d Binary files /dev/null and b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.IOSResolver.dll differ diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.IOSResolver.dll.mdb b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.IOSResolver.dll.mdb new file mode 100755 index 00000000000..821ae1ea953 Binary files /dev/null and b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.IOSResolver.dll.mdb differ diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.IOSResolver.dll.mdb.meta b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.IOSResolver.dll.mdb.meta new file mode 100644 index 00000000000..67a675655ef --- /dev/null +++ b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.IOSResolver.dll.mdb.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2385f4fef43e435fabb18362178b3b4b +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.176/Google.IOSResolver.dll.mdb +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.IOSResolver.dll.meta b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.IOSResolver.dll.meta new file mode 100644 index 00000000000..c81ae9736bb --- /dev/null +++ b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.IOSResolver.dll.meta @@ -0,0 +1,38 @@ +fileFormatVersion: 2 +guid: b7c76e2890e2487cbee851fb01abd17d +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.176/Google.IOSResolver.dll +- gvhp_targets-editor +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.JarResolver.dll b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.JarResolver.dll new file mode 100755 index 00000000000..59cc9f9483c Binary files /dev/null and b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.JarResolver.dll differ diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.JarResolver.dll.mdb b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.JarResolver.dll.mdb new file mode 100755 index 00000000000..3d9313d95b2 Binary files /dev/null and b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.JarResolver.dll.mdb differ diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.JarResolver.dll.mdb.meta b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.JarResolver.dll.mdb.meta new file mode 100644 index 00000000000..292b18b7075 --- /dev/null +++ b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.JarResolver.dll.mdb.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 983e30d0a59b48048e6287069dc87f16 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.176/Google.JarResolver.dll.mdb +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.JarResolver.dll.meta b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.JarResolver.dll.meta new file mode 100644 index 00000000000..6234efd9b53 --- /dev/null +++ b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.JarResolver.dll.meta @@ -0,0 +1,38 @@ +fileFormatVersion: 2 +guid: 1396517e985a41a1af57ee285335eb24 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.176/Google.JarResolver.dll +- gvhp_targets-editor +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.PackageManagerResolver.dll b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.PackageManagerResolver.dll new file mode 100755 index 00000000000..27fdf814c1f Binary files /dev/null and b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.PackageManagerResolver.dll differ diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.PackageManagerResolver.dll.mdb b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.PackageManagerResolver.dll.mdb new file mode 100755 index 00000000000..9cf6b64552b Binary files /dev/null and b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.PackageManagerResolver.dll.mdb differ diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.PackageManagerResolver.dll.mdb.meta b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.PackageManagerResolver.dll.mdb.meta new file mode 100644 index 00000000000..20581a14be3 --- /dev/null +++ b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.PackageManagerResolver.dll.mdb.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 219b2ec322f741b1b429aa63ff518ccd +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.176/Google.PackageManagerResolver.dll.mdb +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.PackageManagerResolver.dll.meta b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.PackageManagerResolver.dll.meta new file mode 100644 index 00000000000..179e335eeab --- /dev/null +++ b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.PackageManagerResolver.dll.meta @@ -0,0 +1,38 @@ +fileFormatVersion: 2 +guid: ab7c22193da44aea9aaa380ba652a206 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.176/Google.PackageManagerResolver.dll +- gvhp_targets-editor +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.VersionHandlerImpl.dll b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.VersionHandlerImpl.dll new file mode 100755 index 00000000000..2238dcc0966 Binary files /dev/null and b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.VersionHandlerImpl.dll differ diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.VersionHandlerImpl.dll.mdb b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.VersionHandlerImpl.dll.mdb new file mode 100755 index 00000000000..906a3c15833 Binary files /dev/null and b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.VersionHandlerImpl.dll.mdb differ diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.VersionHandlerImpl.dll.mdb.meta b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.VersionHandlerImpl.dll.mdb.meta new file mode 100644 index 00000000000..88ef2383275 --- /dev/null +++ b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.VersionHandlerImpl.dll.mdb.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c2d0e4d79a974892a30b93ee2a625947 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.176/Google.VersionHandlerImpl.dll.mdb +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.VersionHandlerImpl.dll.meta b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.VersionHandlerImpl.dll.meta new file mode 100644 index 00000000000..c2e238be82b --- /dev/null +++ b/nekoyume/Assets/ExternalDependencyManager/Editor/1.2.176/Google.VersionHandlerImpl.dll.meta @@ -0,0 +1,38 @@ +fileFormatVersion: 2 +guid: 595c0a1a42b7440d897fce3d281f5332 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.176/Google.VersionHandlerImpl.dll +- gvhp_targets-editor +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/CHANGELOG.md b/nekoyume/Assets/ExternalDependencyManager/Editor/CHANGELOG.md new file mode 100755 index 00000000000..a1e87934700 --- /dev/null +++ b/nekoyume/Assets/ExternalDependencyManager/Editor/CHANGELOG.md @@ -0,0 +1,1387 @@ +# Version 1.2.176 - Apr 27, 2023 +* Android Resolver - Added two Android Resolver settings to determine whether + EDM4U injects custom local Maven repo path as a relative path or full path. + Fixes #537 +* Android Resolver - Inject Maven Repo to `settingTemplate.gradle` from + Unity 2022.2+ + Fixes #594 +* Android Resolver - Jetifier option is enabled by default now. +* Android Resolver - `Explode Aar` option applies to all cases, whether the + project will be exported or not. + Fixes #584 + Fixes #287 + +# Version 1.2.175 - Nov 16, 2022 +* General - Added tvOS podfile support to the iOS resolver. + +# Version 1.2.174 - Oct 06, 2022 +* General - Added tvOS support to the iOS resolver. +* General - Fixed #484 - Changed `EditorMeasurement` to use secure connection. +* Android Resolver - Fixed Android Resolver unable to resolve + `mainTemplate.gradle` in Unity `2022.2+` or `2023.1+`. + +# Version 1.2.173 - Sep 28, 2022 +* General - Added tvOS library support to the export unity package scripts. + +# Version 1.2.172 - Jun 23, 2022 +* iOS Resolver - Stop forcing `ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES` to `YES`, + which seems to cause problem for some when submitting apps. See #526 for more + information. + +# Version 1.2.171 - May 11, 2022 +* iOS Resolver - Change `Enable Swift Framework Support Workaround` setting to + be `ON` by default since more pods are using Swift Framework now. + +# Version 1.2.170 - Apr 4, 2022 +* Android Resolver - Fixes #498 - Fix the path separator of the Maven repo + injected to `mainTemplate.gradle`. +* iOS Resolver - Fixes #470 - Switch default Cocoapods master repo from Github + to CDN. +* iOS Resolver - `Link Framework Statically` setting is now default to `true`. + That is, `use_frameworks! :linkage => static` will be added to `Podfile` by + default instead of `use_frameworks!`. This can be changed in iOS Resolver + settings. This fixes odd behaviors when pods include static libraries, ex. + Firebase Analytics. +* iOS Resolver - Added a workaround when app crashes on launch due to + `Library not loaded: @rpath/libswiftCore.dylib` when some pods includes Swift + framework. This is turned `OFF` by default and can be changed in iOS Resolver + settings. + +# Version 1.2.169 - Jan 20, 2022 +* General - Fixes #425 - Change to save `GvhProjectSettings.xml` without + Unicode byte order mark (BoM). +* Android Resolver - Remove reference to `jcenter()` +* iOS Resolver - Force setting `LANG` when executing Cocoapods in shell mode on + Mac. + +# Version 1.2.168 - Dec 9, 2021 +* All - Fixes #472 by removing the use of `System.Diagnostics.Debug.Assert` +* All - Fixed #477 by properly enabling EDM4U libraries for Unity 2021.2+ when + the package is installed through `.tgz` + +# Version 1.2.167 - Oct 6, 2021 +* All - Moved versioned `.dll` in EDM4U to a versioned folder and remove their + version postfix in their filename. For instance, `IOSResolver.dll` will be + placed at `ExternalDependencyManager/Editor/1.2.167/Google.IOSResolver.dll`. +* Android Resolver - Fixed #243 by only using the highest version in + `mainTemplate.gradle` when duplicated dependencies are presented. +* Android Resolver - Added supports to x86_64 to ABI list for Android apps on + Chrome OS. + +# Version 1.2.166 - Jun 30, 2021 +* All - Fixed #440 and fixed #447 by specifying the parameter type while calling + `GetApplicationIdentifier()` Unity API using reflection, due to a new + overloaded method introduced in Unity 2021.2. +* Android Resolver - Fixed #442 by patching `Dependency.IsGreater()` when the + version strings end '+'. + +# Version 1.2.165 - Apr 28, 2021 +## Bug Fixes +* Version Handler - Fixed #431 by replacing the use of `HttpUtility.UrlEncode()` + which causes NullReferenceException in certain version of Unity. +* Android Resolver - Check that androidSdkRootPath directory exists before using + as sdkPath. +* Android Resolver - Fixed Android Resolver integration tests with Unity + 2019.3+. + +# Version 1.2.164 - Feb 4, 2021 +## New Features +* Android Resolver - Added support for Android packages with classifier in their + namespaces. +* iOS Resolver - Added new settings in iOS Resolver to configure generated + Podfile. +* iOS Resolver - Added a new attribute `addToAllTargets` in Dependencies.xml. + +## Bug Fixes +* iOS Resolver - Fixed XML parsing for `bitcodeEnabled` attribute in + Dependencies.xml. + +# Version 1.2.163 - Dec 15, 2020 +## Bug Fixes +* Version Handler - Fixed measurement reporting + +# Version 1.2.162 - Nov 19, 2020 +## Bug Fixes +* Version Handler - Improved #413 by preventing Version Handler from running + from static constructor when it is disabled. +* Package Manager Resolver - Remove GPR + +# Version 1.2.161 - Oct 12, 2020 +## Bug Fixes +* Android Resolver - Fixed the issue that Android Resolver does not resolve + again before build in Unity 2020 if it failed to resolve previously. + +# Version 1.2.160 - Sep 30, 2020 +## Bug Fixes +* Android Resolver - Fixed a regression that gradleResolver can be null until + Initialize() is called. +* Android Resolver - Fixed a regression that Android Resolver failed in Unity + 2019.3+ due to `gradleTemplate.properties` not enabled when + `mainTemplate.gradle` is not enabled at all. + +# Version 1.2.159 - Sep 11, 2020 +## Bug Fixes +* Android Resolver - Fixed #322 where the Unity editor will lose its target SDK + setting between Unity restarts if `>28` is selected in 2019. This is due to + Unity AndroidSdkVersions enum does not contain values above 28. +* Android Resolver - Fixed #360 where building Android app with Untiy 2019.3+ + may fail due to Jetifier and AndroidX not enabled properly in generated + Gradle project. This fix requires the user to enable + `Custom Gradle Properties Template` found under + `Player Settings > Settings for Android > Publishing Settings`. + +# Version 1.2.158 - Sep 3, 2020 +## Bug Fixes +* Version Handler: Fixed editor freeze when `-executeMethod` is used in + non-batch mode. +* Android Resolver: Normalized file paths when generating local Maven repo + since the path may contains a mix of forward and backward slash on Windows. +* Export Unity Package: Fixed generation of .unitypackage with tarfile on + Windows. + +# Version 1.2.157 - Aug 6, 2020 +## Bug Fixes +* Android Resolver: Delay initialization until active build target is Android + and the editor is not in play mode. +* iOS Resolver: Delay initialization until active build target is iOS + and the editor is not in play mode. +* Export Unity Package: Workaround directory creation racy if multiple export + operations are spawned at the same time. + +# Version 1.2.156 - June 10, 2020 +## Bug Fixes +* Android Resolver: Fixed that the generated local repo assets contains + redundent labels which are causing Version Handler to failed while + uninstalling packages. +* Android Resolver: Fixed that the repo url injected into mainTemplate.gradle + is incorrect when Unity is configured to export gradle project. +* Android Resolver: Limited to only create local Maven repo when the source + repo contains ".srcaar" file. + +## Changes +* All: Described EDM4U analytics data usage in readme. + +# Version 1.2.155 - May 14, 2020 +## Bug Fixes +* All: Fixed compiler error when build with Unity 5.4 or below due to the + usage of Rect.zero. +* All: Ignore cases when checking command line arguments. + +# Version 1.2.154 - May 14, 2020 +## Bug Fixes +* All: Make each MultiSelectWindow for different purposes to have its own + unique window. + +## Changes +* All: Replace all dialog with DialogWindow which is implemented from + EditorWindow. +* Package Manager Resolver: Clarify how manifest.json will be changed in Package + Manager Resolver window. + +# Version 1.2.153 - Apr 24, 2020 +## Bug Fixes +* Android Resolver: Fixed an exception when repainting the Android resolution + window in Unity 2019.3.x. + +# Version 1.2.152 - Apr 17, 2020 +## Bug Fixes +* Version Handler: Fixed exception when waiting for enabled editor DLLs to + load. +* Android Resolver: Fixed regression when using a Custom Gradle Template + on Windows. + +# Version 1.2.151 - Apr 16, 2020 +## Bug Fixes +* Version Handler: When waiting for newly enabled editor DLLs to load, ignore + all DLLs that do not have a file-system location. +* Android Resolver: Fixed resolution when using a Custom Gradle Template with + libraries stored in a local maven repository distributed with a plugin + installed with the Unity Package Manager. + +# Version 1.2.150 - Apr 9, 2020 +## Bug Fixes +* All: The new packaging script when run on MacOS was generating a + .unitypackage archive that could not be read by Unity on Windows. + This release simply repackages the plugin with tar/gzip to fix the problem. + +# Version 1.2.149 - Apr 8, 2020 +## Bug Fixes +* Package Manager Resolver: Fixed spurious error message when resuming + migration after installing a UPM package. + +# Version 1.2.148 - Apr 8, 2020 +## Bug Fixes +* Package Manager Resolver: Fixed an exception when resuming migration + after installing a UPM package. + +# Version 1.2.147 - Apr 8, 2020 +## Bug Fixes +* Version Handler: Fixed alias traversal bug which caused problems when + migrating from installed .unitypackage files to UPM packages. + +# Version 1.2.146 - Apr 8, 2020 +## Bug Fixes +* Version Handler: Fixed exception in manifest parsing when a manifest is + detected with no aliases. + +# Version 1.2.145 - Apr 2, 2020 +## New Features +* Package Manager Resolver: Added a method to migrate Version Handler + managed packages installed via `.unitypackage` to Unity Package Manager + packages. This is initially used to migrate the External Dependency Manager + to UPM. + +## Changes +* All: Verbose logging is now no longer automatically enabled in batch mode + across all components. Instead logging can be configured using each + component's verbose logging setting or by using the `-gvh_log_debug` command + line flag when starting Unity. +* Version Handler: Sped up version handler updates when the app domain isn't + reloaded. + +## Bug Fixes +* Version Handler: Fixed the display of the obsolete files clean up dialog + when the asset database refreshes. +* Version Handler: Improved reliability of callback from + the VersionHandler.UpdateCompleteMethods event when an asset database + refresh occurs. +* Version Handler: Fixed duplicate exportPath labels when 'Assets/' is the + root of paths assigned to files. +* Version Handler: Handle empty lines in manifest files. + +# Version 1.2.144 - Mar 23, 2020 +## Changed +* iOS Resolver: Removed the ability to configure the Xcode target a Cocoapod + is added to. + +## Bug Fixes +* iOS Resolver: Reverted support for adding Cocoapods to multiple targets as + it caused a regression (exception thrown during post-build step) in some + versions of Unity. + +# Version 1.2.143 - Mar 20, 2020 +## Bug Fixes +* Android Resolver: Fixed caching of resolution state which was causing + the resolver to always run when no dependencies had changed. + +# Version 1.2.142 - Mar 19, 2020 +## Changes +* Package Manager Resolver: Enabled auto-add by default. + +# Version 1.2.141 - Mar 19, 2020 +## Bug Fixes +* Fixed a bug when retrieving project settings. If a plugin was configured + to fetch project settings, if a setting was fetched (e.g "foo") and this + setting existed in the system settings but not the project settings the + system value would override the default value leading to unexpected + behavior. +* Fixed a warning when caching web request classes in Unity 5.6. + +# Version 1.2.140 - Mar 19, 2020 +## Bug Fixes +* Fixed measurement reporting in Unity 5.x. +* Version Handler: Fixed NullReferenceException when an asset doesn't have + an AssetImporter. + +# Version 1.2.139 - Mar 18, 2020 +## Changed +* Added documentation to the built plugin. + +# Version 1.2.138 - Mar 17, 2020 +## New Features +* Package Manager Resolver: Added the Package Manager Resolver + component that allows developers to easily boostrap Unity Package Manager + (UPM) registry addition using unitypackage plugins. +* Version Handler: Added a window that allows plugins to managed by the + Version Handler to be uninstalled. +* Version Handler: Added support for displaying installed plugins. +* Version Handler: Added support for moving files in plugins to their install + locations (if the plugin has been configured to support this). +* iOS Resolver: Added the ability to configure the Xcode target a Cocoapod is + added to. + +## Bug Fixes +* Fixed upgrade from version 1.2.137 and below after the plugin rename to + EDM4U broke the upgrade process. +* Android Resolver: Worked around PlayerSettings.Android.targetSdkVersion + returning empty names for some values in 2019.x. +* Version Handler: Fixed the display of the obsolete files clean up window. +* Version Handler: Fixed managed file check when assets are modified in the + project after plugin import. + +# Version 1.2.137 - Mar 6, 2020 +## Changed +* Renamed package to External Package Manager for Unity (EDM4U). + We changed this to reflect what this plugin is doing today which is far more + than the original scope which just consisted of importing jar files from the + Android SDK maven repository. + Scripts that used to pull `play-services-resolver*.unitypackage` will now have + to request `external-dependency-manager*.unitypackage` instead. + We'll still be shipping a `play-services-resolver*_manifest.txt` file to + handle upgrading from older versions of the plugin. + +## New Features +* All Components: Added reporting of usage so that we can remotely detect + errors and target improvements. +* Android Resolver: Added support for *Dependencies.xml files in Unity Package + Manager packages. +* iOS Resolver: Added support for *Dependencies.xml files in Unity Package + Manager packages. + +## Bug Fixes +* Version Handler: Disabled attempts to disable asset metadata modification + when assets are in a Unity Package Manager managed package. + +# Version 1.2.136 - Feb 19, 2019 +## Bug Fixes +* Android Resolver: Fixed OpenJDK path discovery in Unity 2019.3.1. + +# Version 1.2.135 - Dec 5, 2019 +## Bug Fixes +* All Components: Fixed stack overflow when loading project settings. + +# Version 1.2.134 - Dec 4, 2019 +## Bug Fixes +* All Components: Fixed an issue which caused project settings to be cleared + when running in batch mode. + +# Version 1.2.133 - Nov 18, 2019 +## Bug Fixes +* All Components: Failure to save project settings will now report an error + to the log rather than throwing an exception. + +# Version 1.2.132 - Nov 11, 2019 +## Bug Fixes +* Android Resolver: Worked around expansion of DIR_UNITYPROJECT on Windows + breaking Gradle builds when used as part of a file URI. +* Android Resolver: mainTemplate.gradle is only written if it needs to be + modified. + +# Version 1.2.131 - Oct 29, 2019 +## Bug Fixes +* Version Handler: Improved execution of events on the main thread in batch + mode. +* Version Handler: Improved log level configuration at startup. +* Version Handler: Improved performance of class lookup in deferred method + calls. +* Version Handler: Fixed rename to enable / disable for editor assets. +* iOS Resolver: Improved log level configuration at startup. +* Android Resolver: Improved local maven repo path reference in + mainTemplate.gradle using DIR_UNITYPROJECT. DIR_UNITYPROJECT by Unity + to point to the local filesystem path of the Unity project when Unity + generates the Gradle project. + +# Version 1.2.130 - Oct 23, 2019 +## New Features +* iOS Resolver: Added support for modifying the Podfile before `pod install` + is executed. + +## Bug Fixes +* Version Handler: Fixed invalid classname error when calling + `VersionHandler.UpdateVersionedAssets()`. + +# Version 1.2.129 - Oct 2, 2019 +## Bug Fixes +* iOS Resolver: Changed Cocoapod integration in Unity 2019.3+ to + only add Pods to the UnityFramework target. + +# Version 1.2.128 - Oct 1, 2019 +## Bug Fixes +* iOS Resolver: Fixed Cocoapod project integration mode with Unity + 2019.3+. + +# Version 1.2.127 - Sep 30, 2019 +## Changes +* Android Resolver: All Android Resolver settings File paths are now + serialized with POSIX directory separators. + +# Version 1.2.126 - Sep 27, 2019 +## Changes +* Android Resolver: File paths are now serialized with POSIX directory + separators. +## Bug Fixes +* Android Resolver: Fixed resolution when the parent directory of a Unity + project contains a Gradle project (i.e `settings.gradle` file). + +# Version 1.2.125 - Sep 23, 2019 +## Bug Fixes +* All components: Silenced a warning about not being able to set the console + encoding to UTF8. +* Android Resolver: Worked around broken AndroidSDKTools class in some + versions of Unity. +* iOS Resolver: Fixed iOS target SDK version check +* Version Handler: Changed clean up obsolete files window so that it doesn't + exceed the screen size. + +# Version 1.2.124 - Jul 28, 2019 +## Bug Fixes +* All components: Fixed regression with source control integration when using + Unity 2019.1+. + +# Version 1.2.123 - Jul 23, 2019 +## New Features +* All components: Source control integration for project settings. +## Changes +* Android Resolver: Removed AAR cache as it now makes little difference to + incremental resolution performance. +* Android Resolver: Improved embedded resource management so that embedded + resources should upgrade when the plugin is updated without restarting + the Unity editor. +## Bug Fixes +* Version Handler: Fixed InvokeMethod() and InvokeStaticMethod() when calling + methods that have interface typed arguments. + +# Version 1.2.122 - Jul 2, 2019 +## Bug Fixes +* iOS Resolver: Worked around Unity not loading the iOS Resolver DLL as it + referenced the Xcode extension in a public interface. The iOS Resolver + DLL still references the Xcode extension internally and just handles + missing type exceptions dynamically. + +# Version 1.2.121 - Jun 27, 2019 +## Bug Fixes +* Android Resolver: Fixed warning about missing Packages folder when loading + XML dependencies files in versions of Unity without the package manager. +* Android Resolver: Fixed resolution window progress bar exceeding 100%. +* Android Resolver: If AndroidX is detected in the set of resolved libraries, + the user will be prompted to enable the Jetifier. +* Android Resolver: Improved text splitting in text area windows. +* iOS Resolver: Added support for Unity's breaking changes to the Xcode API + in 2019.3.+. Cocoapods are now added to build targets, Unity-iPhone and + UnityFramework in Unity 2019.3+. + +# Version 1.2.120 - Jun 26, 2019 +## New Features +* Android Resolver: Added support for loading *Dependencies.xml files from + Unity Package Manager packages. +* Android Resolver: Resolution window is now closed if resolution runs as + a pre-build step. +* iOS Resolver: Added support for loading *Dependencies.xml files from + Unity Package Manager packages. +## Bug Fixes +* Android Resolver: Fixed generation of relative repo paths when using + mainTemplate.gradle resolver. +* Android Resolver: Fixed copy of .srcaar to .aar files in repos embedded in a + project when a project path has characters (e.g whitespace) that are escaped + during conversion to URIs. +* Android Resolver: Fixed auto-resolution always running if the Android SDK + is managed by Unity Hub. + +# Version 1.2.119 - Jun 19, 2019 +## Bug Fixes +* Android Resolver: Fixed error reported when using Jetifier integration + in Unity 2018+ if the target SDK is set to "highest installed". + +# Version 1.2.118 - Jun 18, 2019 +## New Features +* Android Resolver: Added initial + [Jetifier](https://developer.android.com/studio/command-line/jetifier) + integration which simplifies + [migration](ttps://developer.android.com/jetpack/androidx/migrate) + to Jetpack ([AndroidX](https://developer.android.com/jetpack/androidx)) + libraries in cases where all dependencies are managed by the Android + Resolver. + This can be enabled via the `Use Jetifier` option in the + `Assets > Play Services Resolver > Android Resolver > Settings` menu. + Caveats: + - If your project contains legacy Android Support Library .jar and .aar + files, these files will need to be removed and replaced with references to + artifacts on Maven via `*Dependencies.xml` files so that the Jetifier + can map them to Jetpack (AndroidX) libraries. + For example, remove the file `support-v4-27.0.2.jar` and replace it with + `` in a + `*Dependencies.xml` file. + - If your project contains .jar or .aar files that use the legacy Android + Support Libraries, these will need to be moved into a local Maven repo + [See this guide](https://maven.apache.org/guides/mini/guide-3rd-party-jars-local.html) + and then these files should be removed from your Unity project and instead + referenced via `*Dependencies.xml` files so that the Jetifier can + patch them to reference the Jetpack lirbaries. + +## Bug Fixes +* Android Resolver: Disabled version locking of com.android.support:multidex + does not use the same versioning scheme as other legacy Android support + libraries. +* Version Handler: Made Google.VersionHandler.dll's asset GUID stable across + releases. This faciliates error-free import into projects where + Google.VersionHandler.dll is moved from the default install location. + +# Version 1.2.117 - Jun 12, 2019 +## Bug Fixes +* Android Resolver: Fix copying of .srcaar to .aar files for + mainTemplate.gradle resolution. PluginImporter configuration was previously + not being applied to .aar files unless the Unity project was saved. + +# Version 1.2.116 - Jun 7, 2019 +## Bug Fixes +* Android Resolver: Fixed resolution of Android dependencies without version + specifiers. +* Android Resolver: Fixed Maven repo not found warning in Android Resolver. +* Android Resolver: Fixed Android Player directory not found exception in + Unity 2019.x when the Android Player isn't installed. + +# Version 1.2.115 - May 28, 2019 +## Bug Fixes +* Android Resolver: Fixed exception due to Unity 2019.3.0a4 removing + x86 from the set of supported ABIs. + +# Version 1.2.114 - May 27, 2019 +## New Features +* Android Resolver: Added support for ABI stripping when using + mainTemplate.gradle. This only works with AARs stored in repos + on the local filesystem. + +# Version 1.2.113 - May 24, 2019 +## New Features +* Android Resolver: If local repos are moved, the plugin will search the + project for matching directories in an attempt to correct the error. +* Version Handler: Files can be now targeted to multiple build targets + using multiple "gvh_" asset labels. +## Bug Fixes +* Android Resolver: "implementation" or "compile" are now added correctly + to mainTemplate.gradle in Unity versions prior to 2019. + +# Version 1.2.112 - May 22, 2019 +## New Features +* Android Resolver: Added option to disable addition of dependencies to + mainTemplate.gradle. + See `Assets > Play Services Resolver > Android Resolver > Settings`. +* Android Resolver: Made paths to local maven repositories in + mainTemplate.gradle relative to the Unity project when a project is not + being exported. +## Bug Fixes +* Android Resolver: Fixed builds with mainTemplate.gradle integration in + Unity 2019. +* Android Resolver: Changed dependency inclusion in mainTemplate.gradle to + use "implementation" or "compile" depending upon the version of Gradle + included with Unity. +* Android Resolver: Gracefully handled exceptions if the console encoding + can't be modified. +* Android Resolver: Now gracefully fails if the AndroidPlayer directory + can't be found. + +# Version 1.2.111 - May 9, 2019 +## Bug Fixes +* Version Handler: Fixed invocation of methods with named arguments. +* Version Handler: Fixed occasional hang when the editor is compiling + while activating plugins. + +# Version 1.2.110 - May 7, 2019 +## Bug Fixes +* Android Resolver: Fixed inclusion of some srcaar artifacts in builds with + Gradle builds when using mainTemplate.gradle. + +# Version 1.2.109 - May 6, 2019 +## New Features: +* Added links to documentation from menu. +* Android Resolver: Added option to auto-resolve Android libraries on build. +* Android Resolver: Added support for packaging specs of Android libraries. +* Android Resolver: Pop up a window when displaying Android dependencies. + +## Bug Fixes +* Android Resolver: Support for Unity 2019 Android SDK and JDK install locations +* Android Resolver: e-enable AAR explosion if internal builds are enabled. +* Android Resolver: Gracefully handle exceptions on file deletion. +* Android Resolver: Fixed Android Resolver log spam on load. +* Android Resolver: Fixed save of Android Resolver PromptBeforeAutoResolution + setting. +* Android Resolver: Fixed AAR processing failure when an AAR without + classes.jar is found. +* Android Resolver: Removed use of EditorUtility.DisplayProgressBar which + was occasionally left displayed when resolution had completed. +* Version Handler: Fixed asset rename to disable when a disabled file exists. + +# Version 1.2.108 - May 3, 2019 +## Bug Fixes: +* Version Handler: Fixed occasional hang on startup. + +# Version 1.2.107 - May 3, 2019 +## New Features: +* Version Handler: Added support for enabling / disabling assets that do not + support the PluginImporter, based upon build target selection. +* Android Resolver: Added support for the global specification of maven repos. +* iOS Resolver: Added support for the global specification of Cocoapod sources. + +# Version 1.2.106 - May 1, 2019 +## New Features +* iOS Resolver: Added support for development pods in Xcode project integration + mode. +* iOS Resolver: Added support for source pods with resources in Xcode project + integration mode. + +# Version 1.2.105 - Apr 30, 2019 +## Bug fixes +* Android Resolver: Fixed reference to Java tool path in logs. +* Android and iOS Resolvers: Changed command line execution to emit a warning + rather than throwing an exception and failing, when it is not possible to + change the console input and output encoding to UTF-8. +* Android Resolver: Added menu option and API to delete resolved libraries. +* Android Resolver: Added menu option and API to log the repos and libraries + currently included in the project. +* Android Resolver: If Plugins/Android/mainTemplate.gradle file is present and + Gradle is selected as the build type, resolution will simply patch the file + with Android dependencies specified by plugins in the project. + +# Version 1.2.104 - Apr 10, 2019 +## Bug Fixes +* Android Resolver: Changed Android ABI selection method from using whitelisted + Unity versions to type availability. This fixes an exception on resolution + in some versions of Unity 2017.4. + +# Version 1.2.103 - Apr 2, 2019 +## Bug Fixes +* Android Resolver: Whitelisted Unity 2017.4 and above with ARM64 support. +* Android Resolver: Fixed Java version check to work with Java SE 12 and above. + +# Version 1.2.102 - Feb 13, 2019 +## Bug Fixes +* Android Resolver: Fixed the text overflow on the Android Resolver + prompt before initial run to fit inside the buttons for + smaller screens. + +# Version 1.2.101 - Feb 12, 2019 +## New Features +* Android Resolver: Prompt the user before the resolver runs for the + first time and allow the user to elect to disable from the prompt. +* Android Resolver: Change popup warning when resolver is disabled + to be a console warning. + +# Version 1.2.100 - Jan 25, 2019 +## Bug Fixes +* Android Resolver: Fixed AAR processing sometimes failing on Windows + due to file permissions. + +# Version 1.2.99 - Jan 23, 2019 +## Bug Fixes +* Android Resolver: Improved performance of project property polling. +* Version Handler: Fixed callback of VersionHandler.UpdateCompleteMethods + when the update process is complete. + +# Version 1.2.98 - Jan 9, 2019 +## New Features +* iOS Resolver: Pod declaration properties can now be set via XML pod + references. For example, this can enable pods for a subset of build + configurations. +## Bug Fixes +* iOS Resolver: Fixed incremental builds after local pods support caused + regression in 1.2.96. + +# Version 1.2.97 - Dec 17, 2018 +## Bug Fixes +* Android Resolver: Reduced memory allocation for logic that monitors build + settings when auto-resolution is enabled. If auto-resolution is disabled, + almost all build settings are no longer polled for changes. + +# Version 1.2.96 - Dec 17, 2018 +## Bug Fixes +* Android Resolver: Fixed repacking of AARs to exclude .meta files. +* Android Resolver: Only perform auto-resolution on the first scene while + building. +* Android Resolver: Fixed parsing of version ranges that include whitespace. +* iOS Resolver: Added support for local development pods. +* Version Handler: Fixed Version Handler failing to rename some files. + +# Version 1.2.95 - Oct 23, 2018 +## Bug Fixes: +* Android Resolver: Fixed auto-resolution running in a loop in some scenarios. + +# Version 1.2.94 - Oct 22, 2018 +## Bug Fixes +* iOS Resolver: Added support for PODS_TARGET_SRCROOT in source Cocoapods. + +# Version 1.2.93 - Oct 22, 2018 +## Bug Fixes +* Android Resolver: Fixed removal of Android libraries on auto-resolution when + `*Dependencies.xml` files are deleted. + +# Version 1.2.92 - Oct 2, 2018 +## Bug Fixes +* Android Resolver: Worked around auto-resolution hang on Windows if + resolution starts before compilation is finished. + +# Version 1.2.91 - Sep 27, 2018 +## Bug Fixes +* Android Resolver: Fixed Android Resolution when the selected build target + isn't Android. +* Added C# assembly symbols the plugin to simplify debugging bug reports. + +# Version 1.2.90 - Sep 21, 2018 +## Bug Fixes +* Android Resolver: Fixed transitive dependency selection of version locked + packages. + +# Version 1.2.89 - Aug 31, 2018 +## Bug Fixes +* Fixed FileLoadException in ResolveUnityEditoriOSXcodeExtension an assembly + can't be loaded. + +# Version 1.2.88 - Aug 29, 2018 +## Changed +* Improved reporting of resolution attempts and conflicts found in the Android + Resolver. +## Bug Fixes +* iOS Resolver now correctly handles sample code in CocoaPods. Previously it + would add all sample code to the project when using project level + integration. +* Android Resolver now correctly handles Gradle conflict resolution when the + resolution results in a package that is compatible with all requested + dependencies. + +# Version 1.2.87 - Aug 23, 2018 +## Bug Fixes +* Fixed Android Resolver "Processing AARs" dialog getting stuck in Unity 5.6. + +# Version 1.2.86 - Aug 22, 2018 +## Bug Fixes +* Fixed Android Resolver exception in OnPostProcessScene() when the Android + platform isn't selected. + +# Version 1.2.85 - Aug 17, 2018 +## Changes +* Added support for synchronous resolution in the Android Resolver. + PlayServicesResolver.ResolveSync() now performs resolution synchronously. +* Auto-resolution in the Android Resolver now results in synchronous resolution + of Android dependencies before the Android application build starts via + UnityEditor.Callbacks.PostProcessSceneAttribute. + +# Version 1.2.84 - Aug 16, 2018 +## Bug Fixes +* Fixed Android Resolver crash when the AndroidResolverDependencies.xml + file can't be written. +* Reduced log spam when a conflicting Android library is pinned to a + specific version. + +# Version 1.2.83 - Aug 15, 2018 +## Bug Fixes +* Fixed Android Resolver failures due to an in-accessible AAR / JAR explode + cache file. If the cache can't be read / written the resolver now continues + with reduced performance following recompilation / DLL reloads. +* Fixed incorrect version number in plugin manifest on install. + This was a minor issue since the version handler rewrote the metadata + after installation. + +# Version 1.2.82 - Aug 14, 2018 +## Changed +* Added support for alphanumeric versions in the Android Resolver. + +## Bug Fixes +* Fixed Android Resolver selection of latest duplicated library. +* Fixed Android Resolver conflict resolution when version locked and non-version + locked dependencies are specified. +* Fixed Android Resolver conflict resolution when non-existent artifacts are + referenced. + +# Version 1.2.81 - Aug 9, 2018 +## Bug Fixes +* Fixed editor error that would occur when when + `PlayerSettings.Android.targetArchitectures` was set to + `AndroidArchitecture.All`. + +# Version 1.2.80 - Jul 24, 2018 +## Bug Fixes +* Fixed project level settings incorrectly falling back to system wide settings + when default property values were set. + +# Version 1.2.79 - Jul 23, 2018 +## Bug Fixes +* Fixed AndroidManifest.xml patching on Android Resolver load in Unity 2018.x. + +# Version 1.2.78 - Jul 19, 2018 +## Changed +* Added support for overriding conflicting dependencies. + +# Version 1.2.77 - Jul 19, 2018 +## Changed +* Android Resolver now supports Unity's 2018 ABI filter (i.e arm64-v8a). +* Reduced Android Resolver build option polling frequency. +* Disabled Android Resolver auto-resolution in batch mode. Users now need + to explicitly kick off resolution through the API. +* All Android Resolver and Version Handler dialogs are now disabled in batch + mode. +* Verbose logging for all plugins is now enabled by default in batch mode. +* Version Handler bootstrapper has been improved to no longer call + UpdateComplete multiple times. However, since Unity can still reload the + app domain after plugins have been enabled, users still need to store their + plugin state to persistent storage to handle reloads. + +## Bug Fixes +* Android Resolver no longer incorrectly adds MANIFEST.MF files to AARs. +* Android Resolver auto-resolution jobs are now unscheduled when an explicit + resolve job is started. + +# Version 1.2.76 - Jul 16, 2018 +## Bug Fixes +* Fixed variable replacement in AndroidManifest.xml files in the Android + Resolver. + Version 1.2.75 introduced a regression which caused all variable replacement + to replace the *entire* property value rather than the component of the + property that referenced a variable. For example, + given "applicationId = com.my.app", "${applicationId}.foo" would be + incorrectly expanded as "com.my.app" rather than "com.my.app.foo". This + resulted in numerous issues for Android builds where content provider + initialization would fail and services may not start. + +## Changed +* Gradle prebuild experimental feature has been removed from the Android + Resolver. The feature has been broken for some time and added around 8MB + to the plugin size. +* Added better support for execution of plugin components in batch mode. + In batch mode UnityEditor.update is sometimes never called - like when a + single method is executed - so the new job scheduler will execute all jobs + synchronously from the main thread. + +# Version 1.2.75 - Jun 20, 2018 +## New Features +* Android Resolver now monitors the Android SDK path when + auto-resolution is enabled and triggers resolution when the path is + modified. + +## Changed +* Android auto-resolution is now delayed by 3 seconds when the following build + settings are changed: + - Target ABI. + - Gradle build vs. internal build. + - Project export. +* Added a progress bar display when AARs are being processed during Android + resolution. + +## Bug Fixes +* Fixed incorrect Android package version selection when a mix of + version-locked and non-version-locked packages are specified. +* Fixed non-deterministic Android package version selection to select + the highest version of a specified package rather than the last + package specification passed to the Gradle resolution script. + +# Version 1.2.74 - Jun 19, 2018 +## New Features +* Added workaround for broken AndroidManifest.xml variable replacement in + Unity 2018.x. By default ${applicationId} variables will be replaced by + the bundle ID in the Plugins/Android/AndroidManifest.xml file. The + behavior can be disabled via the Android Resolver settings menu. + +# Version 1.2.73 - May 30, 2018 +## Bug Fixes +* Fixed spurious warning message about missing Android plugins directory on + Windows. + +# Version 1.2.72 - May 23, 2018 +## Bug Fixes +* Fixed spurious warning message about missing Android plugins directory. + +# Version 1.2.71 - May 10, 2018 +## Bug Fixes +* Fixed resolution of Android dependencies when the `Assets/Plugins/Android` + directory is named in a different case e.g `Assets/plugins/Android`. + +# Version 1.2.70 - May 7, 2018 +## Bug Fixes +* Fixed bitcode flag being ignored for iOS pods. + +# Version 1.2.69 - May 7, 2018 +## Bug Fixes +* Fixed escaping of local repository paths in Android Resolver. + +# Version 1.2.68 - May 3, 2018 +## Changes +* Added support for granular builds of Google Play Services. + +# Version 1.2.67 - May 1, 2018 +## Changes +* Improved support for iOS source-only pods in Unity 5.5 and below. + +# Version 1.2.66 - April 27, 2018 +## Bug Fixes +* Fixed Version Handler renaming of Linux libraries with hyphens in filenames. + Previously, libraries named Foo-1.2.3.so were not being renamed to + libFoo-1.2.3.so on Linux which could break native library loading on some + versions of Unity. + +# Version 1.2.65 - April 26, 2018 +## Bug Fixes +* Fix CocoaPods casing in logs and comments. + +# Version 1.2.64 - Mar 16, 2018 +## Bug Fixes +* Fixed bug in download_artifacts.gradle (used by Android Resolver) which + reported a failure if required artifacts already exist. + +# Version 1.2.63 - Mar 15, 2018 +## Bug Fixes +* Fixed iOS Resolver include search paths taking precedence over system headers + when using project level resolution. +* Fixed iOS Resolver includes relative to library root, when using project level + resolution. + +# Version 1.2.62 - Mar 12, 2018 +## Changes +* Improved error reporting when a file can't be moved to trash by the + Version Handler. +## Bug Fixes +* Fixed Android Resolver throwing NullReferenceException when the Android SDK + path isn't set. +* Fixed Version Handler renaming files with underscores if the + "Rename to Canonical Filenames" setting is enabled. + +# Version 1.2.61 - Jan 22, 2018 +## Bug Fixes +* Fixed Android Resolver reporting non-existent conflicting dependencies when + Gradle build system is enabled. + +# Version 1.2.60 - Jan 12, 2018 +## Changes +* Added support for Maven / Ivy version specifications for Android packages. +* Added support for Android SNAPSHOT packages. + +## Bug Fixes +* Fixed Openjdk version check. +* Fixed non-deterministic Android package resolution when two packages contain + an artifact with the same name. + +# Version 1.2.59 - Oct 19, 2017 +## Bug Fixes +* Fixed execution of Android Gradle resolution script when it's located + in a path with whitespace. + +# Version 1.2.58 - Oct 19, 2017 +## Changes +* Removed legacy resolution method from Android Resolver. + It is now only possible to use the Gradle or Gradle prebuild resolution + methods. + +# Version 1.2.57 - Oct 18, 2017 +## Bug Fixes +* Updated Gradle wrapper to 4.2.1 to fix issues using Gradle with the + latest Openjdk. +* Android Gradle resolution now also uses gradle.properties to pass + parameters to Gradle in an attempt to workaround problems with + command line argument parsing on Windows 10. + +# Version 1.2.56 - Oct 12, 2017 +## Bug Fixes +* Fixed Gradle artifact download with non-version locked artifacts. +* Changed iOS resolver to only load dependencies at build time. + +# Version 1.2.55 - Oct 4, 2017 +## Bug Fixes +* Force Android Resolution when the "Install Android Packages" setting changes. + +# Version 1.2.54 - Oct 4, 2017 +## Bug Fixes +* Fixed execution of command line tools on Windows when the path to the tool + contains a single quote (apostrophe). In this case we fallback to executing + the tool via the system shell. + +# Version 1.2.53 - Oct 2, 2017 +## New Features +* Changed Android Resolver "resolution complete" dialog so that it now displays + failures. +* Android Resolver now detects conflicting libraries that it does not manage + warning the user if they're newer than the managed libraries and prompting + the user to clean them up if they're older or at the same version. + +## Bug Fixes +* Improved Android Resolver auto-resolution speed. +* Fixed bug in the Gradle Android Resolver which would result in resolution + succeeding when some dependencies are not found. + +# Version 1.2.52 - Sep 25, 2017 +## New Features +* Changed Android Resolver's Gradle resolution to resolve conflicting + dependencies across Google Play services and Android Support library packages. + +# Version 1.2.51 - Sep 20, 2017 +## Changes +* Changed iOS Resolver to execute the CocoaPods "pod" command via the shell + by default. Some developers customize their shell environment to use + custom ssh certs to access internal git repositories that host pods so + executing "pod" via the shell will work for these scenarios. + The drawback of executing "pod" via the shell could potentially cause + users problems if they break their shell environment. Though users who + customize their shell environments will be able to resolve these issues. + +# Version 1.2.50 - Sep 18, 2017 +## New Features +* Added option to disable the Gradle daemon in the Android Resolver. + This daemon is now disabled by default as some users are getting into a state + where multiple daemon instances are being spawned when changing dependencies + which eventually results in Android resolution failing until all daemon + processes are manually killed. + +## Bug Fixes +* Android resolution is now always executed if the user declines the update + of their Android SDK. This ensure users can continue to use out of date + Android SDK packages if they desire. + +# Version 1.2.49 - Sep 18, 2017 +## Bug Fixes +* Removed modulemap parsing in iOS Resolver. + The framework *.modulemap did not need to be parsed by the iOS Resolver + when injecting Cocoapods into a Xcode project. Simply adding a modular + framework to a Xcode project results in Xcode's Clang parsing the associated + modulemap and injecting any compile and link flags into the build process. + +# Version 1.2.48 - Sep 12, 2017 +## New Features +* Changed settings to be per-project by default. + +## Bug Fixes +* Added Google maven repository to fix GradlePrebuild resolution with Google + components. +* Fixed Android Resolution failure with spaces in paths. + +# Version 1.2.47 - Aug 29, 2017 +## New Features +* Android and iOS dependencies can now be specified using *Dependencies.xml + files. This is now the preferred method for registering dependencies, + we may remove the API for dependency addition in future. +* Added "Reset to Defaults" button to each settings dialog to restore default + settings. +* Android Resolver now validates the configured JDK is new enough to build + recently released Android libraries. +## Bug Fixes +* Fixed a bug that caused dependencies with the "LATEST" version specification + to be ignored when using the Gradle mode of the Android Resolver. +* Fixed a race condition when running Android Resolution. +* Fixed Android Resolver logging if a PlayServicesSupport instance is created + with no logging enabled before the Android Resolver is initialized. +* Fixed iOS resolver dialog in Unity 4. +* Fixed iOS Cocoapod Xcode project integration in Unity 4. + +# Version 1.2.46 - Aug 22, 2017 +## Bug Fixes +* GradlePrebuild Android resolver on Windows now correctly locates dependent + data files. + +# Version 1.2.45 - Aug 22, 2017 +## Bug Fixes +* Improved Android package auto-resolution and fixed clean up of stale + dependencies when using Gradle dependency resolution. + +# Version 1.2.44 - Aug 21, 2017 +## Bug Fixes +* Enabled autoresolution for Gradle Prebuild. +* Made the command line dialog windows have selectable text. +* Fixed incorrect "Android Settings" dialog disabled groups. +* Updated PlayServicesResolver android platform detection to use the package + manager instead of the 'android' tool. +* UnityCompat reflection methods 'GetAndroidPlatform' and + 'GetAndroidBuildToolsVersion' are now Obsolete due to dependence on the + obsolete 'android' build tool. + +# Version 1.2.43 - Aug 18, 2017 +## Bug Fixes +* Fixed Gradle resolution in the Android Resolver when running + PlayServicesResolver.Resolve() in parallel or spawning multiple + resolutions before the previous resolve completed. + +# Version 1.2.42 - Aug 17, 2017 +## Bug Fixes +* Fixed Xcode project level settings not being applied by IOS Resolver when + Xcode project pod integration is enabled. + +# Version 1.2.41 - Aug 15, 2017 +## Bug Fixes +* IOS Resolver's Xcode workspace pod integration is now disabled when Unity + Cloud Build is detected. Unity Cloud Build does not follow the same build + process as the Unity editor and fails to open the generated xcworkspace at + this time. + +# Version 1.2.40 - Aug 15, 2017 +## Bug Fixes +* Moved Android Resolver Gradle Prebuild scripts into Google.JarResolver.dll. + They are now extracted from the DLL when required. +* AARs / JARs are now cleaned up when switching the Android resolution + strategy. + +# Version 1.2.39 - Aug 10, 2017 +## New Features +* Android Resolver now supports resolution with Gradle. This enables support + for non-local artifacts. +## Bug Fixes +* Android Resolver's Gradle Prebuild now uses Android build tools to determine + the Android platform tools version rather than relying upon internal Unity + APIs. +* Android Resolver's Gradle Prebuild now correctly strips binaries that are + not required for the target ABI. + +# Version 1.2.38 - Aug 7, 2017 +## Bug Fixes +* Fixed an issue in VersionHandler where disabled targets are ignored if + the "Any Platform" flag is set on a plugin DLL. + +# Version 1.2.37 - Aug 3, 2017 +## New Features +* Exposed GooglePlayServices.PlayServicesResolver.Resolve() so that it's + possible for a script to be notified when AAR / Jar resolution is complete. + This makes it easier to setup a project to build from the command line. + +# Version 1.2.36 - Aug 3, 2017 +## New Features +* VersionHandler.UpdateCompleteMethods allows a user to provide a list of + methods to be called when VersionHandlerImpl has completed an update. + This makes it easier to import a plugin and wait for VersionHandler to + execute prior executing a build. + +# Version 1.2.35 - Jul 28, 2017 +## New Features +* VersionHandler will now rename Linux libraries so they can target Unity + versions that require different file naming. Libraries need to be labelled + gvh_linuxlibname-${basename} in order to be considered for renaming. + e.g gvh\_linuxlibname-MyLib will be named MyLib.so in Unity 5.5 and below and + libMyLib.so in Unity 5.6 and above. + +# Version 1.2.34 - Jul 28, 2017 +## Bug Fixes +* Made VersionHandler bootstrap module more robust when calling static + methods before the implementation DLL is loaded. + +# Version 1.2.33 - Jul 27, 2017 +## New Features +* Added a bootstrap module for VersionHandler so the implementation + of the VersionHandler module can be versioned without resulting in + a compile error when imported at different versions across multiple + plugins. + +# Version 1.2.32 - Jul 20, 2017 +## New Features +* Added support for build target selection based upon .NET framework + version in the VersionHandler. + When applying either gvh\_dotnet-3.5 or gvh\_dotnet-4.5 labels to + assets, the VersionHandler will only enable the asset for the + specified set of build targets when the matching .NET framework version + is selected in Unity 2017's project settings. This allows assets + to be provided in a plugin that need to differ based upon .NET version. + +# Version 1.2.31 - Jul 5, 2017 +## Bug Fixes +* Force expansion of AARs with native components when using Unity 2017 + with the internal build system. In contrast to Unity 5.x, Unity 2017's + internal build system does not include native libraries included in AARs. + Forcing expansion of AARs with native components generates an + Ant / Eclipse project for each AAR which is correctly included by Unity + 2017's internal build system. + +# Version 1.2.30 - Jul 5, 2017 +## Bug Fixes +* Fixed Cocoapods being installed when the build target isn't iOS. +* Added support for malformed AARs with missing classes.jar. + +# Version 1.2.29 - Jun 16, 2017 +## New Features +* Added support for the Android sdkmanager tool. + +# Version 1.2.28 - Jun 8, 2017 +## Bug Fixes +* Fixed non-shell command line execution (regression from + Cocoapod installation patch). + +# Version 1.2.27 - Jun 7, 2017 +## Bug Fixes +* Added support for stdout / stderr redirection when executing + commands in shell mode. + This fixes CocoaPod tool installation when shell mode is + enabled. +* Fixed incremental builds when additional sources are specified + in the Podfile. + +# Version 1.2.26 - Jun 7, 2017 +## Bug Fixes +* Fixed a crash when importing Version Handler into Unity 4.7.x. + +# Version 1.2.25 - Jun 7, 2017 +## Bug Fixes +* Fixed an issue in the Jar Resolver which incorrectly notified + event handlers of bundle ID changes when the currently selected + (not active) build target changed in Unity 5.6 and above. + +# Version 1.2.24 - Jun 6, 2017 +## New Features +* Added option to control file renaming in Version Handler settings. + Disabling file renaming (default option) significantly increases + the speed of file version management operations with the downside + that any files that are referenced directly by canonical filename + rather than asset ID will no longer be valid. +* Improved logging in the Version Handler. +## Bug Fixes +* Fixed an issue in the Version Handler which caused it to not + re-enable plugins when re-importing a custom package with disabled + version managed files. + +# Version 1.2.23 - May 26, 2017 +## Bug Fixes +* Fixed a bug with gradle prebuild resolver on windows. + +# Version 1.2.22 - May 19, 2017 +## Bug Fixes +* Fixed a bug in the iOS resolver with incremental builds. +* Fixed misdetection of Cocoapods support with Unity beta 5.6. + +# Version 1.2.21 - May 8, 2017 +## Bug Fixes +* Fix for https://github.com/googlesamples/unity-jar-resolver/issues/48 + Android dependency version number parsing when "-alpha" (etc.) are + included in dependency (AAR / JAR) versions. + +# Version 1.2.20 - May 8, 2017 +## Bug Fixes +* Attempted to fix + https://github.com/googlesamples/unity-jar-resolver/issues/48 + where a NullReferenceException could occur if a target file does not + have a valid version string. + +# Version 1.2.19 - May 4, 2017 +## Bug Fixes +* Fixed Jar Resolver exploding and deleting AAR files it isn't managing. + +# Version 1.2.18 - May 4, 2017 +## New Features +* Added support for preserving Unity pods such as when GVR is enabled. + +# Version 1.2.17 - Apr 20, 2017 +## Bug Fixes +* Fixed auto-resolution when an Android application ID is modified. + +# Version 1.2.16 - Apr 17, 2017 +## Bug Fixes +* Fixed Unity version number parsing on machines with a locale that uses + "," for decimal points. +* Fixed null reference exception if JDK path isn't set. + +# Version 1.2.15 - Mar 17, 2017 +## New Features +* Added warning when the Jar Resolver's background resolution is disabled. +## Bug Fixes +* Fixed support of AARs with native libraries when using Gradle. +* Fixed extra repository paths when resolving dependencies. + +# Version 1.2.14 - Mar 7, 2017 +## New Features +* Added experimental Android resolution using Gradle. + This alternative resolver supports proguard stripping with Unity's + internal build system. +* Added Android support for single ABI builds when using AARs include + native libraries. +* Disabled Android resolution on changes to all .cs and .js files. + File patterns that are monitored for auto-resolution can be added + using PlayServicesResolver.AddAutoResolutionFilePatterns(). +* Added tracking of resolved AARs and JARs so they can be cleaned up + if they're no longer referenced by a project. +* Added persistence of AAR / JAR version replacement for each Unity + session. +* Added settings dialog to the iOS resolver. +* Integrated Cocoapod tool installation in the iOS resolver. +* Added option to run pod tool via the shell. +## Bug Fixes +* Fixed build of some source Cocoapods (e.g Protobuf). +* VersionHandler no longer prompts to delete obsolete manifests. +* iOS resolver handles Cocoapod installation when using Ruby < 2.2.2. +* Added workaround for package version selection when including + Google Play Services on Android. +* Fixed support for pods that reference static libraries. +* Fixed support for resource-only pods. + +# Version 1.2.12 - Feb 14, 2017 +## Bug Fixes +* Fixed re-explosion of AARs when the bundle ID is modified. + +# Version 1.2.11 - Jan 30, 2017 +## New Features +* Added support for Android Studio builds. +* Added support for native (C/C++) shared libraries in AARs. + +# Version 1.2.10 - Jan 11, 2017 +## Bug Fixes +* Fixed SDK manager path retrieval. +* Also, report stderr when it's not possible to run the "pod" tool. +* Handle exceptions thrown by Unity.Cecil on asset rename +* Fixed IOSResolver to handle PlayerSettings.iOS.targetOSVersionString + +# Version 1.2.9 - Dec 7, 2016 +## Bug Fixes +* Improved error reporting when "pod repo update" fails. +* Added detection of xml format xcode projects generated by old Cocoapods + installations. + +# Version 1.2.8 - Dec 6, 2016 +## Bug Fixes +* Increased speed of JarResolver resolution. +* Fixed JarResolver caches getting out of sync with requested dependencies + by removing the caches. +* Fixed JarResolver explode cache always being rewritten even when no + dependencies change. + +# Version 1.2.7 - Dec 2, 2016 +## Bug Fixes +* Fixed VersionHandler build errors with Unity 5.5, due to the constantly + changing BuildTarget enum. +* Added support for Unity configured JDK Path rather than requiring + JAVA_HOME to be set in the Jar Resolver. + +# Version 1.2.6 - Nov 15, 2016 +## Bug Fixes +* Fixed IOSResolver errors when iOS support is not installed. +* Added fallback to "pod" executable search which queries the Ruby Gems + package manager for the binary install location. + +# Version 1.2.5 - Nov 3, 2016 +## Bug Fixes +* Added crude support for source only Cocoapods to the IOSResolver. + +# Version 1.2.4 - Oct 27, 2016 +## Bug Fixes +* Automated resolution of out of date pod repositories. + +# Version 1.2.3 - Oct 25, 2016 +## Bug Fixes +* Fixed exception when reporting conflicting dependencies. + +# Version 1.2.2 - Oct 17, 2016 +## Bug Fixes +* Fixed issue working with Unity 5.5 +* Fixed issue with PlayServicesResolver corrupting other iOS dependencies. +* Updated build script to use Unity distributed tools for building. + +# Version 1.2.1 - Jul 25, 2016 +## Bug Fixes +* Removed 1.2 Resolver and hardcoded whitelist of AARs to expand. +* Improved error reporting when the "jar" executable can't be found. +* Removed the need to set JAVA_HOME if "jar" is in the user's path. +* Fixed spurious copying of partially matching AARs. +* Changed resolver to only copy / expand when source AARs change. +* Auto-resolution of dependencies is now performed when the Android + build target is selected. + +## New Features +* Expand AARs that contain manifests with variable expansion like + ${applicationId}. +* Added optional logging in the JarResolverLib module. +* Integration with the Android SDK manager for dependencies that + declare required Android SDK packages. + +# Version 1.2.0 - May 11 2016 +## Bug Fixes +* Handles resolving dependencies when the artifacts are split across 2 repos. +* #4 Misdetecting version for versions like 1.2-alpha. These are now string + compared if alphanumeric +* Removed resolver creation via reflection since it did not work all the time. + Now a resolver needs to be loaded externally (which is existing behavior). + +## New Features +* Expose PlayServicesResolver properties to allow for script access. +* Explodes firebase-common and firebase-measurement aar files to support + ${applicationId} substitution. + +# Version 1.1.1 - 25 Feb 2016 +## Bug Fixes +* #1 Spaces in project path not handled when exploding Aar file. +* #2 Script compilation error: TypeLoadException. + +# Version 1.1.0 - 5 Feb 2016 +## New Features +* Adds friendly alert when JAVA_HOME is not set on Windows platforms. +* Adds flag for disabling background resolution. +* Expands play-services-measurement and replaces ${applicationId} with the + bundle Id. + + ## Bug Fixes +* Fixes infinite loop of resolution triggered by resolution. diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta b/nekoyume/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta new file mode 100644 index 00000000000..7bc9a8cef57 --- /dev/null +++ b/nekoyume/Assets/ExternalDependencyManager/Editor/CHANGELOG.md.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c59750df28b54a599d43c4d5204fb1b8 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-ExternalDependencyManager/Editor/CHANGELOG.md +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll b/nekoyume/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll new file mode 100755 index 00000000000..03ad6370ad9 Binary files /dev/null and b/nekoyume/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll differ diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb b/nekoyume/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb new file mode 100755 index 00000000000..caa8dbb08d4 Binary files /dev/null and b/nekoyume/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb differ diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb.meta b/nekoyume/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb.meta new file mode 100644 index 00000000000..62980b89c41 --- /dev/null +++ b/nekoyume/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8e257495524f4e6aa7ed13445e81a182 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta b/nekoyume/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta new file mode 100644 index 00000000000..26e0a8e7b3b --- /dev/null +++ b/nekoyume/Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta @@ -0,0 +1,38 @@ +fileFormatVersion: 2 +guid: 9083229ed99f4fb0993b5625e8ea47f8 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.dll +- gvhp_targets-editor +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/LICENSE b/nekoyume/Assets/ExternalDependencyManager/Editor/LICENSE new file mode 100755 index 00000000000..6258cc47e90 --- /dev/null +++ b/nekoyume/Assets/ExternalDependencyManager/Editor/LICENSE @@ -0,0 +1,245 @@ +Copyright (C) 2014 Google Inc. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +==================================================================================================== +This package uses MiniJSON + +Copyright (c) 2013 Calvin Rien + +Based on the JSON parser by Patrick van Bergen +http://techblog.procurios.nl/k/618/news/view/14605/14863/How-do-I-write-my-own-parser-for-JSON.html + +Simplified it so that it doesn't throw exceptions +and can be used in Unity iPhone with maximum code stripping. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/LICENSE.meta b/nekoyume/Assets/ExternalDependencyManager/Editor/LICENSE.meta new file mode 100644 index 00000000000..49c91923dfa --- /dev/null +++ b/nekoyume/Assets/ExternalDependencyManager/Editor/LICENSE.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d980a3fa4da0408e910fde746ce3b558 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-ExternalDependencyManager/Editor/LICENSE +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/README.md b/nekoyume/Assets/ExternalDependencyManager/Editor/README.md new file mode 100755 index 00000000000..b49cf1e2d6a --- /dev/null +++ b/nekoyume/Assets/ExternalDependencyManager/Editor/README.md @@ -0,0 +1,768 @@ +External Dependency Manager for Unity +======== + +# Overview + +The External Dependency Manager for Unity (EDM4U) +(formerly Play Services Resolver / Jar Resolver) is intended to be used by any +Unity plugin that requires: + + * Android specific libraries (e.g + [AARs](https://developer.android.com/studio/projects/android-library.html)). + * iOS [CocoaPods](https://cocoapods.org/). + * Version management of transitive dependencies. + * Management of Package Manager (PM) Registries. + +Updated releases are available on +[GitHub](https://github.com/googlesamples/unity-jar-resolver) + +# Background + +Many Unity plugins have dependencies upon Android specific libraries, iOS +CocoaPods, and sometimes have transitive dependencies upon other Unity plugins. +This causes the following problems: + + * Integrating platform specific (e.g Android and iOS) libraries within a + Unity project can be complex and a burden on a Unity plugin maintainer. + * The process of resolving conflicting dependencies on platform specific + libraries is pushed to the developer attempting to use a Unity plugin. + The developer trying to use your plugin is very likely to give up when + faced with Android or iOS specific build errors. + * The process of resolving conflicting Unity plugins (due to shared Unity + plugin components) is pushed to the developer attempting to use your Unity + plugin. In an effort to resolve conflicts, the developer will very likely + attempt to resolve problems by deleting random files in your plugin, + report bugs when that doesn't work and finally give up. + +EDM provides solutions for each of these problems. + +## Android Dependency Management + +The *Android Resolver* component of this plugin will download and integrate +Android library dependencies and handle any conflicts between plugins that share +the same dependencies. + +Without the Android Resolver, typically Unity plugins bundle their AAR and +JAR dependencies, e.g. a Unity plugin `SomePlugin` that requires the Google +Play Games Android library would redistribute the library and its transitive +dependencies in the folder `SomePlugin/Android/`. When a user imports +`SomeOtherPlugin` that includes the same libraries (potentially at different +versions) in `SomeOtherPlugin/Android/`, the developer using `SomePlugin` and +`SomeOtherPlugin` will see an error when building for Android that can be hard +to interpret. + +Using the Android Resolver to manage Android library dependencies: + + * Solves Android library conflicts between plugins. + * Handles all of the various processing steps required to use Android + libraries (AARs, JARs) in Unity 4.x and above projects. Almost all + versions of Unity have - at best - partial support for AARs. + * (Experimental) Supports minification of included Java components without + exporting a project. + +## iOS Dependency Management + +The *iOS Resolver* component of this plugin integrates with +[CocoaPods](https://cocoapods.org/) to download and integrate iOS libraries +and frameworks into the Xcode project Unity generates when building for iOS. +Using CocoaPods allows multiple plugins to utilize shared components without +forcing developers to fix either duplicate or incompatible versions of +libraries included through multiple Unity plugins in their project. + +## Package Manager Registry Setup + +The [Package Manager](https://docs.unity3d.com/Manual/Packages.html) +(PM) makes use of [NPM](https://www.npmjs.com/) registry servers for package +hosting and provides ways to discover, install, upgrade and uninstall packages. +This makes it easier for developers to manage plugins within their projects. + +However, installing additional package registries requires a few manual steps +that can potentially be error prone. The *Package Manager Resolver* +component of this plugin integrates with +[PM](https://docs.unity3d.com/Manual/Packages.html) to provide a way to +auto-install PM package registries when a `.unitypackage` is installed which +allows plugin maintainers to ship a `.unitypackage` that can provide access +to their own PM registry server to make it easier for developers to +manage their plugins. + +## Unity Plugin Version Management + +Finally, the *Version Handler* component of this plugin simplifies the process +of managing transitive dependencies of Unity plugins and each plugin's upgrade +process. + +For example, without the Version Handler plugin, if: + + * Unity plugin `SomePlugin` includes `EDM4U` plugin at + version 1.1. + * Unity plugin `SomeOtherPlugin` includes `EDM4U` + plugin at version 1.2. + +The version of `EDM4U` included in the developer's project depends upon the +order the developer imports `SomePlugin` or `SomeOtherPlugin`. + +This results in: + + * `EDM4U` at version 1.2, if `SomePlugin` is imported then `SomeOtherPlugin` + is imported. + * `EDM4U` at version 1.1, if `SomeOtherPlugin` is imported then + `SomePlugin` is imported. + +The Version Handler solves the problem of managing transitive dependencies by: + + * Specifying a set of packaging requirements that enable a plugin at + different versions to be imported into a Unity project. + * Providing activation logic that selects the latest version of a plugin + within a project. + +When using the Version Handler to manage `EDM4U` included in `SomePlugin` and +`SomeOtherPlugin`, from the prior example, version 1.2 will always be the +version activated in a developer's Unity project. + +Plugin creators are encouraged to adopt this library to ease integration for +their customers. For more information about integrating EDM4U +into your own plugin, see the [Plugin Redistribution](#plugin-redistribution) +section of this document. + +# Analytics + +The External Dependency Manager for Unity plugin by default logs usage to Google +Analytics. The purpose of the logging is to quantitatively measure the usage of +functionality, to gather reports on integration failures and to inform future +improvements to the developer experience of the External Dependency Manager +plugin. Note that the analytics collected are limited to the scope of the EDM4U +plugin’s usage. + +For details of what is logged, please refer to the usage of +`EditorMeasurement.Report()` in the source code. + +# Requirements + +The *Android Resolver* and *iOS Resolver* components of the plugin only work +with Unity version 4.6.8 or higher. + +The *Version Handler* component only works with Unity 5.x or higher as it +depends upon the `PluginImporter` UnityEditor API. + +The *Package Manager Resolver* component only works with +Unity 2018.4 or above, when +[scoped registry](https://docs.unity3d.com/Manual/upm-scoped.html) +support was added to the Package Manager. + +# Getting Started + +Before you import EDM4U into your plugin project, you first +need to consider whether you intend to *redistribute* `EDM4U` +along with your own plugin. + +## Plugin Redistribution + +If you're a plugin maintainer, redistributing `EDM4U` inside your own plugin +will ease the integration process for your users, by resolving dependency +conflicts between your plugin and other plugins in a user's project. + +If you wish to redistribute `EDM4U` inside your plugin, +you **must** follow these steps when importing the +`external-dependency-manager-*.unitypackage`, and when exporting your own plugin +package: + + 1. Import the `external-dependency-manager-*.unitypackage` into your plugin + project by + [running Unity from the command line](https://docs.unity3d.com/Manual/CommandLineArguments.html), ensuring that + you add the `-gvh_disable` option. + 1. Export your plugin by [running Unity from the command line](https://docs.unity3d.com/Manual/CommandLineArguments.html), ensuring that + you: + - Include the contents of the `Assets/PlayServicesResolver` and + `Assets/ExternalDependencyManager` directory. + - Add the `-gvh_disable` option. + +You **must** specify the `-gvh_disable` option in order for the Version +Handler to work correctly! + +For example, the following command will import the +`external-dependency-manager-1.2.46.0.unitypackage` into the project +`MyPluginProject` and export the entire Assets folder to +`MyPlugin.unitypackage`: + +``` +Unity -gvh_disable \ + -batchmode \ + -importPackage external-dependency-manager-1.2.46.0.unitypackage \ + -projectPath MyPluginProject \ + -exportPackage Assets MyPlugin.unitypackage \ + -quit +``` + +### Background + +The *Version Handler* component relies upon deferring the load of editor DLLs +so that it can run first and determine the latest version of a plugin component +to activate. The build of `EDM4U` plugin has Unity asset metadata that is +configured so that the editor components are not initially enabled when it's +imported into a Unity project. To maintain this configuration when importing +the `external-dependency-manager.unitypackage` into a Unity plugin project, you +*must* specify the command line option `-gvh_disable` which will prevent the +Version Handler component from running and changing the Unity asset metadata. + +# Android Resolver Usage + +The Android Resolver copies specified dependencies from local or remote Maven +repositories into the Unity project when a user selects Android as the build +target in the Unity editor. + + 1. Add the `external-dependency-manager-*.unitypackage` to your plugin + project (assuming you are developing a plugin). If you are redistributing + EDM4U with your plugin, you **must** follow the + import steps in the [Getting Started](#getting-started) section! + + 2. Copy and rename the + [SampleDependencies.xml](https://github.com/googlesamples/unity-jar-resolver/blob/master/sample/Assets/ExternalDependencyManager/Editor/SampleDependencies.xml) + file into your plugin and add the dependencies your plugin requires. + + The XML file just needs to be under an `Editor` directory and match the + name `*Dependencies.xml`. For example, + `MyPlugin/Editor/MyPluginDependencies.xml`. + + 3. Follow the steps in the [Getting Started](#getting-started) + section when you are exporting your plugin package. + +For example, to add the Google Play Games library +(`com.google.android.gms:play-services-games` package) at version `9.8.0` to +the set of a plugin's Android dependencies: + +``` + + + + + extra-google-m2repository + + + + +``` + +The version specification (last component) supports: + + * Specific versions e.g `9.8.0` + * Partial matches e.g `9.8.+` would match 9.8.0, 9.8.1 etc. choosing the most + recent version. + * Latest version using `LATEST` or `+`. We do *not* recommend using this + unless you're 100% sure the library you depend upon will not break your + Unity plugin in future. + +The above example specifies the dependency as a component of the Android SDK +manager such that the Android SDK manager will be executed to install the +package if it's not found. If your Android dependency is located on Maven +central it's possible to specify the package simply using the `androidPackage` +element: + +``` + + + + + +``` + +## Auto-resolution + +By default the Android Resolver automatically monitors the dependencies you have +specified and the `Plugins/Android` folder of your Unity project. The +resolution process runs when the specified dependencies are not present in your +project. + +The *auto-resolution* process can be disabled via the +`Assets > External Dependency Manager > Android Resolver > Settings` menu. + +Manual resolution can be performed using the following menu options: + + * `Assets > External Dependency Manager > Android Resolver > Resolve` + * `Assets > External Dependency Manager > Android Resolver > Force Resolve` + +## Deleting libraries + +Resolved packages are tracked via asset labels by the Android Resolver. +They can easily be deleted using the +`Assets > External Dependency Manager > Android Resolver > Delete Resolved Libraries` +menu item. + +## Android Manifest Variable Processing + +Some AAR files (for example play-services-measurement) contain variables that +are processed by the Android Gradle plugin. Unfortunately, Unity does not +perform the same processing when using Unity's Internal Build System, so the +Android Resolver plugin handles known cases of this variable substitution +by exploding the AAR into a folder and replacing `${applicationId}` with the +`bundleID`. + +Disabling AAR explosion and therefore Android manifest processing can be done +via the `Assets > External Dependency Manager > Android Resolver > Settings` +menu. You may want to disable explosion of AARs if you're exporting a project +to be built with Gradle / Android Studio. + +## ABI Stripping + +Some AAR files contain native libraries (.so files) for each ABI supported +by Android. Unfortunately, when targeting a single ABI (e.g x86), Unity does +not strip native libraries for unused ABIs. To strip unused ABIs, the Android +Resolver plugin explodes an AAR into a folder and removes unused ABIs to +reduce the built APK size. Furthermore, if native libraries are not stripped +from an APK (e.g you have a mix of Unity's x86 library and some armeabi-v7a +libraries) Android may attempt to load the wrong library for the current +runtime ABI completely breaking your plugin when targeting some architectures. + +AAR explosion and therefore ABI stripping can be disabled via the +`Assets > External Dependency Manager > Android Resolver > Settings` menu. +You may want to disable explosion of AARs if you're exporting a project to be +built with Gradle / Android Studio. + +## Resolution Strategies + +By default the Android Resolver will use Gradle to download dependencies prior +to integrating them into a Unity project. This works with Unity's internal +build system and Gradle / Android Studio project export. + +It's possible to change the resolution strategy via the +`Assets > External Dependency Manager > Android Resolver > Settings` menu. + +### Download Artifacts with Gradle + +Using the default resolution strategy, the Android resolver executes the +following operations: + + - Remove the result of previous Android resolutions. + e.g Delete all files and directories labeled with "gpsr" under + `Plugins/Android` from the project. + - Collect the set of Android dependencies (libraries) specified by a + project's `*Dependencies.xml` files. + - Run `download_artifacts.gradle` with Gradle to resolve conflicts and, + if successful, download the set of resolved Android libraries (AARs, JARs). + - Process each AAR / JAR so that it can be used with the currently selected + Unity build system (e.g Internal vs. Gradle, Export vs. No Export). + This involves patching each reference to `applicationId` in the + AndroidManifest.xml with the project's bundle ID. This means resolution + must be run if the bundle ID is changed again. + - Move the processed AARs to `Plugins/Android` so they will be included when + Unity invokes the Android build. + +### Integrate into mainTemplate.gradle + +Unity 5.6 introduced support for customizing the `build.gradle` used to build +Unity projects with Gradle. When the *Patch mainTemplate.gradle* setting is +enabled, rather than downloading artifacts before the build, Android resolution +results in the execution of the following operations: + + - Remove the result of previous Android resolutions. + e.g Delete all files and directories labeled with "gpsr" under + `Plugins/Android` from the project and remove sections delimited with + `// Android Resolver * Start` and `// Android Resolver * End` lines. + - Collect the set of Android dependencies (libraries) specified by a + project's `*Dependencies.xml` files. + - Rename any `.srcaar` files in the build to `.aar` and exclude them from + being included directly by Unity in the Android build as + `mainTemplate.gradle` will be patched to include them instead from their + local maven repositories. + - Inject the required Gradle repositories into `mainTemplate.gradle` at the + line matching the pattern + `.*apply plugin: 'com\.android\.(application|library)'.*` or the section + starting at the line `// Android Resolver Repos Start`. + If you want to control the injection point in the file, the section + delimited by the lines `// Android Resolver Repos Start` and + `// Android Resolver Repos End` should be placed in the global scope + before the `dependencies` section. + - Inject the required Android dependencies (libraries) into + `mainTemplate.gradle` at the line matching the pattern `***DEPS***` or + the section starting at the line `// Android Resolver Dependencies Start`. + If you want to control the injection point in the file, the section + delimited by the lines `// Android Resolver Dependencies Start` and + `// Android Resolver Dependencies End` should be placed in the + `dependencies` section. + - Inject the packaging options logic, which excludes architecture specific + libraries based upon the selected build target, into `mainTemplate.gradle` + at the line matching the pattern `android +{` or the section starting at + the line `// Android Resolver Exclusions Start`. + If you want to control the injection point in the file, the section + delimited by the lines `// Android Resolver Exclusions Start` and + `// Android Resolver Exclusions End` should be placed in the global + scope before the `android` section. + +## Dependency Tracking + +The Android Resolver creates the +`ProjectSettings/AndroidResolverDependencies.xml` to quickly determine the set +of resolved dependencies in a project. This is used by the auto-resolution +process to only run the expensive resolution process when necessary. + +## Displaying Dependencies + +It's possible to display the set of dependencies the Android Resolver +would download and process in your project via the +`Assets > External Dependency Manager > Android Resolver > Display Libraries` +menu item. + +# iOS Resolver Usage + +The iOS resolver component of this plugin manages +[CocoaPods](https://cocoapods.org/). A CocoaPods `Podfile` is generated and +the `pod` tool is executed as a post build process step to add dependencies +to the Xcode project exported by Unity. + +Dependencies for iOS are added by referring to CocoaPods. + + 1. Add the `external-dependency-manager-*.unitypackage` to your plugin + project (assuming you are developing a plugin). If you are redistributing + EDM4U with your plugin, you **must** follow the + import steps in the [Getting Started](#getting-started) section! + + 2. Copy and rename the + [SampleDependencies.xml](https://github.com/googlesamples/unity-jar-resolver/blob/master/sample/Assets/ExternalDependencyManager/Editor/SampleDependencies.xml) + file into your plugin and add the dependencies your plugin requires. + + The XML file just needs to be under an `Editor` directory and match the + name `*Dependencies.xml`. For example, + `MyPlugin/Editor/MyPluginDependencies.xml`. + + 3. Follow the steps in the [Getting Started](#getting-started) + section when you are exporting your plugin package. + +For example, to add the AdMob pod, version 7.0 or greater with bitcode enabled: + +``` + + + + + +``` + +## Integration Strategies + +The `CocoaPods` are either: + * Downloaded and injected into the Xcode project file directly, rather than + creating a separate xcworkspace. We call this `Xcode project` integration. + * If the Unity version supports opening a xcworkspace file, the `pod` tool + is used as intended to generate a xcworkspace which references the + CocoaPods. We call this `Xcode workspace` integration. + +The resolution strategy can be changed via the +`Assets > External Dependency Manager > iOS Resolver > Settings` menu. + +### Appending text to generated Podfile +In order to modify the generated Podfile you can create a script like this: +``` +using System.IO; +public class PostProcessIOS : MonoBehaviour { +[PostProcessBuildAttribute(45)]//must be between 40 and 50 to ensure that it's not overriden by Podfile generation (40) and that it's added before "pod install" (50) +private static void PostProcessBuild_iOS(BuildTarget target, string buildPath) +{ + if (target == BuildTarget.iOS) + { + + using (StreamWriter sw = File.AppendText(buildPath + "/Podfile")) + { + //in this example I'm adding an app extension + sw.WriteLine("\ntarget 'NSExtension' do\n pod 'Firebase/Messaging', '6.6.0'\nend"); + } + } +} +``` + +# Package Manager Resolver Usage + +Adding registries to the +[Package Manager](https://docs.unity3d.com/Manual/Packages.html) +(PM) is a manual process. The Package Manager Resolver (PMR) component +of this plugin makes it easy for plugin maintainers to distribute new PM +registry servers and easy for plugin users to manage PM registry servers. + +## Adding Registries + + 1. Add the `external-dependency-manager-*.unitypackage` to your plugin + project (assuming you are developing a plugin). If you are redistributing + EDM4U with your plugin, you **must** follow the + import steps in the [Getting Started](#getting-started) section! + + 2. Copy and rename the + [SampleRegistries.xml](https://github.com/googlesamples/unity-jar-resolver/blob/master/sample/Assets/ExternalDependencyManager/Editor/sample/Assets/ExternalDependencyManager/Editor/SampleRegistries.xml) + file into your plugin and add the registries your plugin requires. + + The XML file just needs to be under an `Editor` directory and match the + name `*Registries.xml` or labeled with `gumpr_registries`. For example, + `MyPlugin/Editor/MyPluginRegistries.xml`. + + 3. Follow the steps in the [Getting Started](#getting-started) + section when you are exporting your plugin package. + +For example, to add a registry for plugins in the scope `com.coolstuff`: + +``` + + + + com.coolstuff + + + +``` + +When PMR is loaded it will prompt the developer to add the registry to their +project if it isn't already present in the `Packages/manifest.json` file. + +For more information, see Unity's documentation on +[scoped package registries](https://docs.unity3d.com/Manual/upm-scoped.html). + +## Managing Registries + +It's possible to add and remove registries that are specified via PMR +XML configuration files via the following menu options: + +* `Assets > External Dependency Manager > Package Manager Resolver > + Add Registries` will prompt the user with a window which allows them to + add registries discovered in the project to the Package Manager. +* `Assets > External Dependency Manager > Package Manager Resolver > + Remove Registries` will prompt the user with a window which allows them to + remove registries discovered in the project from the Package Manager. +* `Assets > External Dependency Manager > Package Manager Resolver > + Modify Registries` will prompt the user with a window which allows them to + add or remove registries discovered in the project. + +## Migration + +PMR can migrate Version Handler packages installed in the `Assets` folder +to PM packages. This requires the plugins to implement the following: + +* `.unitypackage` must include a Version Handler manifests that describes + the components of the plugin. If the plugin has no dependencies + the manifest would just include the files in the plugin. +* The PM package JSON provided by the registry must include a keyword + (in the `versions.VERSION.keyword` list) that maps the PM package + to a Version Handler package using the format + `vh-name:VERSION_HANDLER_MANIFEST_NAME` where `VERSION_HANDLER_MANIFEST_NAME` + is the name of the manifest defined in the `.unitypackage`. For + more information see the description of the `gvhp_manifestname` asset label + in the *Version Handler Usage* section. + +When using the `Assets > External Dependency Manager > +Package Manager Resolver > Migrate Packages` menu option, PMR then +will: + +* List all Version Handler manager packages in the project. +* Search all available packages in the PM registries and fetch keywords + associated with each package parsing the Version Handler manifest names + for each package. +* Map each installed Version Handler package to a PM package. +* Prompt the user to migrate the discovered packages. +* Perform package migration for all selected packages if the user clicks + the `Apply` button. + +## Configuration + +PMR can be configured via the `Assets > External Dependency Manager > +Package Manager Resolver > Settings` menu option: + +* `Add package registries` when enabled, when the plugin loads or registry + configuration files change, this will prompt the user to add registries + that are not present in the Package Manager. +* `Prompt to add package registries` will cause a developer to be prompted + with a window that will ask for confirmation before adding registries. + When this is disabled registries are added silently to the project. +* `Prompt to migrate packages` will cause a developer to be prompted + with a window that will ask for confirmation before migrating packages + installed in the `Assets` directory to PM packages. +* `Enable Analytics Reporting` when enabled, reports the use of the plugin + to the developers so they can make imrpovements. +* `Verbose logging` when enabled prints debug information to the console + which can be useful when filing bug reports. + +# Version Handler Usage + +The Version Handler component of this plugin manages: + +* Shared Unity plugin dependencies. +* Upgrading Unity plugins by cleaning up old files from previous versions. +* Uninstallation of plugins that are distributed with manifest files. +* Restoration of plugin assets to their original install locations if assets + are tagged with the `exportpath` label. + +Since the Version Handler needs to modify Unity asset metadata (`.meta` files), +to enable / disable components, rename and delete asset files it does not +work with Package Manager installed packages. It's still possible to +include EDM4U in Package Manager packages, the Version Handler component +simply won't do anything to PM plugins in this case. + +## Using Version Handler Managed Plugins + +If a plugin is imported at multiple different versions into a project, if +the Version Handler is enabled, it will automatically check all managed +assets to determine the set of assets that are out of date and assets that +should be removed. To disable automatic checking managed assets disable +the `Enable version management` option in the +`Assets > External Dependency Manager > Version Handler > Settings` menu. + +If version management is disabled, it's possible to check managed assets +manually using the +`Assets > External Dependency Manager > Version Handler > Update` menu option. + +### Listing Managed Plugins + +Plugins managed by the Version Handler, those that ship with manifest files, +can displayed using the `Assets > External Dependency Manager > +Version Handler > Display Managed Packages` menu option. The list of plugins +are written to the console window along with the set of files used by each +plugin. + +### Uninstalling Managed Plugins + +Plugins managed by the Version Handler, those that ship with manifest files, +can be removed using the `Assets > External Dependency Manager > +Version Handler > Uninstall Managed Packages` menu option. This operation +will display a window that allows a developer to select a set of plugins to +remove which will remove all files owned by each plugin excluding those that +are in use by other installed plugins. + +Files managed by the Version Handler, those labeled with the `gvh` asset label, +can be checked to see whether anything needs to be upgraded, disabled or +removed using the `Assets > External Dependency Manager > +Version Handler > Update` menu option. + +### Restore Install Paths + +Some developers move assets around in their project which can make it +harder for plugin maintainers to debug issues if this breaks Unity's +[special folders](https://docs.unity3d.com/Manual/SpecialFolders.html) rules. +If assets are labeled with their original install / export path +(see `gvhp_exportpath` below), Version Handler can restore assets to their +original locations when using the `Assets > External Dependency Manager > +Version Handler > Move Files To Install Locations` menu option. + +### Settings + +Some behavior of the Version Handler can be configured via the +`Assets > External Dependency Manager > Version Handler > Settings` menu +option. + +* `Enable version management` controls whether the plugin should automatically + check asset versions and apply changes. If this is disabled the process + should be run manually when installing or upgrading managed plugins using + `Assets > External Dependency Manager > Version Handler > Update`. +* `Rename to canonical filenames` is a legacy option that will rename files to + remove version numbers and other labels from filenames. +* `Prompt for obsolete file deletion` enables the display of a window when + obsolete files are deleted allowing the developer to select which files to + delete and those to keep. +* `Allow disabling files via renaming` controls whether obsolete or disabled + files should be disabled by renaming them to `myfilename_DISABLED`. + Renaming to disable files is required in some scenarios where Unity doesn't + support removing files from the build via the PluginImporter. +* `Enable Analytics Reporting` enables / disables usage reporting to plugin + developers to improve the product. +* `Verbose logging` enables _very_ noisy log output that is useful for + debugging while filing a bug report or building a new managed plugin. +* `Use project settings` saves settings for the plugin in the project rather + than system-wide. + +## Redistributing a Managed Plugin + +The Version Handler employs a couple of methods for managing version +selection, upgrade and removal of plugins. + +* Each plugin can ship with a manifest file that lists the files it includes. + This makes it possible for Version Handler to calculate the difference + in assets between the most recent release of a plugin and the previous + release installed in a project. If a files are removed the Version Handler + will prompt the user to clean up obsolete files. +* Plugins can ship using assets with unique names, unique GUIDs and version + number labels. Version numbers can be attached to assets using labels or + added to the filename (e.g `myfile.txt` would be `myfile_version-x.y.z.txt). + This allows the Version Handler to determine which set of files are the + same file at different versions, select the most recent version and prompt + the developer to clean up old versions. + +Unity plugins can be managed by the Version Handler using the following steps: + + 1. Add the `gvh` asset label to each asset (file) you want Version Handler + to manage. + 1. Add the `gvh_version-VERSION` label to each asset where `VERSION` is the + version of the plugin you're releasing (e.g 1.2.3). + 1. Add the `gvhp_exportpath-PATH` label to each asset where `PATH` is the + export path of the file when the `.unitypackage` is created. This is + used to track files if they're moved around in a project by developers. + 1. Optional: Add `gvh_targets-editor` label to each editor DLL in your + plugin and disable `editor` as a target platform for the DLL. + The Version Handler will enable the most recent version of this DLL when + the plugin is imported. + 1. Optional: If your plugin is included in other Unity plugins, you should + add the version number to each filename and change the GUID of each asset. + This allows multiple versions of your plugin to be imported into a Unity + project, with the Version Handler component activating only the most + recent version. + 1. Create a manifest text file named `MY_UNIQUE_PLUGIN_NAME_VERSION.txt` + that lists all the files in your plugin relative to the project root. + Then add the `gvh_manifest` label to the asset to indicate this file is + a plugin manifest. + 1. Optional: Add a `gvhp_manifestname-NAME` label to your manifest file + to provide a human readable name for your package. If this isn't provided + the name of the manifest file will be used as the package name. + NAME can match the pattern `[0-9]+[a-zA-Z -]' where a leading integer + will set the priority of the name where `0` is the highest priority + and preferably used as the display name. The lowest value (i.e highest + priority name) will be used as the display name and all other specified + names will be aliases of the display name. Aliases can refer to previous + names of the package allowing renaming across published versions. + 1. Redistribute EDM4U Unity plugin with your plugin. + See the [Plugin Redistribution](#plugin-redistribution) for the details. + +If you follow these steps: + + * When users import a newer version of your plugin, files referenced by the + older version's manifest are cleaned up. + * The latest version of the plugin will be selected when users import + multiple packages that include your plugin, assuming the steps in + [Plugin Redistribution](#plugin-redistribution) are followed. + +# Building from Source + +To build this plugin from source you need the following tools installed: + * Unity (with iOS and Android modules installed) + +You can build the plugin by running the following from your shell +(Linux / OSX): + +``` +./gradlew build +``` + +or Windows: + +``` +./gradlew.bat build +``` + +# Releasing + +Each time a new build of this plugin is checked into the source tree you +need to do the following: + + * Bump the plugin version variable `pluginVersion` in `build.gradle` + * Update `CHANGELOG.md` with the new version number and changes included in + the release. + * Build the release using `./gradlew release` which performs the following: + * Updates `external-dependency-manager-*.unitypackage` + * Copies the unpacked plugin to the `exploded` directory. + * Updates template metadata files in the `plugin` directory. + The GUIDs of all asset metadata is modified due to the version number + change. Each file within the plugin is versioned to allow multiple + versions of the plugin to be imported into a Unity project which allows + the most recent version to be activated by the Version Handler + component. + * Create release commit using `./gradlew gitCreateReleaseCommit` which + performs `git commit -a -m "description from CHANGELOG.md"` + * Once the release commit is merge, tag the release using + `./gradlew gitTagRelease` which performs the following: + * `git tag -a pluginVersion -m "version RELEASE"` to tag the release. + * Update tags on remote branch using `git push --tag REMOTE HEAD:master` diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/README.md.meta b/nekoyume/Assets/ExternalDependencyManager/Editor/README.md.meta new file mode 100644 index 00000000000..6df33bee958 --- /dev/null +++ b/nekoyume/Assets/ExternalDependencyManager/Editor/README.md.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b86aa3582c084272a2ff16841e0523f7 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-ExternalDependencyManager/Editor/README.md +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.176_manifest.txt b/nekoyume/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.176_manifest.txt new file mode 100755 index 00000000000..1ae30ebeeeb --- /dev/null +++ b/nekoyume/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.176_manifest.txt @@ -0,0 +1,13 @@ +Assets/ExternalDependencyManager/Editor/1.2.176/Google.IOSResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.176/Google.IOSResolver.dll.mdb +Assets/ExternalDependencyManager/Editor/1.2.176/Google.JarResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.176/Google.JarResolver.dll.mdb +Assets/ExternalDependencyManager/Editor/1.2.176/Google.PackageManagerResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.176/Google.PackageManagerResolver.dll.mdb +Assets/ExternalDependencyManager/Editor/1.2.176/Google.VersionHandlerImpl.dll +Assets/ExternalDependencyManager/Editor/1.2.176/Google.VersionHandlerImpl.dll.mdb +Assets/ExternalDependencyManager/Editor/CHANGELOG.md +Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll +Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb +Assets/ExternalDependencyManager/Editor/LICENSE +Assets/ExternalDependencyManager/Editor/README.md diff --git a/nekoyume/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.176_manifest.txt.meta b/nekoyume/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.176_manifest.txt.meta new file mode 100644 index 00000000000..97f4dc81241 --- /dev/null +++ b/nekoyume/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.176_manifest.txt.meta @@ -0,0 +1,14 @@ +fileFormatVersion: 2 +guid: 6645ca7b22724daa8c73b6017832ff86 +labels: +- gvh +- gvh_manifest +- gvh_version-1.2.176 +- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.176_manifest.txt +- gvhp_manifestname-0External Dependency Manager +- gvhp_manifestname-play-services-resolver +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase.meta b/nekoyume/Assets/Firebase.meta new file mode 100644 index 00000000000..fe0fa330cda --- /dev/null +++ b/nekoyume/Assets/Firebase.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c3fd74adbd0f044edb2d0717c9849210 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Editor.meta b/nekoyume/Assets/Firebase/Editor.meta new file mode 100644 index 00000000000..cf074b6055c --- /dev/null +++ b/nekoyume/Assets/Firebase/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9e414444b52424f62a7f472f63c202a8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Editor/AnalyticsDependencies.xml b/nekoyume/Assets/Firebase/Editor/AnalyticsDependencies.xml new file mode 100755 index 00000000000..a77a62192a7 --- /dev/null +++ b/nekoyume/Assets/Firebase/Editor/AnalyticsDependencies.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + Assets/Firebase/m2repository + + + + diff --git a/nekoyume/Assets/Firebase/Editor/AnalyticsDependencies.xml.meta b/nekoyume/Assets/Firebase/Editor/AnalyticsDependencies.xml.meta new file mode 100644 index 00000000000..a76ba26fd88 --- /dev/null +++ b/nekoyume/Assets/Firebase/Editor/AnalyticsDependencies.xml.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1e3c2da79be842cd838a9ddd70d20fa9 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/Editor/AnalyticsDependencies.xml +timeCreated: 1480838400 +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Editor/AppDependencies.xml b/nekoyume/Assets/Firebase/Editor/AppDependencies.xml new file mode 100755 index 00000000000..798034e82bb --- /dev/null +++ b/nekoyume/Assets/Firebase/Editor/AppDependencies.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + Assets/Firebase/m2repository + + + + diff --git a/nekoyume/Assets/Firebase/Editor/AppDependencies.xml.meta b/nekoyume/Assets/Firebase/Editor/AppDependencies.xml.meta new file mode 100644 index 00000000000..925b97130f1 --- /dev/null +++ b/nekoyume/Assets/Firebase/Editor/AppDependencies.xml.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9b63af95d9364af4a3d8ce58738b6223 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/Editor/AppDependencies.xml +timeCreated: 1480838400 +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Editor/Firebase.Editor.dll b/nekoyume/Assets/Firebase/Editor/Firebase.Editor.dll new file mode 100755 index 00000000000..95f6dbe89da Binary files /dev/null and b/nekoyume/Assets/Firebase/Editor/Firebase.Editor.dll differ diff --git a/nekoyume/Assets/Firebase/Editor/Firebase.Editor.dll.meta b/nekoyume/Assets/Firebase/Editor/Firebase.Editor.dll.meta new file mode 100644 index 00000000000..2544de173d3 --- /dev/null +++ b/nekoyume/Assets/Firebase/Editor/Firebase.Editor.dll.meta @@ -0,0 +1,118 @@ +fileFormatVersion: 2 +guid: 9f2edbf81053418f879076c05f816dc2 +labels: +- gvh +- gvh_targets-editor +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/Editor/Firebase.Editor.dll +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Linux + second: + enabled: 0 + settings: + CPU: None + - first: + : LinuxUniversal + second: + enabled: 0 + settings: + CPU: None + - first: + : OSXIntel + second: + enabled: 0 + settings: + CPU: None + - first: + : OSXIntel64 + second: + enabled: 0 + settings: + CPU: None + - first: + : Web + second: + enabled: 0 + settings: {} + - first: + : WebStreamed + second: + enabled: 0 + settings: {} + - first: + Android: Android + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + iPhone: iOS + second: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + - first: + tvOS: tvOS + second: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Editor/FirebaseAnalytics_version-11.3.0_manifest.txt b/nekoyume/Assets/Firebase/Editor/FirebaseAnalytics_version-11.3.0_manifest.txt new file mode 100755 index 00000000000..deda6bab553 --- /dev/null +++ b/nekoyume/Assets/Firebase/Editor/FirebaseAnalytics_version-11.3.0_manifest.txt @@ -0,0 +1,73 @@ +Assets/Editor Default Resources/Firebase/fb_analytics.png +Assets/Editor Default Resources/Firebase/fb_analytics_dark.png +Assets/Editor Default Resources/Firebase/fb_auth.png +Assets/Editor Default Resources/Firebase/fb_auth_dark.png +Assets/Editor Default Resources/Firebase/fb_cloud_messaging.png +Assets/Editor Default Resources/Firebase/fb_cloud_messaging_dark.png +Assets/Editor Default Resources/Firebase/fb_config.png +Assets/Editor Default Resources/Firebase/fb_config_dark.png +Assets/Editor Default Resources/Firebase/fb_crashlytics.png +Assets/Editor Default Resources/Firebase/fb_crashlytics_dark.png +Assets/Editor Default Resources/Firebase/fb_database.png +Assets/Editor Default Resources/Firebase/fb_database_dark.png +Assets/Editor Default Resources/Firebase/fb_dynamic_links.png +Assets/Editor Default Resources/Firebase/fb_dynamic_links_dark.png +Assets/Editor Default Resources/Firebase/fb_functions.png +Assets/Editor Default Resources/Firebase/fb_functions_dark.png +Assets/Editor Default Resources/Firebase/fb_invites.png +Assets/Editor Default Resources/Firebase/fb_invites_dark.png +Assets/Editor Default Resources/Firebase/fb_storage.png +Assets/Editor Default Resources/Firebase/fb_storage_dark.png +Assets/Editor Default Resources/Firebase/firebase_lockup.png +Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png +Assets/ExternalDependencyManager/Editor/1.2.176/Google.IOSResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.176/Google.IOSResolver.dll.mdb +Assets/ExternalDependencyManager/Editor/1.2.176/Google.JarResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.176/Google.JarResolver.dll.mdb +Assets/ExternalDependencyManager/Editor/1.2.176/Google.PackageManagerResolver.dll +Assets/ExternalDependencyManager/Editor/1.2.176/Google.PackageManagerResolver.dll.mdb +Assets/ExternalDependencyManager/Editor/1.2.176/Google.VersionHandlerImpl.dll +Assets/ExternalDependencyManager/Editor/1.2.176/Google.VersionHandlerImpl.dll.mdb +Assets/ExternalDependencyManager/Editor/CHANGELOG.md +Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll +Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb +Assets/ExternalDependencyManager/Editor/LICENSE +Assets/ExternalDependencyManager/Editor/README.md +Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.176_manifest.txt +Assets/Firebase/Editor/AnalyticsDependencies.xml +Assets/Firebase/Editor/AppDependencies.xml +Assets/Firebase/Editor/Firebase.Editor.dll +Assets/Firebase/Editor/Firebase.Editor.pdb +Assets/Firebase/Editor/generate_xml_from_google_services_json.exe +Assets/Firebase/Editor/generate_xml_from_google_services_json.py +Assets/Firebase/Editor/network_request.exe +Assets/Firebase/Editor/network_request.py +Assets/Firebase/Plugins/Firebase.Analytics.dll +Assets/Firebase/Plugins/Firebase.Analytics.pdb +Assets/Firebase/Plugins/Firebase.App.dll +Assets/Firebase/Plugins/Firebase.App.pdb +Assets/Firebase/Plugins/Firebase.Platform.dll +Assets/Firebase/Plugins/Firebase.Platform.pdb +Assets/Firebase/Plugins/Firebase.TaskExtension.dll +Assets/Firebase/Plugins/Firebase.TaskExtension.pdb +Assets/Firebase/Plugins/Google.MiniJson.dll +Assets/Firebase/Plugins/iOS/Firebase.Analytics.dll +Assets/Firebase/Plugins/iOS/Firebase.Analytics.pdb +Assets/Firebase/Plugins/iOS/Firebase.App.dll +Assets/Firebase/Plugins/iOS/Firebase.App.pdb +Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.bundle +Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.dll +Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.so +Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.bundle +Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.dll +Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.so +Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/11.3.0/firebase-analytics-unity-11.3.0.pom +Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/11.3.0/firebase-analytics-unity-11.3.0.srcaar +Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/maven-metadata.xml +Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/11.3.0/firebase-app-unity-11.3.0.pom +Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/11.3.0/firebase-app-unity-11.3.0.srcaar +Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml +Assets/Plugins/iOS/Firebase/libFirebaseCppAnalytics.a +Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a +Assets/Plugins/tvOS/Firebase/libFirebaseCppAnalytics.a +Assets/Plugins/tvOS/Firebase/libFirebaseCppApp.a diff --git a/nekoyume/Assets/Firebase/Editor/FirebaseAnalytics_version-11.3.0_manifest.txt.meta b/nekoyume/Assets/Firebase/Editor/FirebaseAnalytics_version-11.3.0_manifest.txt.meta new file mode 100644 index 00000000000..3b9588f3737 --- /dev/null +++ b/nekoyume/Assets/Firebase/Editor/FirebaseAnalytics_version-11.3.0_manifest.txt.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e0b45abaf6e2429ba75f431412c7bfa1 +labels: +- gvh +- gvh_manifest +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/Editor/FirebaseAnalytics_version-11.3.0_manifest.txt +- gvhp_manifestname-0Google Analytics +- gvhp_manifestname-1FirebaseAnalytics +timeCreated: 0 diff --git a/nekoyume/Assets/Firebase/Editor/generate_xml_from_google_services_json.exe b/nekoyume/Assets/Firebase/Editor/generate_xml_from_google_services_json.exe new file mode 100755 index 00000000000..2d31b042985 Binary files /dev/null and b/nekoyume/Assets/Firebase/Editor/generate_xml_from_google_services_json.exe differ diff --git a/nekoyume/Assets/Firebase/Editor/generate_xml_from_google_services_json.exe.meta b/nekoyume/Assets/Firebase/Editor/generate_xml_from_google_services_json.exe.meta new file mode 100644 index 00000000000..1f11b863d93 --- /dev/null +++ b/nekoyume/Assets/Firebase/Editor/generate_xml_from_google_services_json.exe.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ae88c0972b7448b5b36def1716f1d711 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/Editor/generate_xml_from_google_services_json.exe +timeCreated: 1480838400 +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Editor/generate_xml_from_google_services_json.py b/nekoyume/Assets/Firebase/Editor/generate_xml_from_google_services_json.py new file mode 100755 index 00000000000..789dcebeb16 --- /dev/null +++ b/nekoyume/Assets/Firebase/Editor/generate_xml_from_google_services_json.py @@ -0,0 +1,498 @@ +#!/usr/bin/python + +# Copyright 2016 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Stand-alone implementation of the Gradle Firebase plugin. + +Converts the services json file to xml: +https://googleplex-android.googlesource.com/platform/tools/base/+/studio-master-dev/build-system/google-services/src/main/groovy/com/google/gms/googleservices +""" + +__author__ = 'Wouter van Oortmerssen' + +import argparse +import ctypes +import json +import os +import platform +import sys +from xml.etree import ElementTree + +if platform.system().lower() == 'windows': + import ctypes.wintypes # pylint: disable=g-import-not-at-top + +# Map Python 2's unicode method to encode a string as bytes in python 3. +try: + unicode('') # See whether unicode class is available (Python < 3) +except NameError: + unicode = str # pylint: disable=redefined-builtin,invalid-name + +# Input filename if it isn't set. +DEFAULT_INPUT_FILENAME = 'app/google-services.json' +# Output filename if it isn't set. +DEFAULT_OUTPUT_FILENAME = 'res/values/googleservices.xml' +# Input filename for .plist files, if it isn't set. +DEFAULT_PLIST_INPUT_FILENAME = 'GoogleService-Info.plist' +# Output filename for .json files, if it isn't set. +DEFAULT_JSON_OUTPUT_FILENAME = 'google-services-desktop.json' + +OAUTH_CLIENT_TYPE_ANDROID_APP = 1 +OAUTH_CLIENT_TYPE_WEB = 3 + + +def read_xml_value(xml_node): + """Utility method for reading values from the plist XML. + + Args: + xml_node: An ElementTree node, that contains a value. + + Returns: + The value of the node, or None, if it could not be read. + """ + if xml_node.tag == 'string': + return xml_node.text + elif xml_node.tag == 'integer': + return int(xml_node.text) + elif xml_node.tag == 'real': + return float(xml_node.text) + elif xml_node.tag == 'false': + return 0 + elif xml_node.tag == 'true': + return 1 + else: + # other types of input are ignored. (data, dates, arrays, etc.) + return None + + +def construct_plist_dictionary(xml_root): + """Constructs a dictionary of values based on the contents of a plist file. + + Args: + xml_root: An ElementTree node, that represents the root of the xml file + that is to be parsed. (Which should be a dictionary containing + key-value pairs of the properties that need to be extracted.) + + Returns: + A dictionary, containing key-value pairs for all (supported) entries in the + node. + """ + xml_dict = xml_root.find('dict') + + if xml_dict is None: + return None + + plist_dict = {} + i = 0 + while i < len(xml_dict): + if xml_dict[i].tag == 'key': + key = xml_dict[i].text + i += 1 + if i < len(xml_dict): + value = read_xml_value(xml_dict[i]) + if value is not None: + plist_dict[key] = value + i += 1 + + return plist_dict + + +def update_dict_keys(key_map, input_dict): + """Creates a dict from input_dict with the same values but new keys. + + Two dictionaries are passed to this function: the key_map that represents a + mapping of source keys to destination keys, and the input_dict that is the + dictionary that is to be duplicated, replacing any key that matches a source + key with a destination key. Source keys that are not present in the + input_dict will not have their destination key represented in the result. + + In other words, if key_map is `{'old': 'new', 'foo': 'bar'}`, and input_dict + is `{'old': 10}`, the result will be `{'new': 10}`. + + Args: + key_map (dict): A dictionary of strings to strings that maps source keys to + destination keys. + input_dict (dict): The dictionary of string keys to any value type, which + is to be duplicated, replacing source keys with the corresponding + destination keys from key_map. + + Returns: + dict: A new dictionary with updated keys. + """ + return { + new_key: input_dict[old_key] + for (old_key, new_key) in key_map.items() + if old_key in input_dict + } + + +def construct_google_services_json(xml_dict): + """Constructs a google services json file from a dictionary. + + Args: + xml_dict: A dictionary of all the key/value pairs that are needed for the + output json file. + Returns: + A string representing the output json file. + """ + + try: + json_struct = { + 'project_info': + update_dict_keys( + { + 'GCM_SENDER_ID': 'project_number', + 'DATABASE_URL': 'firebase_url', + 'PROJECT_ID': 'project_id', + 'STORAGE_BUCKET': 'storage_bucket' + }, xml_dict), + 'client': [{ + 'client_info': { + 'mobilesdk_app_id': xml_dict['GOOGLE_APP_ID'], + 'android_client_info': { + 'package_name': xml_dict['BUNDLE_ID'] + } + }, + 'api_key': [{ + 'current_key': xml_dict['API_KEY'] + }], + 'services': { + 'analytics_service': { + 'status': xml_dict['IS_ANALYTICS_ENABLED'] + }, + 'appinvite_service': { + 'status': xml_dict['IS_APPINVITE_ENABLED'] + } + } + },], + 'configuration_version': + '1' + } + # OAuth client is optional, but include it if present. + if 'CLIENT_ID' in xml_dict: + json_struct['client'][0]['oauth_client'] = [{ + 'client_id': xml_dict['CLIENT_ID'], + }] + return json.dumps(json_struct, indent=2) + except KeyError as e: + sys.stderr.write('Could not find key in plist file: [%s]\n' % (e.args[0])) + return None + + +def convert_plist_to_json(plist_string, input_filename): + """Converts an input plist string into a .json file and saves it. + + Args: + plist_string: The contents of the loaded plist file. + + input_filename: The file name that the plist data was read from. + Returns: + the converted string, or None if there were errors. + """ + + try: + root = ElementTree.fromstring(plist_string) + except ElementTree.ParseError: + sys.stderr.write('Error parsing file %s.\n' + 'It does not appear to be valid XML.\n' % (input_filename)) + return None + + plist_dict = construct_plist_dictionary(root) + if plist_dict is None: + sys.stderr.write('In file %s, could not locate a top-level \'dict\' ' + 'element.\n' + 'File format should be plist XML, with a top-level ' + 'dictionary containing project settings as key-value ' + 'pairs.\n' % (input_filename)) + return None + + json_string = construct_google_services_json(plist_dict) + return json_string + + +def gen_string(parent, name, text): + """Generate one element and put into the list of keeps. + + Args: + parent: The object that will hold the string. + name: The name to store the string under. + text: The text of the string. + """ + if text: + prev = parent.get('tools:keep', '') + if prev: + prev += ',' + parent.set('tools:keep', prev + '@string/' + name) + child = ElementTree.SubElement(parent, 'string', { + 'name': name, + 'translatable': 'false' + }) + child.text = text + + +def indent(elem, level=0): + """Recurse through XML tree and add indentation. + + Args: + elem: The element to recurse over + level: The current indentation level. + """ + i = '\n' + level*' ' + if elem is not None: + if not elem.text or not elem.text.strip(): + elem.text = i + ' ' + if not elem.tail or not elem.tail.strip(): + elem.tail = i + for elem in elem: + indent(elem, level+1) + if not elem.tail or not elem.tail.strip(): + elem.tail = i + else: + if level and (not elem.tail or not elem.tail.strip()): + elem.tail = i + + +def argv_as_unicode_win32(): + """Returns unicode command line arguments on windows. + """ + + get_command_line_w = ctypes.cdll.kernel32.GetCommandLineW + get_command_line_w.restype = ctypes.wintypes.LPCWSTR + + # CommandLineToArgvW parses the Unicode command line + command_line_to_argv_w = ctypes.windll.shell32.CommandLineToArgvW + command_line_to_argv_w.argtypes = [ + ctypes.wintypes.LPCWSTR, + ctypes.POINTER(ctypes.c_int) + ] + command_line_to_argv_w.restype = ctypes.POINTER( + ctypes.wintypes.LPWSTR) + + argc = ctypes.c_int(0) + argv = command_line_to_argv_w(get_command_line_w(), argc) + + # Strip the python executable from the arguments if it exists + # (It would be listed as the first argument on the windows command line, but + # not in the arguments to the python script) + sys_argv_len = len(sys.argv) + return [unicode(argv[i]) for i in + range(argc.value - sys_argv_len, argc.value)] + + +def main(): + parser = argparse.ArgumentParser( + description=(( + 'Converts a Firebase %s into %s similar to the Gradle plugin, or ' + 'converts a Firebase %s into a %s suitible for use on desktop apps.' % + (DEFAULT_INPUT_FILENAME, DEFAULT_OUTPUT_FILENAME, + DEFAULT_PLIST_INPUT_FILENAME, DEFAULT_JSON_OUTPUT_FILENAME)))) + parser.add_argument('-i', help='Override input file name', + metavar='FILE', required=False) + parser.add_argument('-o', help='Override destination file name', + metavar='FILE', required=False) + parser.add_argument('-p', help=('Package ID to select within the set of ' + 'packages in the input file. If this is ' + 'not specified, the first package in the ' + 'input file is selected.')) + parser.add_argument('-l', help=('List all package IDs referenced by the ' + 'input file. If this is specified, ' + 'the output file is not created.'), + action='store_true', default=False, required=False) + parser.add_argument('-f', help=('Print project fields from the input file ' + 'in the form \'name=value\\n\' for each ' + 'field. If this is specified, the output ' + 'is not created.'), + action='store_true', default=False, required=False) + parser.add_argument( + '--plist', + help=( + 'Specifies a plist file to convert to a JSON configuration file. ' + 'If this is enabled, the script will expect a .plist file as input, ' + 'which it will convert into %s file. The output file is ' + '*not* suitable for use with Firebase on Android.' % + (DEFAULT_JSON_OUTPUT_FILENAME)), + action='store_true', + default=False, + required=False) + + # python 2 on Windows doesn't handle unicode arguments well, so we need to + # pre-process the command line arguments before trying to parse them. + if platform.system() == 'Windows': + sys.argv = argv_as_unicode_win32() + + args = parser.parse_args() + + if args.plist: + input_filename = DEFAULT_PLIST_INPUT_FILENAME + output_filename = DEFAULT_JSON_OUTPUT_FILENAME + else: + input_filename = DEFAULT_INPUT_FILENAME + output_filename = DEFAULT_OUTPUT_FILENAME + + if args.i: + # Encode the input string (type unicode) as a normal string (type str) + # using the 'utf-8' encoding so that it can be worked with the same as + # input names from other sources (like the defaults). + input_filename_raw = args.i.encode('utf-8') + # Decode the filename to a unicode string using the 'utf-8' encoding to + # properly handle filepaths with unicode characters in them. + input_filename = input_filename_raw.decode('utf-8') + + if args.o: + output_filename = args.o + + with open(input_filename, 'r') as ifile: + file_string = ifile.read() + + json_string = None + if args.plist: + json_string = convert_plist_to_json(file_string, input_filename) + if json_string is None: + return 1 + jsobj = json.loads(json_string) + else: + jsobj = json.loads(file_string) + + root = ElementTree.Element('resources') + root.set('xmlns:tools', 'http://schemas.android.com/tools') + + project_info = jsobj.get('project_info') + if project_info: + gen_string(root, 'firebase_database_url', project_info.get('firebase_url')) + gen_string(root, 'gcm_defaultSenderId', project_info.get('project_number')) + gen_string(root, 'google_storage_bucket', + project_info.get('storage_bucket')) + gen_string(root, 'project_id', project_info.get('project_id')) + + if args.f: + if not project_info: + sys.stderr.write('No project info found in %s.' % input_filename) + return 1 + for field, value in sorted(project_info.items()): + sys.stdout.write('%s=%s\n' % (field, value)) + return 0 + + packages = set() + client_list = jsobj.get('client') + if client_list: + # Search for the user specified package in the file. + selected_package_name = '' + selected_client = client_list[0] + find_package_name = args.p + for client in client_list: + package_name = client.get('client_info', {}).get( + 'android_client_info', {}).get('package_name', '') + if not package_name: + package_name = client.get('oauth_client', {}).get( + 'android_info', {}).get('package_name', '') + if package_name: + if not selected_package_name: + selected_package_name = package_name + selected_client = client + if package_name == find_package_name: + selected_package_name = package_name + selected_client = client + packages.add(package_name) + + if args.p and selected_package_name != find_package_name: + sys.stderr.write('No packages found in %s which match the package ' + 'name %s\n' + '\n' + 'Found the following:\n' + '%s\n' % (input_filename, find_package_name, + '\n'.join(packages))) + return 1 + + client_api_key = selected_client.get('api_key') + if client_api_key: + client_api_key0 = client_api_key[0] + gen_string(root, 'google_api_key', client_api_key0.get('current_key')) + gen_string(root, 'google_crash_reporting_api_key', + client_api_key0.get('current_key')) + + client_info = selected_client.get('client_info') + if client_info: + gen_string(root, 'google_app_id', client_info.get('mobilesdk_app_id')) + + # Only include the first matching OAuth client ID per type. + client_id_web_parsed = False + client_id_android_parsed = False + + oauth_client_list = selected_client.get('oauth_client') + if oauth_client_list: + for oauth_client in oauth_client_list: + client_type = oauth_client.get('client_type') + client_id = oauth_client.get('client_id') + if not (client_type and client_id): continue + if (client_type == OAUTH_CLIENT_TYPE_WEB and + not client_id_web_parsed): + gen_string(root, 'default_web_client_id', client_id) + client_id_web_parsed = True + if (client_type == OAUTH_CLIENT_TYPE_ANDROID_APP and + not client_id_android_parsed): + gen_string(root, 'default_android_client_id', client_id) + client_id_android_parsed = True + + services = selected_client.get('services') + if services: + ads_service = services.get('ads_service') + if ads_service: + gen_string(root, 'test_banner_ad_unit_id', + ads_service.get('test_banner_ad_unit_id')) + gen_string(root, 'test_interstitial_ad_unit_id', + ads_service.get('test_interstitial_ad_unit_id')) + analytics_service = services.get('analytics_service') + if analytics_service: + analytics_property = analytics_service.get('analytics_property') + if analytics_property: + gen_string(root, 'ga_trackingId', + analytics_property.get('tracking_id')) + # enable this once we have an example if this service being present + # in the json data: + maps_service_enabled = False + if maps_service_enabled: + maps_service = services.get('maps_service') + if maps_service: + maps_api_key = maps_service.get('api_key') + if maps_api_key: + for k in range(0, len(maps_api_key)): + # generates potentially multiple of these keys, which is + # the same behavior as the java plugin. + gen_string(root, 'google_maps_key', + maps_api_key[k].get('maps_api_key')) + + tree = ElementTree.ElementTree(root) + + indent(root) + + if args.l: + for package in sorted(packages): + if package: + sys.stdout.write(package + '\n') + else: + path = os.path.dirname(output_filename) + + if path and not os.path.exists(path): + os.makedirs(path) + + if not args.plist: + tree.write(output_filename, 'utf-8', True) + else: + with open(output_filename, 'w') as ofile: + ofile.write(json_string) + + return 0 + +if __name__ == '__main__': + sys.exit(main()) diff --git a/nekoyume/Assets/Firebase/Editor/generate_xml_from_google_services_json.py.meta b/nekoyume/Assets/Firebase/Editor/generate_xml_from_google_services_json.py.meta new file mode 100644 index 00000000000..40f9291edf5 --- /dev/null +++ b/nekoyume/Assets/Firebase/Editor/generate_xml_from_google_services_json.py.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8f18ed76c0f04ce0a65736104f913ef8 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/Editor/generate_xml_from_google_services_json.py +timeCreated: 1480838400 +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Editor/network_request.exe b/nekoyume/Assets/Firebase/Editor/network_request.exe new file mode 100755 index 00000000000..30f5e8efc33 Binary files /dev/null and b/nekoyume/Assets/Firebase/Editor/network_request.exe differ diff --git a/nekoyume/Assets/Firebase/Editor/network_request.exe.meta b/nekoyume/Assets/Firebase/Editor/network_request.exe.meta new file mode 100644 index 00000000000..1290bbd0b11 --- /dev/null +++ b/nekoyume/Assets/Firebase/Editor/network_request.exe.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d3cd5d0a941c4cdc8ab4b1b684b05191 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/Editor/network_request.exe +timeCreated: 1480838400 +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Editor/network_request.py b/nekoyume/Assets/Firebase/Editor/network_request.py new file mode 100755 index 00000000000..04f055f485e --- /dev/null +++ b/nekoyume/Assets/Firebase/Editor/network_request.py @@ -0,0 +1,416 @@ +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +"""Wrapper script which makes a network request. + +Basic Usage: network_request.py post + --url + --header
(optional, support multiple) + --body (optional) + --timeout (optional) + --verbose (optional) +""" + +import argparse +import inspect +import logging +import socket +import sys + +# pylint: disable=g-import-not-at-top +# pylint: disable=g-importing-member +try: + from six.moves.http_client import HTTPSConnection + from six.moves.http_client import HTTPConnection + from six.moves.http_client import HTTPException +except ImportError: + from http.client import HTTPSConnection + from http.client import HTTPConnection + from http.client import HTTPException + +try: + from six.moves.urllib.parse import urlparse +except ImportError: + from urllib.parse import urlparse +# pylint: enable=g-import-not-at-top +# pylint: enable=g-importing-member + +# Set up logger as soon as possible +formatter = logging.Formatter('[%(levelname)s] %(message)s') + +handler = logging.StreamHandler(stream=sys.stdout) +handler.setFormatter(formatter) +handler.setLevel(logging.INFO) + +logger = logging.getLogger(__name__) +logger.addHandler(handler) +logger.setLevel(logging.INFO) + +# Custom exit codes for known issues. +# System exit codes in python are valid from 0 - 256, so we will map some common +# ones here to understand successes and failures. +# Uses lower ints to not collide w/ HTTP status codes that the script may return +EXIT_CODE_SUCCESS = 0 +EXIT_CODE_SYS_ERROR = 1 +EXIT_CODE_INVALID_REQUEST_VALUES = 2 +EXIT_CODE_GENERIC_HTTPLIB_ERROR = 3 +EXIT_CODE_HTTP_TIMEOUT = 4 +EXIT_CODE_HTTP_REDIRECT_ERROR = 5 +EXIT_CODE_HTTP_NOT_FOUND_ERROR = 6 +EXIT_CODE_HTTP_SERVER_ERROR = 7 +EXIT_CODE_HTTP_UNKNOWN_ERROR = 8 + +MAX_EXIT_CODE = 8 + +# All used http verbs +POST = 'POST' + + +def unwrap_kwarg_namespace(func): + """Transform a Namespace object from argparse into proper args and kwargs. + + For a function that will be delegated to from argparse, inspect all of the + argments and extract them from the Namespace object. + + Args: + func: the function that we are wrapping to modify behavior + + Returns: + a new function that unwraps all of the arguments in a namespace and then + delegates to the passed function with those args. + """ + # When we move to python 3, getfullargspec so that we can tell the + # difference between args and kwargs -- then this could be used for functions + # that have both args and kwargs + if 'getfullargspec' in dir(inspect): + argspec = inspect.getfullargspec(func) + else: + argspec = inspect.getargspec(func) # Python 2 compatibility. + + def wrapped(argparse_namespace=None, **kwargs): + """Take a Namespace object and map it to kwargs. + + Inspect the argspec of the passed function. Loop over all the args that + are present in the function and try to map them by name to arguments in the + namespace. For keyword arguments, we do not require that they be present + in the Namespace. + + Args: + argparse_namespace: an arparse.Namespace object, the result of calling + argparse.ArgumentParser().parse_args() + **kwargs: keyword arguments that may be passed to the original function + Returns: + The return of the wrapped function from the parent. + + Raises: + ValueError in the event that an argument is passed to the cli that is not + in the set of named kwargs + """ + if not argparse_namespace: + return func(**kwargs) + + reserved_namespace_keywords = ['func'] + new_kwargs = {} + + args = argspec.args or [] + for arg_name in args: + passed_value = getattr(argparse_namespace, arg_name, None) + if passed_value is not None: + new_kwargs[arg_name] = passed_value + + for namespace_key in vars(argparse_namespace).keys(): + # ignore namespace keywords that have been set not passed in via cli + if namespace_key in reserved_namespace_keywords: + continue + + # make sure that we haven't passed something we should be processing + if namespace_key not in args: + raise ValueError('CLI argument "{}" does not match any argument in ' + 'function {}'.format(namespace_key, func.__name__)) + + return func(**new_kwargs) + + wrapped.__name__ = func.__name__ + return wrapped + + +class NetworkRequest(object): + """A container for an network request object. + + This class holds on to all of the attributes necessary for making a + network request via httplib. + """ + + def __init__(self, url, method, headers, body, timeout): + self.url = url.lower() + self.parsed_url = urlparse(self.url) + self.method = method + self.headers = headers + self.body = body + self.timeout = timeout + self.is_secure_connection = self.is_secure_connection() + + def execute_request(self): + """"Execute the request, and get a response. + + Returns: + an HttpResponse object from httplib + """ + if self.is_secure_connection: + conn = HTTPSConnection(self.get_hostname(), timeout=self.timeout) + else: + conn = HTTPConnection(self.get_hostname(), timeout=self.timeout) + + conn.request(self.method, self.url, self.body, self.headers) + response = conn.getresponse() + return response + + def get_hostname(self): + """Return the hostname for the url.""" + return self.parsed_url.netloc + + def is_secure_connection(self): + """Checks for a secure connection of https. + + Returns: + True if the scheme is "https"; False if "http" + + Raises: + ValueError when the scheme does not match http or https + """ + scheme = self.parsed_url.scheme + + if scheme == 'http': + return False + elif scheme == 'https': + return True + else: + raise ValueError('The url scheme is not "http" nor "https"' + ': {}'.format(scheme)) + + +def parse_colon_delimited_options(option_args): + """Parses a key value from a string. + + Args: + option_args: Key value string delimited by a color, ex: ("key:value") + + Returns: + Return an array with the key as the first element and value as the second + + Raises: + ValueError: If the key value option is not formatted correctly + """ + options = {} + + if not option_args: + return options + + for single_arg in option_args: + values = single_arg.split(':') + if len(values) != 2: + raise ValueError('An option arg must be a single key/value pair ' + 'delimited by a colon - ex: "thing_key:thing_value"') + + key = values[0].strip() + value = values[1].strip() + options[key] = value + + return options + + +def make_request(request): + """Makes a synchronous network request and return the HTTP status code. + + Args: + request: a well formulated request object + + Returns: + The HTTP status code of the network request. + '1' maps to invalid request headers. + """ + + logger.info('Sending network request -') + logger.info('\tUrl: %s', request.url) + logger.debug('\tMethod: %s', request.method) + logger.debug('\tHeaders: %s', request.headers) + logger.debug('\tBody: %s', request.body) + + try: + response = request.execute_request() + except socket.timeout: + logger.exception( + 'Timed out post request to %s in %d seconds for request body: %s', + request.url, request.timeout, request.body) + return EXIT_CODE_HTTP_TIMEOUT + except (HTTPException, socket.error): + logger.exception( + 'Encountered generic exception in posting to %s with request body %s', + request.url, request.body) + return EXIT_CODE_GENERIC_HTTPLIB_ERROR + + status = response.status + headers = response.getheaders() + logger.info('Received Network response -') + logger.info('\tStatus code: %d', status) + logger.debug('\tResponse headers: %s', headers) + + if status < 200 or status > 299: + logger.error('Request (%s) failed with status code %d\n', request.url, + status) + + # If we wanted this script to support get, we need to + # figure out what mechanism we intend for capturing the response + return status + + +@unwrap_kwarg_namespace +def post(url=None, header=None, body=None, timeout=5, verbose=False): + """Sends a post request. + + Args: + url: The url of the request + header: A list of headers for the request + body: The body for the request + timeout: Timeout in seconds for the request + verbose: Should debug logs be displayed + + Returns: + Return an array with the key as the first element and value as the second + """ + + if verbose: + handler.setLevel(logging.DEBUG) + logger.setLevel(logging.DEBUG) + + try: + logger.info('Parsing headers: %s', header) + headers = parse_colon_delimited_options(header) + except ValueError: + logging.exception('Could not parse the parameters with "--header": %s', + header) + return EXIT_CODE_INVALID_REQUEST_VALUES + + try: + request = NetworkRequest(url, POST, headers, body, float(timeout)) + except ValueError: + logger.exception('Invalid request values passed into the script.') + return EXIT_CODE_INVALID_REQUEST_VALUES + + status = make_request(request) + + # View exit code after running to get the http status code: 'echo $?' + return status + + +def get_argsparser(): + """Returns the argument parser. + + Returns: + Argument parser for the script. + """ + + parser = argparse.ArgumentParser( + description='The script takes in the arguments of a network request. ' + 'The network request is sent and the http status code will be' + 'returned as the exit code.') + subparsers = parser.add_subparsers(help='Commands:') + post_parser = subparsers.add_parser( + post.__name__, help='{} help'.format(post.__name__)) + post_parser.add_argument( + '--url', + help='Request url. Ex: https://www.google.com/somePath/', + required=True, + dest='url') + post_parser.add_argument( + '--header', + help='Request headers as a space delimited list of key ' + 'value pairs. Ex: "key1:value1 key2:value2"', + action='append', + required=False, + dest='header') + post_parser.add_argument( + '--body', + help='The body of the network request', + required=True, + dest='body') + post_parser.add_argument( + '--timeout', + help='The timeout in seconds', + default=10.0, + required=False, + dest='timeout') + post_parser.add_argument( + '--verbose', + help='Should verbose logging be outputted', + action='store_true', + default=False, + required=False, + dest='verbose') + post_parser.set_defaults(func=post) + return parser + + +def map_http_status_to_exit_code(status_code): + """Map an http status code to the appropriate exit code. + + Exit codes in python are valid from 0-256, so we want to map these to + predictable exit codes within range. + + Args: + status_code: the input status code that was output from the network call + function + + Returns: + One of our valid exit codes declared at the top of the file or a generic + unknown error code + """ + if status_code <= MAX_EXIT_CODE: + return status_code + + if status_code > 199 and status_code < 300: + return EXIT_CODE_SUCCESS + + if status_code == 302: + return EXIT_CODE_HTTP_REDIRECT_ERROR + + if status_code == 404: + return EXIT_CODE_HTTP_NOT_FOUND_ERROR + + if status_code > 499: + return EXIT_CODE_HTTP_SERVER_ERROR + + return EXIT_CODE_HTTP_UNKNOWN_ERROR + + +def main(): + """Main function to run the program. + + Parse system arguments and delegate to the appropriate function. + + Returns: + A status code - either an http status code or a custom error code + """ + parser = get_argsparser() + subparser_action = parser.parse_args() + try: + return subparser_action.func(subparser_action) + except ValueError: + logger.exception('Invalid arguments passed.') + parser.print_help(sys.stderr) + return EXIT_CODE_INVALID_REQUEST_VALUES + return EXIT_CODE_GENERIC_HTTPLIB_ERROR + +if __name__ == '__main__': + exit_code = map_http_status_to_exit_code(main()) + sys.exit(exit_code) diff --git a/nekoyume/Assets/Firebase/Editor/network_request.py.meta b/nekoyume/Assets/Firebase/Editor/network_request.py.meta new file mode 100644 index 00000000000..a9a47951698 --- /dev/null +++ b/nekoyume/Assets/Firebase/Editor/network_request.py.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e6e32fecbfd44fab946fa160e4861924 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/Editor/network_request.py +timeCreated: 1480838400 +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Plugins.meta b/nekoyume/Assets/Firebase/Plugins.meta new file mode 100644 index 00000000000..f520bc9d971 --- /dev/null +++ b/nekoyume/Assets/Firebase/Plugins.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5942e23767b8549d6939be1a229f254e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Plugins/Firebase.Analytics.dll b/nekoyume/Assets/Firebase/Plugins/Firebase.Analytics.dll new file mode 100755 index 00000000000..465a0264405 Binary files /dev/null and b/nekoyume/Assets/Firebase/Plugins/Firebase.Analytics.dll differ diff --git a/nekoyume/Assets/Firebase/Plugins/Firebase.Analytics.dll.meta b/nekoyume/Assets/Firebase/Plugins/Firebase.Analytics.dll.meta new file mode 100644 index 00000000000..519b4013081 --- /dev/null +++ b/nekoyume/Assets/Firebase/Plugins/Firebase.Analytics.dll.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: 816270c2a2a348e59cb9b7b096a24f50 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/Plugins/Firebase.Analytics.dll +timeCreated: 1480838400 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 1 + settings: + CPU: AnyCPU + Any: + enabled: 0 + settings: {} + Editor: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: + enabled: 1 + settings: + CPU: x86 + Linux64: + enabled: 1 + settings: + CPU: x86_64 + LinuxUniversal: + enabled: 1 + settings: + CPU: AnyCPU + OSXIntel: + enabled: 1 + settings: + CPU: x86 + OSXIntel64: + enabled: 1 + settings: + CPU: x86_64 + OSXUniversal: + enabled: 1 + settings: + CPU: AnyCPU + Web: + enabled: 0 + settings: {} + WebStreamed: + enabled: 0 + settings: {} + Win: + enabled: 1 + settings: + CPU: x86 + Win64: + enabled: 1 + settings: + CPU: x86_64 + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + iOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Plugins/Firebase.App.dll b/nekoyume/Assets/Firebase/Plugins/Firebase.App.dll new file mode 100755 index 00000000000..81cadbecb27 Binary files /dev/null and b/nekoyume/Assets/Firebase/Plugins/Firebase.App.dll differ diff --git a/nekoyume/Assets/Firebase/Plugins/Firebase.App.dll.meta b/nekoyume/Assets/Firebase/Plugins/Firebase.App.dll.meta new file mode 100644 index 00000000000..20b9b4cfad3 --- /dev/null +++ b/nekoyume/Assets/Firebase/Plugins/Firebase.App.dll.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: 7311924048bd457bac6d713576c952da +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/Plugins/Firebase.App.dll +timeCreated: 1480838400 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 1 + settings: + CPU: AnyCPU + Any: + enabled: 0 + settings: {} + Editor: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: + enabled: 1 + settings: + CPU: x86 + Linux64: + enabled: 1 + settings: + CPU: x86_64 + LinuxUniversal: + enabled: 1 + settings: + CPU: AnyCPU + OSXIntel: + enabled: 1 + settings: + CPU: x86 + OSXIntel64: + enabled: 1 + settings: + CPU: x86_64 + OSXUniversal: + enabled: 1 + settings: + CPU: AnyCPU + Web: + enabled: 0 + settings: {} + WebStreamed: + enabled: 0 + settings: {} + Win: + enabled: 1 + settings: + CPU: x86 + Win64: + enabled: 1 + settings: + CPU: x86_64 + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + iOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Plugins/Firebase.Platform.dll b/nekoyume/Assets/Firebase/Plugins/Firebase.Platform.dll new file mode 100755 index 00000000000..439862b462e Binary files /dev/null and b/nekoyume/Assets/Firebase/Plugins/Firebase.Platform.dll differ diff --git a/nekoyume/Assets/Firebase/Plugins/Firebase.Platform.dll.meta b/nekoyume/Assets/Firebase/Plugins/Firebase.Platform.dll.meta new file mode 100644 index 00000000000..55a34edaf2f --- /dev/null +++ b/nekoyume/Assets/Firebase/Plugins/Firebase.Platform.dll.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: 7d3eec03d7e241a48941e038118c5e6a +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/Plugins/Firebase.Platform.dll +timeCreated: 1480838400 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 1 + settings: + CPU: AnyCPU + Any: + enabled: 0 + settings: {} + Editor: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: + enabled: 1 + settings: + CPU: x86 + Linux64: + enabled: 1 + settings: + CPU: x86_64 + LinuxUniversal: + enabled: 1 + settings: + CPU: AnyCPU + OSXIntel: + enabled: 1 + settings: + CPU: x86 + OSXIntel64: + enabled: 1 + settings: + CPU: x86_64 + OSXUniversal: + enabled: 1 + settings: + CPU: AnyCPU + Web: + enabled: 0 + settings: {} + WebStreamed: + enabled: 0 + settings: {} + Win: + enabled: 1 + settings: + CPU: x86 + Win64: + enabled: 1 + settings: + CPU: x86_64 + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + iOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: + tvOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Plugins/Firebase.TaskExtension.dll b/nekoyume/Assets/Firebase/Plugins/Firebase.TaskExtension.dll new file mode 100755 index 00000000000..629acb6276d Binary files /dev/null and b/nekoyume/Assets/Firebase/Plugins/Firebase.TaskExtension.dll differ diff --git a/nekoyume/Assets/Firebase/Plugins/Firebase.TaskExtension.dll.meta b/nekoyume/Assets/Firebase/Plugins/Firebase.TaskExtension.dll.meta new file mode 100644 index 00000000000..7153f5385f9 --- /dev/null +++ b/nekoyume/Assets/Firebase/Plugins/Firebase.TaskExtension.dll.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: f5d4069c578548ba9f199b46d61bf06d +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/Plugins/Firebase.TaskExtension.dll +timeCreated: 1480838400 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 1 + settings: + CPU: AnyCPU + Any: + enabled: 0 + settings: {} + Editor: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: + enabled: 1 + settings: + CPU: x86 + Linux64: + enabled: 1 + settings: + CPU: x86_64 + LinuxUniversal: + enabled: 1 + settings: + CPU: AnyCPU + OSXIntel: + enabled: 1 + settings: + CPU: x86 + OSXIntel64: + enabled: 1 + settings: + CPU: x86_64 + OSXUniversal: + enabled: 1 + settings: + CPU: AnyCPU + Web: + enabled: 0 + settings: {} + WebStreamed: + enabled: 0 + settings: {} + Win: + enabled: 1 + settings: + CPU: x86 + Win64: + enabled: 1 + settings: + CPU: x86_64 + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + iOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: + tvOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Plugins/Google.MiniJson.dll b/nekoyume/Assets/Firebase/Plugins/Google.MiniJson.dll new file mode 100755 index 00000000000..8178667e711 Binary files /dev/null and b/nekoyume/Assets/Firebase/Plugins/Google.MiniJson.dll differ diff --git a/nekoyume/Assets/Firebase/Plugins/Google.MiniJson.dll.meta b/nekoyume/Assets/Firebase/Plugins/Google.MiniJson.dll.meta new file mode 100644 index 00000000000..1638d35e5d8 --- /dev/null +++ b/nekoyume/Assets/Firebase/Plugins/Google.MiniJson.dll.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: 3ebb289656f1477fa263e62d36c6e329 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/Plugins/Google.MiniJson.dll +timeCreated: 1480838400 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 1 + settings: + CPU: AnyCPU + Any: + enabled: 0 + settings: {} + Editor: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: + enabled: 1 + settings: + CPU: x86 + Linux64: + enabled: 1 + settings: + CPU: x86_64 + LinuxUniversal: + enabled: 1 + settings: + CPU: AnyCPU + OSXIntel: + enabled: 1 + settings: + CPU: x86 + OSXIntel64: + enabled: 1 + settings: + CPU: x86_64 + OSXUniversal: + enabled: 1 + settings: + CPU: AnyCPU + Web: + enabled: 0 + settings: {} + WebStreamed: + enabled: 0 + settings: {} + Win: + enabled: 1 + settings: + CPU: x86 + Win64: + enabled: 1 + settings: + CPU: x86_64 + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + iOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: + tvOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Plugins/iOS.meta b/nekoyume/Assets/Firebase/Plugins/iOS.meta new file mode 100644 index 00000000000..1738f855877 --- /dev/null +++ b/nekoyume/Assets/Firebase/Plugins/iOS.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d4b37d1fd7b547ed849e8df586bf95c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Plugins/iOS/Firebase.Analytics.dll b/nekoyume/Assets/Firebase/Plugins/iOS/Firebase.Analytics.dll new file mode 100755 index 00000000000..4263698ea7d Binary files /dev/null and b/nekoyume/Assets/Firebase/Plugins/iOS/Firebase.Analytics.dll differ diff --git a/nekoyume/Assets/Firebase/Plugins/iOS/Firebase.Analytics.dll.meta b/nekoyume/Assets/Firebase/Plugins/iOS/Firebase.Analytics.dll.meta new file mode 100644 index 00000000000..90bdae1240c --- /dev/null +++ b/nekoyume/Assets/Firebase/Plugins/iOS/Firebase.Analytics.dll.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: 52718a3a80d44aacb368bcc9d62dd804 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/Plugins/iOS/Firebase.Analytics.dll +timeCreated: 1480838400 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 0 + settings: + CPU: AnyCPU + Any: + enabled: 0 + settings: {} + Editor: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: + enabled: 0 + settings: + CPU: None + Linux64: + enabled: 0 + settings: + CPU: None + LinuxUniversal: + enabled: 0 + settings: + CPU: None + OSXIntel: + enabled: 0 + settings: + CPU: None + OSXIntel64: + enabled: 0 + settings: + CPU: None + OSXUniversal: + enabled: 0 + settings: + CPU: None + Web: + enabled: 0 + settings: {} + WebStreamed: + enabled: 0 + settings: {} + Win: + enabled: 0 + settings: + CPU: None + Win64: + enabled: 0 + settings: + CPU: None + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + iOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: + tvOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Plugins/iOS/Firebase.App.dll b/nekoyume/Assets/Firebase/Plugins/iOS/Firebase.App.dll new file mode 100755 index 00000000000..1236ce1d5a1 Binary files /dev/null and b/nekoyume/Assets/Firebase/Plugins/iOS/Firebase.App.dll differ diff --git a/nekoyume/Assets/Firebase/Plugins/iOS/Firebase.App.dll.meta b/nekoyume/Assets/Firebase/Plugins/iOS/Firebase.App.dll.meta new file mode 100644 index 00000000000..800cf73d7b3 --- /dev/null +++ b/nekoyume/Assets/Firebase/Plugins/iOS/Firebase.App.dll.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: 5f3feda1a91343759b7eb58a29b492b7 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/Plugins/iOS/Firebase.App.dll +timeCreated: 1480838400 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 0 + settings: + CPU: AnyCPU + Any: + enabled: 0 + settings: {} + Editor: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: + enabled: 0 + settings: + CPU: None + Linux64: + enabled: 0 + settings: + CPU: None + LinuxUniversal: + enabled: 0 + settings: + CPU: None + OSXIntel: + enabled: 0 + settings: + CPU: None + OSXIntel64: + enabled: 0 + settings: + CPU: None + OSXUniversal: + enabled: 0 + settings: + CPU: None + Web: + enabled: 0 + settings: {} + WebStreamed: + enabled: 0 + settings: {} + Win: + enabled: 0 + settings: + CPU: None + Win64: + enabled: 0 + settings: + CPU: None + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + iOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: + tvOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Plugins/x86_64.meta b/nekoyume/Assets/Firebase/Plugins/x86_64.meta new file mode 100644 index 00000000000..aabe2dcb4ca --- /dev/null +++ b/nekoyume/Assets/Firebase/Plugins/x86_64.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8fd78a85c65ae426fb2713c8bc18db54 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.bundle b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.bundle new file mode 100755 index 00000000000..930519d94db --- /dev/null +++ b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.bundle @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0d6afd4321f6c3cb4f256b25a855a56eee976a37d00b111f0f6131ce807beff +size 647128 diff --git a/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.bundle.meta b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.bundle.meta new file mode 100644 index 00000000000..0ac284b0298 --- /dev/null +++ b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.bundle.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: 35bfcced25264151bd76b628a1dfa989 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppAnalytics.bundle +timeCreated: 1480838400 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 0 + settings: + CPU: AnyCPU + Any: + enabled: 0 + settings: {} + Editor: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: + enabled: 0 + settings: + CPU: None + Linux64: + enabled: 0 + settings: + CPU: None + LinuxUniversal: + enabled: 0 + settings: + CPU: None + OSXIntel: + enabled: 0 + settings: + CPU: None + OSXIntel64: + enabled: 1 + settings: + CPU: x86_64 + OSXUniversal: + enabled: 1 + settings: + CPU: AnyCPU + Web: + enabled: 0 + settings: {} + WebStreamed: + enabled: 0 + settings: {} + Win: + enabled: 0 + settings: + CPU: None + Win64: + enabled: 0 + settings: + CPU: None + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + iOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.dll b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.dll new file mode 100755 index 00000000000..0fada9434be Binary files /dev/null and b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.dll differ diff --git a/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.dll.meta b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.dll.meta new file mode 100644 index 00000000000..cf318ebc978 --- /dev/null +++ b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.dll.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: c48626ae27ed478483ba85fd7c81c04b +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppAnalytics.dll +timeCreated: 1480838400 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 0 + settings: + CPU: AnyCPU + Any: + enabled: 0 + settings: {} + Editor: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: + enabled: 0 + settings: + CPU: None + Linux64: + enabled: 0 + settings: + CPU: None + LinuxUniversal: + enabled: 0 + settings: + CPU: None + OSXIntel: + enabled: 0 + settings: + CPU: None + OSXIntel64: + enabled: 0 + settings: + CPU: None + OSXUniversal: + enabled: 0 + settings: + CPU: None + Web: + enabled: 0 + settings: {} + WebStreamed: + enabled: 0 + settings: {} + Win: + enabled: 0 + settings: + CPU: None + Win64: + enabled: 1 + settings: + CPU: x86_64 + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + iOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.so b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.so new file mode 100755 index 00000000000..566b85136f3 --- /dev/null +++ b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:483abac1e377cc55966d7b5aa43a659c201164aed17041ad505167e2ff3bd2ff +size 282880 diff --git a/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.so.meta b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.so.meta new file mode 100644 index 00000000000..536058dae63 --- /dev/null +++ b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.so.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: 590090df30d142acba7e7be939fd2988 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppAnalytics.so +timeCreated: 1480838400 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 0 + settings: + CPU: AnyCPU + Any: + enabled: 0 + settings: {} + Editor: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: + enabled: 0 + settings: + CPU: None + Linux64: + enabled: 1 + settings: + CPU: x86_64 + LinuxUniversal: + enabled: 1 + settings: + CPU: AnyCPU + OSXIntel: + enabled: 0 + settings: + CPU: None + OSXIntel64: + enabled: 0 + settings: + CPU: None + OSXUniversal: + enabled: 0 + settings: + CPU: None + Web: + enabled: 0 + settings: {} + WebStreamed: + enabled: 0 + settings: {} + Win: + enabled: 0 + settings: + CPU: None + Win64: + enabled: 0 + settings: + CPU: None + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + iOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.bundle b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.bundle new file mode 100755 index 00000000000..080496865f3 --- /dev/null +++ b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.bundle @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f90592cf8e1300a832fbde2b04613c2a2683fcf4ac47143c571dce240e5ff48 +size 161609513 diff --git a/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.bundle.meta b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.bundle.meta new file mode 100644 index 00000000000..3a52fa04863 --- /dev/null +++ b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.bundle.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: 37083663cf844084acee4104bcb8d14a +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.bundle +timeCreated: 1480838400 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 0 + settings: + CPU: AnyCPU + Any: + enabled: 0 + settings: {} + Editor: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: + enabled: 0 + settings: + CPU: None + Linux64: + enabled: 0 + settings: + CPU: None + LinuxUniversal: + enabled: 0 + settings: + CPU: None + OSXIntel: + enabled: 0 + settings: + CPU: None + OSXIntel64: + enabled: 1 + settings: + CPU: x86_64 + OSXUniversal: + enabled: 1 + settings: + CPU: AnyCPU + Web: + enabled: 0 + settings: {} + WebStreamed: + enabled: 0 + settings: {} + Win: + enabled: 0 + settings: + CPU: None + Win64: + enabled: 0 + settings: + CPU: None + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + iOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.dll b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.dll new file mode 100755 index 00000000000..17bd299907b Binary files /dev/null and b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.dll differ diff --git a/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.dll.meta b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.dll.meta new file mode 100644 index 00000000000..5ba8abcbfeb --- /dev/null +++ b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.dll.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: 30564cad37354e87944803d35f88989a +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.dll +timeCreated: 1480838400 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 0 + settings: + CPU: AnyCPU + Any: + enabled: 0 + settings: {} + Editor: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: + enabled: 0 + settings: + CPU: None + Linux64: + enabled: 0 + settings: + CPU: None + LinuxUniversal: + enabled: 0 + settings: + CPU: None + OSXIntel: + enabled: 0 + settings: + CPU: None + OSXIntel64: + enabled: 0 + settings: + CPU: None + OSXUniversal: + enabled: 0 + settings: + CPU: None + Web: + enabled: 0 + settings: {} + WebStreamed: + enabled: 0 + settings: {} + Win: + enabled: 0 + settings: + CPU: None + Win64: + enabled: 1 + settings: + CPU: x86_64 + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + iOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.so b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.so new file mode 100755 index 00000000000..f6975e1b494 --- /dev/null +++ b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3e01fbef5749dba99fe0c5be94247dfe6f4f13577b05c4e89a69c8e00e466be +size 91616624 diff --git a/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.so.meta b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.so.meta new file mode 100644 index 00000000000..8b670aa57f6 --- /dev/null +++ b/nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.so.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: 12c3857942404285b2334e85e7600e62 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.so +timeCreated: 1480838400 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 0 + settings: + CPU: AnyCPU + Any: + enabled: 0 + settings: {} + Editor: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: + enabled: 0 + settings: + CPU: None + Linux64: + enabled: 1 + settings: + CPU: x86_64 + LinuxUniversal: + enabled: 1 + settings: + CPU: AnyCPU + OSXIntel: + enabled: 0 + settings: + CPU: None + OSXIntel64: + enabled: 0 + settings: + CPU: None + OSXUniversal: + enabled: 0 + settings: + CPU: None + Web: + enabled: 0 + settings: {} + WebStreamed: + enabled: 0 + settings: {} + Win: + enabled: 0 + settings: + CPU: None + Win64: + enabled: 0 + settings: + CPU: None + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + iOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + tvOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/m2repository.meta b/nekoyume/Assets/Firebase/m2repository.meta new file mode 100644 index 00000000000..40d859daf4d --- /dev/null +++ b/nekoyume/Assets/Firebase/m2repository.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dc49fc547b65a46ffa0420f8c3b5e129 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/m2repository/com.meta b/nekoyume/Assets/Firebase/m2repository/com.meta new file mode 100644 index 00000000000..48ba4adf4b8 --- /dev/null +++ b/nekoyume/Assets/Firebase/m2repository/com.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b9dd372398300427693cebf9a8b36845 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/m2repository/com/google.meta b/nekoyume/Assets/Firebase/m2repository/com/google.meta new file mode 100644 index 00000000000..f8912871878 --- /dev/null +++ b/nekoyume/Assets/Firebase/m2repository/com/google.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d6cb98b0cc47847d2a99213eecc77d02 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/m2repository/com/google/firebase.meta b/nekoyume/Assets/Firebase/m2repository/com/google/firebase.meta new file mode 100644 index 00000000000..b919d0b2b62 --- /dev/null +++ b/nekoyume/Assets/Firebase/m2repository/com/google/firebase.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 03292cbd4c26447ba927a81d7a313026 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity.meta b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity.meta new file mode 100644 index 00000000000..1e7d18f32e6 --- /dev/null +++ b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c17096f6b656c479fbc61dd46c4f0aa8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/11.3.0.meta b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/11.3.0.meta new file mode 100644 index 00000000000..221344529c6 --- /dev/null +++ b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/11.3.0.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 60cdb84b686744be2ab3e85ce8b79df8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/11.3.0/firebase-analytics-unity-11.3.0.pom b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/11.3.0/firebase-analytics-unity-11.3.0.pom new file mode 100755 index 00000000000..49d6945862f --- /dev/null +++ b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/11.3.0/firebase-analytics-unity-11.3.0.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + com.google.firebase + firebase-analytics-unity + 11.3.0 + srcaar + + \ No newline at end of file diff --git a/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/11.3.0/firebase-analytics-unity-11.3.0.pom.meta b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/11.3.0/firebase-analytics-unity-11.3.0.pom.meta new file mode 100644 index 00000000000..d705228bfd7 --- /dev/null +++ b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/11.3.0/firebase-analytics-unity-11.3.0.pom.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e467406dfe1c499fa5dd4918bd218b1b +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-analytics-unity/11.3.0/firebase-analytics-unity-11.3.0.pom +timeCreated: 1480838400 +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/11.3.0/firebase-analytics-unity-11.3.0.srcaar b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/11.3.0/firebase-analytics-unity-11.3.0.srcaar new file mode 100755 index 00000000000..7512003a5d0 Binary files /dev/null and b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/11.3.0/firebase-analytics-unity-11.3.0.srcaar differ diff --git a/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/11.3.0/firebase-analytics-unity-11.3.0.srcaar.meta b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/11.3.0/firebase-analytics-unity-11.3.0.srcaar.meta new file mode 100644 index 00000000000..d3149ed20b0 --- /dev/null +++ b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/11.3.0/firebase-analytics-unity-11.3.0.srcaar.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 77b3ea7062794701a7197815f9d2dc46 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-analytics-unity/11.3.0/firebase-analytics-unity-11.3.0.srcaar +timeCreated: 1480838400 +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/maven-metadata.xml b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/maven-metadata.xml new file mode 100755 index 00000000000..0aa1ea933bc --- /dev/null +++ b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/maven-metadata.xml @@ -0,0 +1,9 @@ + + com.google.firebase + firebase-analytics-unity + + 11.3.0 + 11.3.0 + + + diff --git a/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/maven-metadata.xml.meta b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/maven-metadata.xml.meta new file mode 100644 index 00000000000..978adfd2684 --- /dev/null +++ b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/maven-metadata.xml.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 291f81d8ae2745cf913a96d116f2e3f7 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-analytics-unity/maven-metadata.xml +timeCreated: 1480838400 +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity.meta b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity.meta new file mode 100644 index 00000000000..c7249dbc153 --- /dev/null +++ b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0145aa386f1ef4b06a3d27469982d7af +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/11.3.0.meta b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/11.3.0.meta new file mode 100644 index 00000000000..f7e82ad7921 --- /dev/null +++ b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/11.3.0.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5e31b9e82d38f42e4a5b2a550150f991 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/11.3.0/firebase-app-unity-11.3.0.pom b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/11.3.0/firebase-app-unity-11.3.0.pom new file mode 100755 index 00000000000..3e7558c8694 --- /dev/null +++ b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/11.3.0/firebase-app-unity-11.3.0.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + com.google.firebase + firebase-app-unity + 11.3.0 + srcaar + + \ No newline at end of file diff --git a/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/11.3.0/firebase-app-unity-11.3.0.pom.meta b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/11.3.0/firebase-app-unity-11.3.0.pom.meta new file mode 100644 index 00000000000..11a94af3a7c --- /dev/null +++ b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/11.3.0/firebase-app-unity-11.3.0.pom.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6fa00b2d4bcc49ddb521ef64a4adb22c +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-app-unity/11.3.0/firebase-app-unity-11.3.0.pom +timeCreated: 1480838400 +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/11.3.0/firebase-app-unity-11.3.0.srcaar b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/11.3.0/firebase-app-unity-11.3.0.srcaar new file mode 100755 index 00000000000..8a311d10014 Binary files /dev/null and b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/11.3.0/firebase-app-unity-11.3.0.srcaar differ diff --git a/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/11.3.0/firebase-app-unity-11.3.0.srcaar.meta b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/11.3.0/firebase-app-unity-11.3.0.srcaar.meta new file mode 100644 index 00000000000..7c1e182cebd --- /dev/null +++ b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/11.3.0/firebase-app-unity-11.3.0.srcaar.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c5dc5d8acfd64b79aabff8f27d913833 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-app-unity/11.3.0/firebase-app-unity-11.3.0.srcaar +timeCreated: 1480838400 +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml new file mode 100755 index 00000000000..eb7fb1f9240 --- /dev/null +++ b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml @@ -0,0 +1,9 @@ + + com.google.firebase + firebase-app-unity + + 11.3.0 + 11.3.0 + + + diff --git a/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml.meta b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml.meta new file mode 100644 index 00000000000..0d92b720b68 --- /dev/null +++ b/nekoyume/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 96337775a7c941d88ea15f8026ad6f8e +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml +timeCreated: 1480838400 +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/NineChronicles/GoogleServices.meta b/nekoyume/Assets/NineChronicles/GoogleServices.meta new file mode 100644 index 00000000000..586a25396a3 --- /dev/null +++ b/nekoyume/Assets/NineChronicles/GoogleServices.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d6038ac8800c24000af5cdcac4d857cb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/NineChronicles/GoogleServices/Firebase.meta b/nekoyume/Assets/NineChronicles/GoogleServices/Firebase.meta new file mode 100644 index 00000000000..0ca87bff74c --- /dev/null +++ b/nekoyume/Assets/NineChronicles/GoogleServices/Firebase.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: d7a7be23d19349639826267515e80ec4 +timeCreated: 1691049208 \ No newline at end of file diff --git a/nekoyume/Assets/NineChronicles/GoogleServices/Firebase/Runtime.meta b/nekoyume/Assets/NineChronicles/GoogleServices/Firebase/Runtime.meta new file mode 100644 index 00000000000..aa1708ea443 --- /dev/null +++ b/nekoyume/Assets/NineChronicles/GoogleServices/Firebase/Runtime.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7a425dde5373425a84661c67078bb467 +timeCreated: 1691049253 \ No newline at end of file diff --git a/nekoyume/Assets/NineChronicles/GoogleServices/Firebase/Runtime/FirebaseManager.asmdef b/nekoyume/Assets/NineChronicles/GoogleServices/Firebase/Runtime/FirebaseManager.asmdef new file mode 100644 index 00000000000..19e595c6a51 --- /dev/null +++ b/nekoyume/Assets/NineChronicles/GoogleServices/Firebase/Runtime/FirebaseManager.asmdef @@ -0,0 +1,16 @@ +{ + "name": "FirebaseManager", + "rootNamespace": "", + "references": [ + "GUID:f51ebe6a0ceec4240a699833d6309b23" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/nekoyume/Assets/NineChronicles/GoogleServices/Firebase/Runtime/FirebaseManager.asmdef.meta b/nekoyume/Assets/NineChronicles/GoogleServices/Firebase/Runtime/FirebaseManager.asmdef.meta new file mode 100644 index 00000000000..f363e833790 --- /dev/null +++ b/nekoyume/Assets/NineChronicles/GoogleServices/Firebase/Runtime/FirebaseManager.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9f261155ae25749798db4f4b1777332c +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/NineChronicles/GoogleServices/Firebase/Runtime/FirebaseManager.cs b/nekoyume/Assets/NineChronicles/GoogleServices/Firebase/Runtime/FirebaseManager.cs new file mode 100644 index 00000000000..ae82b80c701 --- /dev/null +++ b/nekoyume/Assets/NineChronicles/GoogleServices/Firebase/Runtime/FirebaseManager.cs @@ -0,0 +1,55 @@ +#if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IOS) +#nullable enable + +using System; +using Cysharp.Threading.Tasks; +using Firebase; +using Firebase.Analytics; +using UnityEngine; + +namespace NineChronicles.GoogleServices.Firebase.Runtime +{ + public static class FirebaseManager + { + private static readonly string NameTag = $"[{nameof(FirebaseManager)}]"; + + public static FirebaseApp? FirebaseAppInstance { get; private set; } + + public static bool IsAvailable => FirebaseAppInstance is not null; + + public static async UniTask InitializeAsync() + { + Debug.Log($"{NameTag}Initialize Firebase."); + var result = await FirebaseApp.CheckAndFixDependenciesAsync(); + if (result != DependencyStatus.Available) + { + var msg = $"{NameTag}Could not resolve all Firebase dependencies: {result}"; + Debug.LogError(msg); + FirebaseAppInstance = null; + return; + } + + FirebaseAppInstance = FirebaseApp.DefaultInstance; + InitializeAnalytics(); + Debug.Log($"{NameTag}Initialize Firebase done."); + } + + private static void InitializeAnalytics() + { + Debug.Log($"{NameTag}Initialize Firebase Analytics."); + Debug.Log($"{NameTag}Enabling data collection."); + FirebaseAnalytics.SetAnalyticsCollectionEnabled(true); + + // NOTE: Uncomment if we can obtain user email address. + // Debug.Log($"{NameTag}Initiate on-device conversion measurement."); + // FirebaseAnalytics.InitiateOnDeviceConversionMeasurementWithEmailAddress( + // "test@testemail.com"); + + // Set default session duration values. + Debug.Log($"{NameTag}Set session timeout to 30 minutes."); + FirebaseAnalytics.SetSessionTimeoutDuration(new TimeSpan(0, 30, 0)); + Debug.Log($"{NameTag}Initialize Firebase Analytics done."); + } + } +} +#endif diff --git a/nekoyume/Assets/NineChronicles/GoogleServices/Firebase/Runtime/FirebaseManager.cs.meta b/nekoyume/Assets/NineChronicles/GoogleServices/Firebase/Runtime/FirebaseManager.cs.meta new file mode 100644 index 00000000000..29d93d49b1a --- /dev/null +++ b/nekoyume/Assets/NineChronicles/GoogleServices/Firebase/Runtime/FirebaseManager.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: d9b44e66f82c4920b730ba07ba8716d0 +timeCreated: 1691049238 \ No newline at end of file diff --git a/nekoyume/Assets/NineChronicles/GoogleServices/google-services.json b/nekoyume/Assets/NineChronicles/GoogleServices/google-services.json new file mode 100644 index 00000000000..7d3e3384576 --- /dev/null +++ b/nekoyume/Assets/NineChronicles/GoogleServices/google-services.json @@ -0,0 +1,39 @@ +{ + "project_info": { + "project_number": "449111430622", + "project_id": "nine-chronicles-390701", + "storage_bucket": "nine-chronicles-390701.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:449111430622:android:585f8125b18665fb9ef94f", + "android_client_info": { + "package_name": "com.planetariumlabs.ninechroniclesmobile" + } + }, + "oauth_client": [ + { + "client_id": "449111430622-7ehqssk2i611nk9i5lan69lvokperpj4.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyAOqAU2hnZWMvWX_Dil7nzfps9JxEzf1Jg" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "449111430622-7ehqssk2i611nk9i5lan69lvokperpj4.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/nekoyume/Assets/NineChronicles/GoogleServices/google-services.json.meta b/nekoyume/Assets/NineChronicles/GoogleServices/google-services.json.meta new file mode 100644 index 00000000000..4063a41bb86 --- /dev/null +++ b/nekoyume/Assets/NineChronicles/GoogleServices/google-services.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0cc4589e5d6e24aad9d7b64bb9454d97 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib.meta b/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib.meta new file mode 100644 index 00000000000..4c3191e7c04 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 452cab10d2b064e64a1ef960df5df401 +folderAsset: yes +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/AndroidManifest.xml b/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/AndroidManifest.xml new file mode 100644 index 00000000000..fa692b984b7 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/AndroidManifest.xml @@ -0,0 +1,6 @@ + + + \ No newline at end of file diff --git a/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/AndroidManifest.xml.meta b/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/AndroidManifest.xml.meta new file mode 100644 index 00000000000..059e1982738 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/AndroidManifest.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ebbc0a8c96f974ecfb6616d963efe861 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/project.properties b/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/project.properties new file mode 100644 index 00000000000..37b95eded32 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/project.properties @@ -0,0 +1,2 @@ +target=android-9 +android.library=true \ No newline at end of file diff --git a/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/project.properties.meta b/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/project.properties.meta new file mode 100644 index 00000000000..c33c4ca4b00 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/project.properties.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 77bbe318e7ba84e86a9ed2c754cc0cc0 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/res.meta b/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/res.meta new file mode 100644 index 00000000000..0c0833db6dd --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/res.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 67d1860159b6a44f4948e20396d3d3d0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/res/values.meta b/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/res/values.meta new file mode 100644 index 00000000000..5d03b8555ca --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/res/values.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 05e92214ab9fc48488aa36bec8dea3f5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/res/values/google-services.xml b/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/res/values/google-services.xml new file mode 100644 index 00000000000..b2ecdcae3d7 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/res/values/google-services.xml @@ -0,0 +1,10 @@ + + + 449111430622 + nine-chronicles-390701.appspot.com + nine-chronicles-390701 + AIzaSyAOqAU2hnZWMvWX_Dil7nzfps9JxEzf1Jg + AIzaSyAOqAU2hnZWMvWX_Dil7nzfps9JxEzf1Jg + 1:449111430622:android:585f8125b18665fb9ef94f + 449111430622-7ehqssk2i611nk9i5lan69lvokperpj4.apps.googleusercontent.com + diff --git a/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/res/values/google-services.xml.meta b/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/res/values/google-services.xml.meta new file mode 100644 index 00000000000..829876021c6 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/FirebaseApp.androidlib/res/values/google-services.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4bd49bd2f99db423fbb2b2132599ffa3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.annotation.annotation-1.5.0.jar b/nekoyume/Assets/Plugins/Android/androidx.annotation.annotation-1.5.0.jar new file mode 100644 index 00000000000..8924208dd22 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.annotation.annotation-1.5.0.jar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.annotation.annotation-1.5.0.jar.meta b/nekoyume/Assets/Plugins/Android/androidx.annotation.annotation-1.5.0.jar.meta new file mode 100644 index 00000000000..d4c956c0427 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.annotation.annotation-1.5.0.jar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 2bd8dc874c67c4efba244ba6804b5c89 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.arch.core.core-common-2.0.0.jar b/nekoyume/Assets/Plugins/Android/androidx.arch.core.core-common-2.0.0.jar new file mode 100644 index 00000000000..98ec8865a3c Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.arch.core.core-common-2.0.0.jar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.arch.core.core-common-2.0.0.jar.meta b/nekoyume/Assets/Plugins/Android/androidx.arch.core.core-common-2.0.0.jar.meta new file mode 100644 index 00000000000..86adb1893eb --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.arch.core.core-common-2.0.0.jar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: d233114f1fccb4f5fb4c7a80e6b2a364 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.0.aar b/nekoyume/Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.0.aar new file mode 100644 index 00000000000..f876595c903 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.0.aar.meta new file mode 100644 index 00000000000..0c83c38b681 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: f4635a35543fb4cc7972cf98b0796018 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar b/nekoyume/Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar new file mode 100644 index 00000000000..337f4c499cc Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar.meta new file mode 100644 index 00000000000..8d3d7d8fe27 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 09a6139ddc8cc46e8bc22a30e4ef3018 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar b/nekoyume/Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar new file mode 100644 index 00000000000..78ac06c4e4c Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar.meta b/nekoyume/Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar.meta new file mode 100644 index 00000000000..2528ffc0915 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 344e0efe7ba2149c5a5ab46946574c01 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.concurrent.concurrent-futures-1.1.0.jar b/nekoyume/Assets/Plugins/Android/androidx.concurrent.concurrent-futures-1.1.0.jar new file mode 100644 index 00000000000..833b095873b Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.concurrent.concurrent-futures-1.1.0.jar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.concurrent.concurrent-futures-1.1.0.jar.meta b/nekoyume/Assets/Plugins/Android/androidx.concurrent.concurrent-futures-1.1.0.jar.meta new file mode 100644 index 00000000000..4a6698b92b9 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.concurrent.concurrent-futures-1.1.0.jar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 9d7103cd01fd14ab9a956b8c0d3729e9 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar b/nekoyume/Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar new file mode 100644 index 00000000000..de447ec4cfa Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar.meta new file mode 100644 index 00000000000..8e6acb477f3 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 3e1ac56828b5f4b008ecd11b3556bb7c +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.core.core-1.2.0.aar b/nekoyume/Assets/Plugins/Android/androidx.core.core-1.2.0.aar new file mode 100644 index 00000000000..e8be07baa1e Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.core.core-1.2.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.core.core-1.2.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.core.core-1.2.0.aar.meta new file mode 100644 index 00000000000..3b49ae1ea06 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.core.core-1.2.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 3a0231f31769d4b2aae98f8636e40e14 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar b/nekoyume/Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar new file mode 100644 index 00000000000..cd1494a9bc7 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar.meta new file mode 100644 index 00000000000..097eade9994 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 142a1257d8a35404496f5e459b57e2c6 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar b/nekoyume/Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar new file mode 100644 index 00000000000..73e70ac40e4 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar.meta new file mode 100644 index 00000000000..6259308a290 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 51157b198e70c42d8b9fe494790561ab +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar b/nekoyume/Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar new file mode 100644 index 00000000000..79fd5502a92 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar.meta new file mode 100644 index 00000000000..bf4ef7eb0e5 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: b26cf7c0d6f2e44da9443215aa67803a +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar b/nekoyume/Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar new file mode 100644 index 00000000000..a9968c7fec1 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar.meta new file mode 100644 index 00000000000..788d3c9dad7 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: a5187b14e04bf4e008a876cd4c4e5a2a +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar b/nekoyume/Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar new file mode 100644 index 00000000000..7a5c36051d7 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar.meta new file mode 100644 index 00000000000..f8dac8cfc56 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: aa353088c2f344d62a5c19411bcb24a7 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar b/nekoyume/Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar new file mode 100644 index 00000000000..bccf86f791a Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar.meta new file mode 100644 index 00000000000..9091042ea90 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 39da32fb4ed75405bb89e624a139e789 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar b/nekoyume/Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar new file mode 100644 index 00000000000..01275eb2f8f Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar.meta new file mode 100644 index 00000000000..63c48f8028e --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 5cbd47c80d98944bc919958ab17a60be +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar b/nekoyume/Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar new file mode 100644 index 00000000000..2980f6039d1 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar.meta new file mode 100644 index 00000000000..8406a03a4bf --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 947aaff4de11c4d958892fdc015ebdd5 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar b/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar new file mode 100644 index 00000000000..6c3f095ca87 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar.meta b/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar.meta new file mode 100644 index 00000000000..7f5fd87a390 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: dc23266c02b8845edb56bf0efacedd7e +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar b/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar new file mode 100644 index 00000000000..27b091c1a9e Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar.meta new file mode 100644 index 00000000000..f5e84e738a3 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 99f39c7c7c62745c49d3635fb2a364ab +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar b/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar new file mode 100644 index 00000000000..5583b9f5d04 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar.meta new file mode 100644 index 00000000000..b3df2f4e57c --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: c10dee40af53146ca9c0fea16c11958d +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar b/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar new file mode 100644 index 00000000000..0809d7209ff Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar.meta new file mode 100644 index 00000000000..ee9da200eba --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 8b55659802a324b06a8870408d70fa03 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar b/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar new file mode 100644 index 00000000000..b142a70832f Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar.meta new file mode 100644 index 00000000000..1c0c65e8087 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: c4b2aa658e3fb4592a1632579c1b095c +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar b/nekoyume/Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar new file mode 100644 index 00000000000..32c57746c03 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar.meta new file mode 100644 index 00000000000..e875d99f4cd --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 42f669a5376974ddd80d08ed424f8460 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar b/nekoyume/Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar new file mode 100644 index 00000000000..e9074ee4600 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar.meta new file mode 100644 index 00000000000..24d56923c2c --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 1a09fa5d73aa1490cac81b4de8fe4b15 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.print.print-1.0.0.aar b/nekoyume/Assets/Plugins/Android/androidx.print.print-1.0.0.aar new file mode 100644 index 00000000000..7bb51fd5055 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.print.print-1.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.print.print-1.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.print.print-1.0.0.aar.meta new file mode 100644 index 00000000000..d6fc2e0caad --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.print.print-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 584b342ffcaf5484e875a2fafd665466 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar b/nekoyume/Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar new file mode 100644 index 00000000000..ebee0eee14e Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar.meta new file mode 100644 index 00000000000..7dbeefac032 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 2deaf7f23ae904281a73bce66af90e64 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar b/nekoyume/Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar new file mode 100644 index 00000000000..71d4748e867 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar.meta new file mode 100644 index 00000000000..f5b175b16b6 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 81ae76385437f4c5a8ab1aa980df69b0 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar b/nekoyume/Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar new file mode 100644 index 00000000000..d4792e06fe5 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar.meta new file mode 100644 index 00000000000..0f1702f4f00 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 322e9fb6f99b24bb6bf14ecf582b490e +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar b/nekoyume/Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar new file mode 100644 index 00000000000..a7667298cb5 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar.meta new file mode 100644 index 00000000000..464818c8d99 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 9d6d4e4084c4942cdb255685c9b35bb4 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-ads-identifier-18.0.0.aar b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-ads-identifier-18.0.0.aar new file mode 100644 index 00000000000..6c0c07a082d Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-ads-identifier-18.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-ads-identifier-18.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-ads-identifier-18.0.0.aar.meta new file mode 100644 index 00000000000..b3f4fe417f5 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-ads-identifier-18.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: e40e799a5cf874962b2f164232c4279e +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.2.0.aar b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.2.0.aar new file mode 100644 index 00000000000..a0cff649b58 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.2.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.2.0.aar.meta b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.2.0.aar.meta new file mode 100644 index 00000000000..67b53f717eb --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.2.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 56cf8951d6755429d8e3ec620d3c8268 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.1.0.aar b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.1.0.aar new file mode 100644 index 00000000000..03811c0cd97 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.1.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.1.0.aar.meta b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.1.0.aar.meta new file mode 100644 index 00000000000..df696a1168e --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.1.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 647e5b449f7ab434c975b4fecaf86b84 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-21.3.0.aar b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-21.3.0.aar new file mode 100644 index 00000000000..99dcaec1cfb Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-21.3.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-21.3.0.aar.meta b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-21.3.0.aar.meta new file mode 100644 index 00000000000..29eae8fbb22 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-21.3.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 825caeaf2d78a4e27a0706e22776ed1a +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-api-21.3.0.aar b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-api-21.3.0.aar new file mode 100644 index 00000000000..7a38f54686f Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-api-21.3.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-api-21.3.0.aar.meta b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-api-21.3.0.aar.meta new file mode 100644 index 00000000000..02729d58f39 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-api-21.3.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 89b8a31883bf3472a9adc884002f7573 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-base-21.3.0.aar b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-base-21.3.0.aar new file mode 100644 index 00000000000..22ef9d6b844 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-base-21.3.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-base-21.3.0.aar.meta b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-base-21.3.0.aar.meta new file mode 100644 index 00000000000..4c59a7fda05 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-base-21.3.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: bbee88460aea64432affdea217fce710 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-impl-21.3.0.aar b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-impl-21.3.0.aar new file mode 100644 index 00000000000..3b2c4101dfb Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-impl-21.3.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-impl-21.3.0.aar.meta b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-impl-21.3.0.aar.meta new file mode 100644 index 00000000000..8412e6ff582 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-impl-21.3.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: bb6748a39fe3b4b65a33a19fa057c22c +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-sdk-21.3.0.aar b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-sdk-21.3.0.aar new file mode 100644 index 00000000000..86c825afdd9 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-sdk-21.3.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-sdk-21.3.0.aar.meta b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-sdk-21.3.0.aar.meta new file mode 100644 index 00000000000..dd17a1f9002 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-sdk-21.3.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 9a4296082ff1a4859a2a727e282338e9 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-sdk-api-21.3.0.aar b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-sdk-api-21.3.0.aar new file mode 100644 index 00000000000..c4c2dfeaa86 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-sdk-api-21.3.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-sdk-api-21.3.0.aar.meta b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-sdk-api-21.3.0.aar.meta new file mode 100644 index 00000000000..b7902222886 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-measurement-sdk-api-21.3.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 52ba2ef4a79d74de58e7a841ec75c32c +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-stats-17.0.2.aar b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-stats-17.0.2.aar new file mode 100644 index 00000000000..0f542d322dc Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-stats-17.0.2.aar differ diff --git a/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-stats-17.0.2.aar.meta b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-stats-17.0.2.aar.meta new file mode 100644 index 00000000000..b1b3b4bd227 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-stats-17.0.2.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 661013211befe4a4b89e1bcd0472317a +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.2.aar b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.2.aar new file mode 100644 index 00000000000..a334eebedec Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.2.aar differ diff --git a/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.2.aar.meta b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.2.aar.meta new file mode 100644 index 00000000000..a6388f597ee --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.2.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 56130602c3a424026b07a8d71d8fb61f +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/com.google.errorprone.error_prone_annotations-2.9.0.jar b/nekoyume/Assets/Plugins/Android/com.google.errorprone.error_prone_annotations-2.9.0.jar new file mode 100644 index 00000000000..4dcc17d3851 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/com.google.errorprone.error_prone_annotations-2.9.0.jar differ diff --git a/nekoyume/Assets/Plugins/Android/com.google.errorprone.error_prone_annotations-2.9.0.jar.meta b/nekoyume/Assets/Plugins/Android/com.google.errorprone.error_prone_annotations-2.9.0.jar.meta new file mode 100644 index 00000000000..ef2b5862532 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/com.google.errorprone.error_prone_annotations-2.9.0.jar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 48220672555454f4f9ee1a07ef657b39 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-analytics-21.3.0.aar b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-analytics-21.3.0.aar new file mode 100644 index 00000000000..d62ea00cd64 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-analytics-21.3.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-analytics-21.3.0.aar.meta b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-analytics-21.3.0.aar.meta new file mode 100644 index 00000000000..3745f0244f0 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-analytics-21.3.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 0c60b1724171544c2b9b9e59fe19e2cc +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-analytics-unity-11.3.0.aar b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-analytics-unity-11.3.0.aar new file mode 100644 index 00000000000..ec0e3899bd9 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-analytics-unity-11.3.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-analytics-unity-11.3.0.aar.meta b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-analytics-unity-11.3.0.aar.meta new file mode 100644 index 00000000000..707d15c14dc --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-analytics-unity-11.3.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: c65ef73c2172745abb406c0560b3f72d +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-annotations-16.2.0.jar b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-annotations-16.2.0.jar new file mode 100644 index 00000000000..2eccdae7f35 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-annotations-16.2.0.jar differ diff --git a/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-annotations-16.2.0.jar.meta b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-annotations-16.2.0.jar.meta new file mode 100644 index 00000000000..df816747da7 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-annotations-16.2.0.jar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 10d8285f9f7a7497e9487b702534b57b +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-app-unity-11.3.0.aar b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-app-unity-11.3.0.aar new file mode 100644 index 00000000000..f60d5d777f4 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-app-unity-11.3.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-app-unity-11.3.0.aar.meta b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-app-unity-11.3.0.aar.meta new file mode 100644 index 00000000000..5b001670b89 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-app-unity-11.3.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 691692878fb4a4d61b0bc7dbf284897e +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-common-20.3.3.aar b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-common-20.3.3.aar new file mode 100644 index 00000000000..bfd50c9014e Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-common-20.3.3.aar differ diff --git a/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-common-20.3.3.aar.meta b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-common-20.3.3.aar.meta new file mode 100644 index 00000000000..f1e9acaf68c --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-common-20.3.3.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 0f1e7bc2139d04d588faf13d1e72a2d6 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-components-17.1.0.aar b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-components-17.1.0.aar new file mode 100644 index 00000000000..2614cbf83bd Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-components-17.1.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-components-17.1.0.aar.meta b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-components-17.1.0.aar.meta new file mode 100644 index 00000000000..2142b219449 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-components-17.1.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: aab26e180b1ab4e7fb0c3f3754efcbce +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-installations-17.0.1.aar b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-installations-17.0.1.aar new file mode 100644 index 00000000000..6bb9ddf328b Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-installations-17.0.1.aar differ diff --git a/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-installations-17.0.1.aar.meta b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-installations-17.0.1.aar.meta new file mode 100644 index 00000000000..a913dcf4c57 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-installations-17.0.1.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 0c2aec36377b64bedb3c88fb69594acf +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-installations-interop-17.0.1.aar b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-installations-interop-17.0.1.aar new file mode 100644 index 00000000000..6f32c0b3874 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-installations-interop-17.0.1.aar differ diff --git a/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-installations-interop-17.0.1.aar.meta b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-installations-interop-17.0.1.aar.meta new file mode 100644 index 00000000000..a46d5b1d3ba --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-installations-interop-17.0.1.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 7908aa7b002684f8484358136aad17da +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-measurement-connector-19.0.0.aar b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-measurement-connector-19.0.0.aar new file mode 100644 index 00000000000..f52ffc10a01 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-measurement-connector-19.0.0.aar differ diff --git a/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-measurement-connector-19.0.0.aar.meta b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-measurement-connector-19.0.0.aar.meta new file mode 100644 index 00000000000..dad1c08c4d3 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/com.google.firebase.firebase-measurement-connector-19.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 28fd3a02de34640d0b222e65bbd6e365 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/com.google.guava.listenablefuture-1.0.jar b/nekoyume/Assets/Plugins/Android/com.google.guava.listenablefuture-1.0.jar new file mode 100644 index 00000000000..5e676925fa9 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/com.google.guava.listenablefuture-1.0.jar differ diff --git a/nekoyume/Assets/Plugins/Android/com.google.guava.listenablefuture-1.0.jar.meta b/nekoyume/Assets/Plugins/Android/com.google.guava.listenablefuture-1.0.jar.meta new file mode 100644 index 00000000000..b951f994c96 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/com.google.guava.listenablefuture-1.0.jar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: b936685607cf6436bb00dd48b29d09d3 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/javax.inject.javax.inject-1.jar b/nekoyume/Assets/Plugins/Android/javax.inject.javax.inject-1.jar new file mode 100644 index 00000000000..b2a9d0bf7bd Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/javax.inject.javax.inject-1.jar differ diff --git a/nekoyume/Assets/Plugins/Android/javax.inject.javax.inject-1.jar.meta b/nekoyume/Assets/Plugins/Android/javax.inject.javax.inject-1.jar.meta new file mode 100644 index 00000000000..9dfe79e1b7b --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/javax.inject.javax.inject-1.jar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 336b9a95b21f44f4480d0d041ed17ad1 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/org.jetbrains.annotations-13.0.jar b/nekoyume/Assets/Plugins/Android/org.jetbrains.annotations-13.0.jar new file mode 100644 index 00000000000..fb794be912b Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/org.jetbrains.annotations-13.0.jar differ diff --git a/nekoyume/Assets/Plugins/Android/org.jetbrains.annotations-13.0.jar.meta b/nekoyume/Assets/Plugins/Android/org.jetbrains.annotations-13.0.jar.meta new file mode 100644 index 00000000000..cd09b2c006d --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/org.jetbrains.annotations-13.0.jar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 30e31ee18f517427a9d49a565b4231cb +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-1.7.10.jar b/nekoyume/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-1.7.10.jar new file mode 100644 index 00000000000..1cd9e7c7daa Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-1.7.10.jar differ diff --git a/nekoyume/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-1.7.10.jar.meta b/nekoyume/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-1.7.10.jar.meta new file mode 100644 index 00000000000..9d6c2f01f52 --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-1.7.10.jar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 7e9547d3ae30545e48cf6acf5ce5e3d7 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-common-1.7.10.jar b/nekoyume/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-common-1.7.10.jar new file mode 100644 index 00000000000..3c2b91d8204 Binary files /dev/null and b/nekoyume/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-common-1.7.10.jar differ diff --git a/nekoyume/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-common-1.7.10.jar.meta b/nekoyume/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-common-1.7.10.jar.meta new file mode 100644 index 00000000000..c7cf59cfb2d --- /dev/null +++ b/nekoyume/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-common-1.7.10.jar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: a7214e21b1408429491e05f7e5e8e48f +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/IngameDebugConsole/IngameDebugConsole.prefab b/nekoyume/Assets/Plugins/IngameDebugConsole/IngameDebugConsole.prefab index 329d1f1fcc3..b5b3ad78b9e 100644 --- a/nekoyume/Assets/Plugins/IngameDebugConsole/IngameDebugConsole.prefab +++ b/nekoyume/Assets/Plugins/IngameDebugConsole/IngameDebugConsole.prefab @@ -1202,6 +1202,7 @@ RectTransform: - {fileID: 424831123507493364} - {fileID: 424831123507462550} - {fileID: 424831123527429638} + - {fileID: 3254945342284138891} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4410,3 +4411,79 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: +--- !u!1 &3983896512939057460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3254945342284138891} + - component: {fileID: 6934815029912537973} + - component: {fileID: 8844935914896833623} + m_Layer: 5 + m_Name: BlackClearingImg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3254945342284138891 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3983896512939057460} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 424831123507506894} + m_RootOrder: 3 + 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 &6934815029912537973 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3983896512939057460} + m_CullTransparentMesh: 1 +--- !u!114 &8844935914896833623 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3983896512939057460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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 diff --git a/nekoyume/Assets/Plugins/NativeShare.meta b/nekoyume/Assets/Plugins/NativeShare.meta new file mode 100644 index 00000000000..e607c39c6d5 --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8324427195a6513499c7e13ee99bfc33 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/NativeShare/Android.meta b/nekoyume/Assets/Plugins/NativeShare/Android.meta new file mode 100644 index 00000000000..7dff4dc937a --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare/Android.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 7a5ec1b686319c94db4865fb2f5fdf3d +folderAsset: yes +timeCreated: 1519137951 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/NativeShare/Android/NSCallbackHelper.cs b/nekoyume/Assets/Plugins/NativeShare/Android/NSCallbackHelper.cs new file mode 100644 index 00000000000..94d57f5e5cb --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare/Android/NSCallbackHelper.cs @@ -0,0 +1,78 @@ +#if UNITY_EDITOR || UNITY_ANDROID +using System.Collections; +using UnityEngine; + +namespace NativeShareNamespace +{ + public class NSCallbackHelper : MonoBehaviour + { + public NativeShare.ShareResultCallback callback; + + private NativeShare.ShareResult result = NativeShare.ShareResult.Unknown; + private string shareTarget = null; + + private bool resultReceived; + + private void Awake() + { + DontDestroyOnLoad( gameObject ); + } + + private void Update() + { + if( resultReceived ) + { + resultReceived = false; + + try + { + if( callback != null ) + callback( result, shareTarget ); + } + finally + { + Destroy( gameObject ); + } + } + } + + private IEnumerator OnApplicationFocus( bool focus ) + { + if( focus ) + { + // Share sheet is closed and now Unity activity is running again. Send Unknown result if OnShareCompleted wasn't called + yield return null; + resultReceived = true; + } + } + + public void OnShareCompleted( int resultRaw, string shareTarget ) + { + NativeShare.ShareResult shareResult = (NativeShare.ShareResult) resultRaw; + + if( result == NativeShare.ShareResult.Unknown ) + { + result = shareResult; + this.shareTarget = shareTarget; + } + else if( result == NativeShare.ShareResult.NotShared ) + { + if( shareResult == NativeShare.ShareResult.Shared ) + { + result = NativeShare.ShareResult.Shared; + this.shareTarget = shareTarget; + } + else if( shareResult == NativeShare.ShareResult.NotShared && !string.IsNullOrEmpty( shareTarget ) ) + this.shareTarget = shareTarget; + } + else + { + if( shareResult == NativeShare.ShareResult.Shared && !string.IsNullOrEmpty( shareTarget ) ) + this.shareTarget = shareTarget; + } + + resultReceived = true; + } + } +} +#endif \ No newline at end of file diff --git a/nekoyume/Assets/Plugins/NativeShare/Android/NSCallbackHelper.cs.meta b/nekoyume/Assets/Plugins/NativeShare/Android/NSCallbackHelper.cs.meta new file mode 100644 index 00000000000..253cb2f1f44 --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare/Android/NSCallbackHelper.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 8b7cf25514ddb4f4c954e0b3a0bfe72d +timeCreated: 1594464639 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/NativeShare/Android/NSShareResultCallbackAndroid.cs b/nekoyume/Assets/Plugins/NativeShare/Android/NSShareResultCallbackAndroid.cs new file mode 100644 index 00000000000..38e13032b93 --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare/Android/NSShareResultCallbackAndroid.cs @@ -0,0 +1,33 @@ +#if UNITY_EDITOR || UNITY_ANDROID +using UnityEngine; + +namespace NativeShareNamespace +{ + public class NSShareResultCallbackAndroid : AndroidJavaProxy + { + private readonly NSCallbackHelper callbackHelper; + + public NSShareResultCallbackAndroid( NativeShare.ShareResultCallback callback ) : base( "com.yasirkula.unity.NativeShareResultReceiver" ) + { + callbackHelper = new GameObject( "NSCallbackHelper" ).AddComponent(); + callbackHelper.callback = callback; + } + + public void OnShareCompleted( int result, string shareTarget ) + { + if( !callbackHelper ) + { + Debug.LogWarning( "NSCallbackHelper is destroyed!" ); + return; + } + + callbackHelper.OnShareCompleted( result, shareTarget ); + } + + public bool HasManagedCallback() + { + return callbackHelper && callbackHelper.callback != null; + } + } +} +#endif \ No newline at end of file diff --git a/nekoyume/Assets/Plugins/NativeShare/Android/NSShareResultCallbackAndroid.cs.meta b/nekoyume/Assets/Plugins/NativeShare/Android/NSShareResultCallbackAndroid.cs.meta new file mode 100644 index 00000000000..256d9765315 --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare/Android/NSShareResultCallbackAndroid.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 426f327c76c8b934c9f96cbb059c552b +timeCreated: 1594475580 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/NativeShare/Android/NativeShare.aar b/nekoyume/Assets/Plugins/NativeShare/Android/NativeShare.aar new file mode 100644 index 00000000000..17b3707904b Binary files /dev/null and b/nekoyume/Assets/Plugins/NativeShare/Android/NativeShare.aar differ diff --git a/nekoyume/Assets/Plugins/NativeShare/Android/NativeShare.aar.meta b/nekoyume/Assets/Plugins/NativeShare/Android/NativeShare.aar.meta new file mode 100644 index 00000000000..44f19bcbaf1 --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare/Android/NativeShare.aar.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 4a6e9040851f7104e8db050f4170d6ec +timeCreated: 1569766133 +licenseType: Free +PluginImporter: + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + data: + first: + Android: Android + second: + enabled: 1 + settings: {} + data: + first: + Any: + second: + enabled: 0 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/NativeShare/Editor.meta b/nekoyume/Assets/Plugins/NativeShare/Editor.meta new file mode 100644 index 00000000000..f5d1fce794b --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare/Editor.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: b1ea4e674d69a71499e17d37ad068d22 +folderAsset: yes +timeCreated: 1521463050 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/NativeShare/Editor/NSPostProcessBuild.cs b/nekoyume/Assets/Plugins/NativeShare/Editor/NSPostProcessBuild.cs new file mode 100644 index 00000000000..bcb7f2b4b80 --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare/Editor/NSPostProcessBuild.cs @@ -0,0 +1,104 @@ +using System.IO; +using UnityEditor; +using UnityEngine; +#if UNITY_IOS +using UnityEditor.Callbacks; +using UnityEditor.iOS.Xcode; +#endif + +namespace NativeShareNamespace +{ + [System.Serializable] + public class Settings + { + private const string SAVE_PATH = "ProjectSettings/NativeShare.json"; + + public bool AutomatedSetup = true; + public string PhotoLibraryUsageDescription = "The app requires access to Photos to save media to it."; + + private static Settings m_instance = null; + public static Settings Instance + { + get + { + if( m_instance == null ) + { + try + { + if( File.Exists( SAVE_PATH ) ) + m_instance = JsonUtility.FromJson( File.ReadAllText( SAVE_PATH ) ); + else + m_instance = new Settings(); + } + catch( System.Exception e ) + { + Debug.LogException( e ); + m_instance = new Settings(); + } + } + + return m_instance; + } + } + + public void Save() + { + File.WriteAllText( SAVE_PATH, JsonUtility.ToJson( this, true ) ); + } + +#if UNITY_2018_3_OR_NEWER + [SettingsProvider] + public static SettingsProvider CreatePreferencesGUI() + { + return new SettingsProvider( "Project/yasirkula/Native Share", SettingsScope.Project ) + { + guiHandler = ( searchContext ) => PreferencesGUI(), + keywords = new System.Collections.Generic.HashSet() { "Native", "Share", "Android", "iOS" } + }; + } +#endif + +#if !UNITY_2018_3_OR_NEWER + [PreferenceItem( "Native Share" )] +#endif + public static void PreferencesGUI() + { + EditorGUI.BeginChangeCheck(); + + Instance.AutomatedSetup = EditorGUILayout.Toggle( "Automated Setup", Instance.AutomatedSetup ); + + EditorGUI.BeginDisabledGroup( !Instance.AutomatedSetup ); + Instance.PhotoLibraryUsageDescription = EditorGUILayout.DelayedTextField( new GUIContent( "Photo Library Usage Description", "Shown to user when they select the 'Save to Photos' option in share sheet" ), Instance.PhotoLibraryUsageDescription ); + EditorGUI.EndDisabledGroup(); + + if( EditorGUI.EndChangeCheck() ) + Instance.Save(); + } + } + + public class NSPostProcessBuild + { +#if UNITY_IOS + [PostProcessBuild] + public static void OnPostprocessBuild( BuildTarget target, string buildPath ) + { + if( !Settings.Instance.AutomatedSetup ) + return; + + if( target == BuildTarget.iOS ) + { + string plistPath = Path.Combine( buildPath, "Info.plist" ); + + PlistDocument plist = new PlistDocument(); + plist.ReadFromString( File.ReadAllText( plistPath ) ); + + PlistElementDict rootDict = plist.root; + rootDict.SetString( "NSPhotoLibraryUsageDescription", Settings.Instance.PhotoLibraryUsageDescription ); + rootDict.SetString( "NSPhotoLibraryAddUsageDescription", Settings.Instance.PhotoLibraryUsageDescription ); + + File.WriteAllText( plistPath, plist.WriteToString() ); + } + } +#endif + } +} \ No newline at end of file diff --git a/nekoyume/Assets/Plugins/NativeShare/Editor/NSPostProcessBuild.cs.meta b/nekoyume/Assets/Plugins/NativeShare/Editor/NSPostProcessBuild.cs.meta new file mode 100644 index 00000000000..115a468c334 --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare/Editor/NSPostProcessBuild.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 49ddd46fdeeb9384c858b0daaebb6071 +timeCreated: 1521452119 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/NativeShare/Editor/NativeShare.Editor.asmdef b/nekoyume/Assets/Plugins/NativeShare/Editor/NativeShare.Editor.asmdef new file mode 100644 index 00000000000..5e26a6ab2bb --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare/Editor/NativeShare.Editor.asmdef @@ -0,0 +1,15 @@ +{ + "name": "NativeShare.Editor", + "references": [], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/nekoyume/Assets/Plugins/NativeShare/Editor/NativeShare.Editor.asmdef.meta b/nekoyume/Assets/Plugins/NativeShare/Editor/NativeShare.Editor.asmdef.meta new file mode 100644 index 00000000000..86208a3f692 --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare/Editor/NativeShare.Editor.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9ed423a4021a0c248911f8b5b1277c91 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/NativeShare/NativeShare.Runtime.asmdef b/nekoyume/Assets/Plugins/NativeShare/NativeShare.Runtime.asmdef new file mode 100644 index 00000000000..198e39895fc --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare/NativeShare.Runtime.asmdef @@ -0,0 +1,3 @@ +{ + "name": "NativeShare.Runtime" +} diff --git a/nekoyume/Assets/Plugins/NativeShare/NativeShare.Runtime.asmdef.meta b/nekoyume/Assets/Plugins/NativeShare/NativeShare.Runtime.asmdef.meta new file mode 100644 index 00000000000..041fc59e289 --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare/NativeShare.Runtime.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2ace7ebb826df10459d12b4f3c4a9407 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/NativeShare/NativeShare.cs b/nekoyume/Assets/Plugins/NativeShare/NativeShare.cs new file mode 100644 index 00000000000..4544ef0b36a --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare/NativeShare.cs @@ -0,0 +1,353 @@ +using UnityEngine; +using System.IO; +using System.Collections.Generic; +#if UNITY_ANDROID || UNITY_IOS +using NativeShareNamespace; +#endif + +#pragma warning disable 0414 +public class NativeShare +{ + public enum ShareResult { Unknown = 0, Shared = 1, NotShared = 2 }; + + public delegate void ShareResultCallback( ShareResult result, string shareTarget ); + +#if !UNITY_EDITOR && UNITY_ANDROID + private static AndroidJavaClass m_ajc = null; + private static AndroidJavaClass AJC + { + get + { + if( m_ajc == null ) + m_ajc = new AndroidJavaClass( "com.yasirkula.unity.NativeShare" ); + + return m_ajc; + } + } + + private static AndroidJavaObject m_context = null; + private static AndroidJavaObject Context + { + get + { + if( m_context == null ) + { + using( AndroidJavaObject unityClass = new AndroidJavaClass( "com.unity3d.player.UnityPlayer" ) ) + { + m_context = unityClass.GetStatic( "currentActivity" ); + } + } + + return m_context; + } + } +#elif !UNITY_EDITOR && UNITY_IOS + [System.Runtime.InteropServices.DllImport( "__Internal" )] + private static extern void _NativeShare_Share( string[] files, int filesCount, string subject, string text, string link ); +#endif + + private string subject = string.Empty; + private string text = string.Empty; + private string title = string.Empty; + private string url = string.Empty; + +#if UNITY_EDITOR || UNITY_ANDROID + private readonly List emailRecipients = new List( 0 ); + + private readonly List targetPackages = new List( 0 ); + private readonly List targetClasses = new List( 0 ); +#endif + + private readonly List files = new List( 0 ); + private readonly List mimes = new List( 0 ); + + private ShareResultCallback callback; + + public NativeShare Clear() + { + subject = text = title = url = string.Empty; + +#if UNITY_EDITOR || UNITY_ANDROID + emailRecipients.Clear(); + targetPackages.Clear(); + targetClasses.Clear(); +#endif + files.Clear(); + mimes.Clear(); + + callback = null; + + return this; + } + + public NativeShare SetSubject( string subject ) + { + this.subject = subject ?? string.Empty; + return this; + } + + public NativeShare SetText( string text ) + { + this.text = text ?? string.Empty; + return this; + } + + public NativeShare SetUrl( string url ) + { + this.url = url ?? string.Empty; + return this; + } + + public NativeShare SetTitle( string title ) + { + this.title = title ?? string.Empty; + return this; + } + + public NativeShare SetCallback( ShareResultCallback callback ) + { + this.callback = callback; + return this; + } + + public NativeShare AddTarget( string androidPackageName, string androidClassName = null ) + { +#if UNITY_EDITOR || UNITY_ANDROID + if( !string.IsNullOrEmpty( androidPackageName ) ) + { + if( androidClassName == null ) + androidClassName = string.Empty; + + bool isUnique = true; + for( int i = 0; i < targetPackages.Count; i++ ) + { + if( targetPackages[i] == androidPackageName && targetClasses[i] == androidClassName ) + { + isUnique = false; + break; + } + } + + if( isUnique ) + { + targetPackages.Add( androidPackageName ); + targetClasses.Add( androidClassName ); + } + } +#endif + + return this; + } + + public NativeShare AddFile( string filePath, string mime = null ) + { + if( !string.IsNullOrEmpty( filePath ) && File.Exists( filePath ) ) + { + files.Add( filePath ); + mimes.Add( mime ?? string.Empty ); + } + else + Debug.LogError( "Share Error: file does not exist at path or permission denied: " + filePath ); + + return this; + } + + public NativeShare AddFile( Texture2D texture, string createdFileName = "Image.png" ) + { + if( !texture ) + Debug.LogError( "Share Error: Texture does not exist!" ); + else + { + if( string.IsNullOrEmpty( createdFileName ) ) + createdFileName = "Image.png"; + + bool saveAsJpeg; + if( createdFileName.EndsWith( ".jpeg", System.StringComparison.OrdinalIgnoreCase ) || createdFileName.EndsWith( ".jpg", System.StringComparison.OrdinalIgnoreCase ) ) + saveAsJpeg = true; + else + { + if( !createdFileName.EndsWith( ".png", System.StringComparison.OrdinalIgnoreCase ) ) + createdFileName += ".png"; + + saveAsJpeg = false; + } + + string filePath = Path.Combine( Application.temporaryCachePath, createdFileName ); + File.WriteAllBytes( filePath, GetTextureBytes( texture, saveAsJpeg ) ); + + AddFile( filePath, saveAsJpeg ? "image/jpeg" : "image/png" ); + } + + return this; + } + + public NativeShare AddEmailRecipient( string emailAddress ) + { +#if UNITY_EDITOR || UNITY_ANDROID + if( !string.IsNullOrEmpty( emailAddress ) && !emailRecipients.Contains( emailAddress ) ) + emailRecipients.Add( emailAddress ); +#endif + + return this; + } + + public void Share() + { + if( files.Count == 0 && subject.Length == 0 && text.Length == 0 && url.Length == 0 ) + { + Debug.LogWarning( "Share Error: attempting to share nothing!" ); + return; + } + +#if UNITY_EDITOR + Debug.Log( "Shared!" ); + + if( callback != null ) + callback( ShareResult.Shared, null ); +#elif UNITY_ANDROID + AJC.CallStatic( "Share", Context, new NSShareResultCallbackAndroid( callback ), targetPackages.ToArray(), targetClasses.ToArray(), files.ToArray(), mimes.ToArray(), emailRecipients.ToArray(), subject, CombineURLWithText(), title ); +#elif UNITY_IOS + NSShareResultCallbackiOS.Initialize( callback ); + if( files.Count == 0 ) + _NativeShare_Share( new string[0], 0, subject, text, GetURLWithScheme() ); + else + { + // While sharing both a URL and a file, some apps either don't show up in share sheet or omit the file + // If we append URL to text, the issue is resolved for at least some of these apps + _NativeShare_Share( files.ToArray(), files.Count, subject, CombineURLWithText(), "" ); + } +#else + Debug.LogWarning( "NativeShare is not supported on this platform!" ); +#endif + } + + #region Utility Functions + public static bool TargetExists( string androidPackageName, string androidClassName = null ) + { +#if !UNITY_EDITOR && UNITY_ANDROID + if( string.IsNullOrEmpty( androidPackageName ) ) + return false; + + if( androidClassName == null ) + androidClassName = string.Empty; + + return AJC.CallStatic( "TargetExists", Context, androidPackageName, androidClassName ); +#else + return true; +#endif + } + + public static bool FindTarget( out string androidPackageName, out string androidClassName, string packageNameRegex, string classNameRegex = null ) + { + androidPackageName = null; + androidClassName = null; + +#if !UNITY_EDITOR && UNITY_ANDROID + if( string.IsNullOrEmpty( packageNameRegex ) ) + return false; + + if( classNameRegex == null ) + classNameRegex = string.Empty; + + string result = AJC.CallStatic( "FindMatchingTarget", Context, packageNameRegex, classNameRegex ); + if( string.IsNullOrEmpty( result ) ) + return false; + + int splitIndex = result.IndexOf( '>' ); + if( splitIndex <= 0 || splitIndex >= result.Length - 1 ) + return false; + + androidPackageName = result.Substring( 0, splitIndex ); + androidClassName = result.Substring( splitIndex + 1 ); + + return true; +#else + return false; +#endif + } + #endregion + + #region Internal Functions + private string GetURLWithScheme() + { + return ( url.Length == 0 || url.Contains( "://" ) ) ? url : ( "https://" + url ); + } + + private string CombineURLWithText() + { + if( url.Length == 0 || text.IndexOf( url, System.StringComparison.OrdinalIgnoreCase ) >= 0 ) + return text; + else if( text.Length == 0 ) + return GetURLWithScheme(); + else + return string.Concat( text, " ", GetURLWithScheme() ); + } + + private byte[] GetTextureBytes( Texture2D texture, bool isJpeg ) + { + try + { + return isJpeg ? texture.EncodeToJPG( 100 ) : texture.EncodeToPNG(); + } + catch( UnityException ) + { + return GetTextureBytesFromCopy( texture, isJpeg ); + } + catch( System.ArgumentException ) + { + return GetTextureBytesFromCopy( texture, isJpeg ); + } + +#pragma warning disable 0162 + return null; +#pragma warning restore 0162 + } + + private byte[] GetTextureBytesFromCopy( Texture2D texture, bool isJpeg ) + { + // Texture is marked as non-readable, create a readable copy and share it instead + Debug.LogWarning( "Sharing non-readable textures is slower than sharing readable textures" ); + + Texture2D sourceTexReadable = null; + RenderTexture rt = RenderTexture.GetTemporary( texture.width, texture.height ); + RenderTexture activeRT = RenderTexture.active; + + try + { + Graphics.Blit( texture, rt ); + RenderTexture.active = rt; + + sourceTexReadable = new Texture2D( texture.width, texture.height, isJpeg ? TextureFormat.RGB24 : TextureFormat.RGBA32, false ); + sourceTexReadable.ReadPixels( new Rect( 0, 0, texture.width, texture.height ), 0, 0, false ); + sourceTexReadable.Apply( false, false ); + } + catch( System.Exception e ) + { + Debug.LogException( e ); + + Object.DestroyImmediate( sourceTexReadable ); + return null; + } + finally + { + RenderTexture.active = activeRT; + RenderTexture.ReleaseTemporary( rt ); + } + + try + { + return isJpeg ? sourceTexReadable.EncodeToJPG( 100 ) : sourceTexReadable.EncodeToPNG(); + } + catch( System.Exception e ) + { + Debug.LogException( e ); + return null; + } + finally + { + Object.DestroyImmediate( sourceTexReadable ); + } + } + #endregion +} +#pragma warning restore 0414 \ No newline at end of file diff --git a/nekoyume/Assets/Plugins/NativeShare/NativeShare.cs.meta b/nekoyume/Assets/Plugins/NativeShare/NativeShare.cs.meta new file mode 100644 index 00000000000..6d8216e4339 --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare/NativeShare.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 1bc4e4b9af3315e4a829993a8f7d5636 +timeCreated: 1498727250 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/NativeShare/README.txt b/nekoyume/Assets/Plugins/NativeShare/README.txt new file mode 100644 index 00000000000..d4b35336190 --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare/README.txt @@ -0,0 +1,67 @@ += Native Share for Android & iOS (v1.4.9) = + +Online documentation & example code available at: https://github.com/yasirkula/UnityNativeShare +E-mail: yasirkula@gmail.com + + +1. ABOUT +This plugin helps you natively share files (images, videos, documents, etc.) and/or plain text on Android & iOS. A ContentProvider is used to share the media on Android. + + +2. HOW TO +2.1. Android Setup +NativeShare no longer requires any manual setup on Android. If you were using an older version of the plugin, you need to remove NativeShare's "" from your AndroidManifest.xml. + +For reference, the legacy documentation is available at: https://github.com/yasirkula/UnityNativeShare/wiki/Manual-Setup-for-Android + +2.2. iOS Setup +There are two ways to set up the plugin on iOS: + +a. Automated Setup for iOS +- (optional) change the value of 'Photo Library Usage Description' at 'Project Settings/yasirkula/Native Share' + +b. Manual Setup for iOS +- set the value of 'Automated Setup' to false at 'Project Settings/yasirkula/Native Share' +- build your project +- enter a Photo Library Usage Description to Info.plist in Xcode (in case user decides to save the shared media to Photos) +- also enter a Photo Library Additions Usage Description to Info.plist in Xcode, if exists + + +3. FAQ +- Can I share on a specific app? +On Android, you can share on a specific app via AddTarget. For iOS, you can check out this post and see if it works for you: https://forum.unity.com/threads/native-share-for-android-ios-open-source.519865/page-4#post-4011874 + +- I can't share image with text on X app +It is just not possible to share an image/file with text/subject on some apps (e.g. Facebook), they intentionally omit either the image or the text from the shared content. These apps require you to use their own SDKs for complex share actions. For best compatibility, I'd recommend you to share either only image or only text. + +- I can't build the project to Android, it says "Android resource linking failed: unexpected element found in " in the error message +NativeShare adds "" element to AndroidManifest.xml due to the new package visibility change (https://developer.android.com/training/package-visibility). The build error can be fixed by following these steps: https://developers.google.com/ar/develop/unity/android-11-build (in my tests, changing "Gradle installed with Unity" wasn't necessary). In the worst case, if you are OK with NativeShare not working on some of the affected devices, then you can open NativeShare.aar with WinRAR or 7-Zip and then remove the "..." element from AndroidManifest.xml. + +- Can't share, it says "java.lang.ClassNotFoundException: com.yasirkula.unity.NativeShare" in Logcat +If you are sure that your plugin is up-to-date, then enable "Custom Proguard File" option from Player Settings and add the following line to that file: -keep class com.yasirkula.unity.* { *; } + + +4. SCRIPTING API +Simply create a new NativeShare object and customize it by chaining the following functions as you like: + +- Clear(): clears the previously set share content (if any). Only useful if the same NativeShare instance will be reused for memory efficiency +- SetSubject( string subject ): sets the subject (primarily used in e-mail applications) +- SetText( string text ): sets the shared text. Note that the Facebook app will omit text, if exists +- SetUrl( string url ): sets the shared url. On supported iOS apps, this url is used to generate a preview of the target webpage. Other iOS apps may append the url to the text or omit it. While sharing a file on iOS or while sharing anything on Android, the url is appended to the text (unless the text already contains the url) +- AddFile( string filePath, string mime = null ): adds the file at path to the share action. You can add multiple files of different types. The MIME of the file is automatically determined if left null; however, if the file doesn't have an extension and/or you already know the MIME of the file, you can enter the MIME manually. MIME has no effect on iOS +- AddFile( Texture2D texture, string createdFileName = "Image.png" ): saves the texture to Application.temporaryCachePath with the specified filename and adds the image file to the share action +- AddEmailRecipient( string emailAddress ): auto-populates the recipients field of e-mail applications on Android platform. Has no effect on iOS +- SetTitle( string title ): sets the title of the share dialog on Android platform. Has no effect on iOS +- AddTarget( string androidPackageName, string androidClassName = null ): shares content on a specific application on Android platform. If androidClassName is left null, list of activities in the share dialog will be narrowed down to the activities in the specified androidPackageName that can handle this share action. Note that androidClassName, if provided, must be the full name of the activity (with its package). You can call this function multiple times. This function has no effect on iOS +- SetCallback( ShareResultCallback callback ): invokes the callback function after the share action is completed. ShareResultCallback has the following signature: void ShareResultCallback( ShareResult result, string shareTarget ) + - "ShareResult result" can take 3 values: + - Unknown: we can't determine whether or not the user has shared the content + - Shared: user has probably shared the content. This value guarantees that the user has at least selected an app from the share sheet. But it is impossible to say whether the user has actually shared the content or cancelled the operation right after selecting the app from the share sheet + - NotShared: either the user has closed the share sheet immediately or selected an app from the share sheet but then decided not to share the content (unfortunately, most apps return Shared for the latter case) + - "string shareTarget" stores information about the app that the user has selected from the share sheet. It can be null or empty, if this information isn't provided. Usually, this is the package name/class name of the selected application. You can use this value to e.g. determine if the user has picked Twitter from the share sheet: shareTarget != null && shareTarget.ToLowerInvariant().Contains( "twitter" ) + +Finally, calling the Share() function of the NativeShare object will present the share sheet. + + +5. KNOWN LIMITATIONS +- Gif files are shared as static images on iOS (to learn more, please see this issue: https://github.com/yasirkula/UnityNativeShare/issues/22) \ No newline at end of file diff --git a/nekoyume/Assets/Plugins/NativeShare/README.txt.meta b/nekoyume/Assets/Plugins/NativeShare/README.txt.meta new file mode 100644 index 00000000000..2e285371918 --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare/README.txt.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 008f9918bb19fa94b83c2210cf539039 +timeCreated: 1563308465 +licenseType: Free +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/NativeShare/iOS.meta b/nekoyume/Assets/Plugins/NativeShare/iOS.meta new file mode 100644 index 00000000000..6d8956c7fe6 --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare/iOS.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: d770bec7dc391e949b3a37a50fceb1d1 +folderAsset: yes +timeCreated: 1498722622 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/NativeShare/iOS/NSShareResultCallbackiOS.cs b/nekoyume/Assets/Plugins/NativeShare/iOS/NSShareResultCallbackiOS.cs new file mode 100644 index 00000000000..754c3c7f227 --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare/iOS/NSShareResultCallbackiOS.cs @@ -0,0 +1,44 @@ +#if UNITY_EDITOR || UNITY_IOS +using UnityEngine; + +namespace NativeShareNamespace +{ + public class NSShareResultCallbackiOS : MonoBehaviour + { + private static NSShareResultCallbackiOS instance; + private NativeShare.ShareResultCallback callback; + + public static void Initialize( NativeShare.ShareResultCallback callback ) + { + if( instance == null ) + { + instance = new GameObject( "NSShareResultCallbackiOS" ).AddComponent(); + DontDestroyOnLoad( instance.gameObject ); + } + else if( instance.callback != null ) + instance.callback( NativeShare.ShareResult.Unknown, null ); + + instance.callback = callback; + } + + public void OnShareCompleted( string message ) + { + NativeShare.ShareResultCallback _callback = callback; + callback = null; + + if( _callback != null ) + { + if( string.IsNullOrEmpty( message ) ) + _callback( NativeShare.ShareResult.Unknown, null ); + else + { + NativeShare.ShareResult result = (NativeShare.ShareResult) ( message[0] - '0' ); // Convert first char to digit and then to ShareResult + string shareTarget = message.Length > 1 ? message.Substring( 1 ) : null; + + _callback( result, shareTarget ); + } + } + } + } +} +#endif \ No newline at end of file diff --git a/nekoyume/Assets/Plugins/NativeShare/iOS/NSShareResultCallbackiOS.cs.meta b/nekoyume/Assets/Plugins/NativeShare/iOS/NSShareResultCallbackiOS.cs.meta new file mode 100644 index 00000000000..c143249fceb --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare/iOS/NSShareResultCallbackiOS.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: d3cf1e26478b1b346b977d48854afe7a +timeCreated: 1594490254 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/NativeShare/iOS/NativeShare.mm b/nekoyume/Assets/Plugins/NativeShare/iOS/NativeShare.mm new file mode 100644 index 00000000000..18ab99617dc --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare/iOS/NativeShare.mm @@ -0,0 +1,157 @@ +#import +#import +#ifdef UNITY_4_0 || UNITY_5_0 +#import "iPhone_View.h" +#else +extern UIViewController* UnityGetGLViewController(); +#endif + +#define CHECK_IOS_VERSION( version ) ([[[UIDevice currentDevice] systemVersion] compare:version options:NSNumericSearch] != NSOrderedAscending) + +// Credit: https://github.com/ChrisMaire/unity-native-sharing + +// Credit: https://stackoverflow.com/a/29916845/2373034 +@interface UNativeShareEmailItemProvider : NSObject +@property (nonatomic, strong) NSString *subject; +@property (nonatomic, strong) NSString *body; +@end + +// Credit: https://stackoverflow.com/a/29916845/2373034 +@implementation UNativeShareEmailItemProvider +- (id)activityViewControllerPlaceholderItem:(UIActivityViewController *)activityViewController +{ + return [self body]; +} + +- (id)activityViewController:(UIActivityViewController *)activityViewController itemForActivityType:(NSString *)activityType +{ + return [self body]; +} + +- (NSString *)activityViewController:(UIActivityViewController *)activityViewController subjectForActivityType:(NSString *)activityType +{ + return [self subject]; +} +@end + +extern "C" void _NativeShare_Share( const char* files[], int filesCount, const char* subject, const char* text, const char* link ) +{ + NSMutableArray *items = [NSMutableArray new]; + + // When there is a subject on iOS 7 or later, text is provided together with subject via a UNativeShareEmailItemProvider + // Credit: https://stackoverflow.com/a/29916845/2373034 + if( strlen( subject ) > 0 && CHECK_IOS_VERSION( @"7.0" ) ) + { + UNativeShareEmailItemProvider *emailItem = [UNativeShareEmailItemProvider new]; + emailItem.subject = [NSString stringWithUTF8String:subject]; + emailItem.body = [NSString stringWithUTF8String:text]; + + [items addObject:emailItem]; + } + else if( strlen( text ) > 0 ) + [items addObject:[NSString stringWithUTF8String:text]]; + + // Credit: https://forum.unity.com/threads/native-share-for-android-ios-open-source.519865/page-13#post-6942362 + if( strlen( link ) > 0 ) + { + NSString *urlRaw = [NSString stringWithUTF8String:link]; + NSURL *url = [NSURL URLWithString:urlRaw]; + if( url == nil ) + { + // Try escaping the URL + if( CHECK_IOS_VERSION( @"9.0" ) ) + { + url = [NSURL URLWithString:[urlRaw stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLHostAllowedCharacterSet]]]; + if( url == nil ) + url = [NSURL URLWithString:[urlRaw stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]]]; + } + else + url = [NSURL URLWithString:[urlRaw stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]; + } + + if( url != nil ) + [items addObject:url]; + else + NSLog( @"Couldn't create a URL from link: %@", urlRaw ); + } + + for( int i = 0; i < filesCount; i++ ) + { + NSString *filePath = [NSString stringWithUTF8String:files[i]]; + UIImage *image = [UIImage imageWithContentsOfFile:filePath]; + if( image != nil ) + [items addObject:image]; + else + [items addObject:[NSURL fileURLWithPath:filePath]]; + } + + if( strlen( subject ) == 0 && [items count] == 0 ) + { + NSLog( @"Share canceled because there is nothing to share..." ); + UnitySendMessage( "NSShareResultCallbackiOS", "OnShareCompleted", "2" ); + + return; + } + + UIActivityViewController *activity = [[UIActivityViewController alloc] initWithActivityItems:items applicationActivities:nil]; + if( strlen( subject ) > 0 ) + [activity setValue:[NSString stringWithUTF8String:subject] forKey:@"subject"]; + + void (^shareResultCallback)(UIActivityType activityType, BOOL completed, UIActivityViewController *activityReference) = ^void( UIActivityType activityType, BOOL completed, UIActivityViewController *activityReference ) + { + NSLog( @"Shared to %@ with result: %d", activityType, completed ); + + if( activityReference ) + { + const char *resultMessage = [[NSString stringWithFormat:@"%d%@", completed ? 1 : 2, activityType] UTF8String]; + char *result = (char*) malloc( strlen( resultMessage ) + 1 ); + strcpy( result, resultMessage ); + + UnitySendMessage( "NSShareResultCallbackiOS", "OnShareCompleted", result ); + + // On iPhones, the share sheet isn't dismissed automatically when share operation is canceled, do that manually here + if( !completed && UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone ) + [activityReference dismissViewControllerAnimated:NO completion:nil]; + } + else + NSLog( @"Share result callback is invoked multiple times!" ); + }; + + if( CHECK_IOS_VERSION( @"8.0" ) ) + { + __block UIActivityViewController *activityReference = activity; // About __block usage: https://gist.github.com/HawkingOuYang/b2c9783c75f929b5580c + activity.completionWithItemsHandler = ^( UIActivityType activityType, BOOL completed, NSArray *returnedItems, NSError *activityError ) + { + if( activityError != nil ) + NSLog( @"Share error: %@", activityError ); + + shareResultCallback( activityType, completed, activityReference ); + activityReference = nil; + }; + } + else if( CHECK_IOS_VERSION( @"6.0" ) ) + { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + __block UIActivityViewController *activityReference = activity; + activity.completionHandler = ^( UIActivityType activityType, BOOL completed ) + { + shareResultCallback( activityType, completed, activityReference ); + activityReference = nil; + }; +#pragma clang diagnostic pop + } + else + UnitySendMessage( "NSShareResultCallbackiOS", "OnShareCompleted", "" ); + + UIViewController *rootViewController = UnityGetGLViewController(); + if( UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone ) // iPhone + { + [rootViewController presentViewController:activity animated:YES completion:nil]; + } + else // iPad + { + UIPopoverController *popup = [[UIPopoverController alloc] initWithContentViewController:activity]; + [popup presentPopoverFromRect:CGRectMake( rootViewController.view.frame.size.width / 2, rootViewController.view.frame.size.height / 2, 1, 1 ) inView:rootViewController.view permittedArrowDirections:0 animated:YES]; + } +} \ No newline at end of file diff --git a/nekoyume/Assets/Plugins/NativeShare/iOS/NativeShare.mm.meta b/nekoyume/Assets/Plugins/NativeShare/iOS/NativeShare.mm.meta new file mode 100644 index 00000000000..a722012ce80 --- /dev/null +++ b/nekoyume/Assets/Plugins/NativeShare/iOS/NativeShare.mm.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 2eb72520cd4ae2f44a30055928cb384c +timeCreated: 1498727312 +licenseType: Pro +PluginImporter: + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + data: + first: + Any: + second: + enabled: 0 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + data: + first: + iPhone: iOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/iOS/Firebase.meta b/nekoyume/Assets/Plugins/iOS/Firebase.meta new file mode 100644 index 00000000000..72b4802096c --- /dev/null +++ b/nekoyume/Assets/Plugins/iOS/Firebase.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cce0fcdc2e8cd4f198df1c9e905da95f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/iOS/Firebase/libFirebaseCppAnalytics.a b/nekoyume/Assets/Plugins/iOS/Firebase/libFirebaseCppAnalytics.a new file mode 100755 index 00000000000..9cfaa5c14f3 Binary files /dev/null and b/nekoyume/Assets/Plugins/iOS/Firebase/libFirebaseCppAnalytics.a differ diff --git a/nekoyume/Assets/Plugins/iOS/Firebase/libFirebaseCppAnalytics.a.meta b/nekoyume/Assets/Plugins/iOS/Firebase/libFirebaseCppAnalytics.a.meta new file mode 100644 index 00000000000..b33aa302f57 --- /dev/null +++ b/nekoyume/Assets/Plugins/iOS/Firebase/libFirebaseCppAnalytics.a.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: bf523cc64d194963aa7661e7d2944feb +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Plugins/iOS/Firebase/libFirebaseCppAnalytics.a +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Linux + second: + enabled: 0 + settings: + CPU: None + - first: + : LinuxUniversal + second: + enabled: 0 + settings: + CPU: None + - first: + : OSXIntel + second: + enabled: 0 + settings: + CPU: None + - first: + : OSXIntel64 + second: + enabled: 0 + settings: + CPU: None + - first: + : Web + second: + enabled: 0 + settings: {} + - first: + : WebStreamed + second: + enabled: 0 + settings: {} + - first: + Android: Android + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + iPhone: iOS + second: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: + - first: + tvOS: tvOS + second: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a b/nekoyume/Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a new file mode 100755 index 00000000000..36c1e9d86a3 Binary files /dev/null and b/nekoyume/Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a differ diff --git a/nekoyume/Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a.meta b/nekoyume/Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a.meta new file mode 100644 index 00000000000..6c4c3f4f148 --- /dev/null +++ b/nekoyume/Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 601e8e1d2d2744929ede33676cbeccc0 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Plugins/iOS/Firebase/libFirebaseCppApp.a +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Linux + second: + enabled: 0 + settings: + CPU: None + - first: + : LinuxUniversal + second: + enabled: 0 + settings: + CPU: None + - first: + : OSXIntel + second: + enabled: 0 + settings: + CPU: None + - first: + : OSXIntel64 + second: + enabled: 0 + settings: + CPU: None + - first: + : Web + second: + enabled: 0 + settings: {} + - first: + : WebStreamed + second: + enabled: 0 + settings: {} + - first: + Android: Android + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + iPhone: iOS + second: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: + - first: + tvOS: tvOS + second: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/tvOS.meta b/nekoyume/Assets/Plugins/tvOS.meta new file mode 100644 index 00000000000..6a4e44a4861 --- /dev/null +++ b/nekoyume/Assets/Plugins/tvOS.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dba5aa84127864752bd52047da1c3400 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/tvOS/Firebase.meta b/nekoyume/Assets/Plugins/tvOS/Firebase.meta new file mode 100644 index 00000000000..eec383db9a4 --- /dev/null +++ b/nekoyume/Assets/Plugins/tvOS/Firebase.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2a4ea4b14ead14cdeb5c1405ce1927d3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/tvOS/Firebase/libFirebaseCppAnalytics.a b/nekoyume/Assets/Plugins/tvOS/Firebase/libFirebaseCppAnalytics.a new file mode 100755 index 00000000000..961c35fe305 Binary files /dev/null and b/nekoyume/Assets/Plugins/tvOS/Firebase/libFirebaseCppAnalytics.a differ diff --git a/nekoyume/Assets/Plugins/tvOS/Firebase/libFirebaseCppAnalytics.a.meta b/nekoyume/Assets/Plugins/tvOS/Firebase/libFirebaseCppAnalytics.a.meta new file mode 100644 index 00000000000..e7d61d73da2 --- /dev/null +++ b/nekoyume/Assets/Plugins/tvOS/Firebase/libFirebaseCppAnalytics.a.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: 8aa59edc9bec4e45acabc30173a8beaa +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Plugins/tvOS/Firebase/libFirebaseCppAnalytics.a +timeCreated: 1480838400 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 0 + settings: + CPU: AnyCPU + Any: + enabled: 0 + settings: {} + Editor: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: + enabled: 0 + settings: + CPU: None + Linux64: + enabled: 0 + settings: + CPU: None + LinuxUniversal: + enabled: 0 + settings: + CPU: None + OSXIntel: + enabled: 0 + settings: + CPU: None + OSXIntel64: + enabled: 0 + settings: + CPU: None + OSXUniversal: + enabled: 0 + settings: + CPU: None + Web: + enabled: 0 + settings: {} + WebStreamed: + enabled: 0 + settings: {} + Win: + enabled: 0 + settings: + CPU: None + Win64: + enabled: 0 + settings: + CPU: None + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + iOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + tvOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Plugins/tvOS/Firebase/libFirebaseCppApp.a b/nekoyume/Assets/Plugins/tvOS/Firebase/libFirebaseCppApp.a new file mode 100755 index 00000000000..e8e41cda9d5 Binary files /dev/null and b/nekoyume/Assets/Plugins/tvOS/Firebase/libFirebaseCppApp.a differ diff --git a/nekoyume/Assets/Plugins/tvOS/Firebase/libFirebaseCppApp.a.meta b/nekoyume/Assets/Plugins/tvOS/Firebase/libFirebaseCppApp.a.meta new file mode 100644 index 00000000000..bb47d1ecf5f --- /dev/null +++ b/nekoyume/Assets/Plugins/tvOS/Firebase/libFirebaseCppApp.a.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: 46cff64d2cc446bb8fb0137f39fbbf57 +labels: +- gvh +- gvh_version-11.3.0 +- gvhp_exportpath-Plugins/tvOS/Firebase/libFirebaseCppApp.a +timeCreated: 1480838400 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 0 + settings: + CPU: AnyCPU + Any: + enabled: 0 + settings: {} + Editor: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: + enabled: 0 + settings: + CPU: None + Linux64: + enabled: 0 + settings: + CPU: None + LinuxUniversal: + enabled: 0 + settings: + CPU: None + OSXIntel: + enabled: 0 + settings: + CPU: None + OSXIntel64: + enabled: 0 + settings: + CPU: None + OSXUniversal: + enabled: 0 + settings: + CPU: None + Web: + enabled: 0 + settings: {} + WebStreamed: + enabled: 0 + settings: {} + Win: + enabled: 0 + settings: + CPU: None + Win64: + enabled: 0 + settings: + CPU: None + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + iOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + tvOS: + enabled: 1 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Resources/UI/Animations/UIBattleResultController@Show.anim b/nekoyume/Assets/Resources/UI/Animations/UIBattleResultController@Show.anim index 6c459a90882..6aec10dfae0 100644 --- a/nekoyume/Assets/Resources/UI/Animations/UIBattleResultController@Show.anim +++ b/nekoyume/Assets/Resources/UI/Animations/UIBattleResultController@Show.anim @@ -485,7 +485,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 2.25 - value: 204.26 + value: 260 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1461,6 +1461,90 @@ AnimationClip: path: Panel/DefeatImageContainer/Content/Cat_R classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 2.25 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 3.0166667 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Panel/DefeatTextArea/Text (TMP) + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 2.25 + value: 200 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.x + path: Panel/DefeatTextArea/Text (TMP) + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 2.25 + value: 48 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.5 + value: 28 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: Panel/DefeatTextArea/Text (TMP) + classID: 224 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -1714,6 +1798,20 @@ AnimationClip: typeID: 114 customType: 24 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3694660108 + attribute: 3305885265 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + typeID: 114 + customType: 24 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3694660108 + attribute: 538195251 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 - serializedVersion: 2 path: 2549930618 attribute: 1967290853 @@ -1749,6 +1847,13 @@ AnimationClip: typeID: 224 customType: 28 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3694660108 + attribute: 1967290853 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -2239,7 +2344,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 2.25 - value: 204.26 + value: 260 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -3215,6 +3320,90 @@ AnimationClip: path: Panel/DefeatImageContainer/Content/Cat_R classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 2.25 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 3.0166667 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Panel/DefeatTextArea/Text (TMP) + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 2.25 + value: 200 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.x + path: Panel/DefeatTextArea/Text (TMP) + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 2.25 + value: 48 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.5 + value: 28 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: Panel/DefeatTextArea/Text (TMP) + classID: 224 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_BattleResultPopup.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_BattleResultPopup.prefab index 177ea748922..59aaece1bd2 100644 --- a/nekoyume/Assets/Resources/UI/Prefabs/UI_BattleResultPopup.prefab +++ b/nekoyume/Assets/Resources/UI/Prefabs/UI_BattleResultPopup.prefab @@ -103,6 +103,7 @@ MonoBehaviour: topArea: {fileID: 4311357277872131300} defeatTextArea: root: {fileID: 636623768215482182} + worldStageId: {fileID: 3798165730089094704} defeatText: {fileID: 1850729805032133079} expText: {fileID: 585335859944505308} rewardsArea: @@ -597,6 +598,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 197712378475369246} - {fileID: 1906097335064649534} - {fileID: 940688545004970720} m_Father: {fileID: 2498277699267993728} @@ -2398,7 +2400,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 941226756191808757} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2433,7 +2435,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uB2F9\uC2E0\uC740 \uB354\uC6B1 \uAC15\uD574\uC838\uC57C \uD569\uB2C8\uB2E4." + m_text: You must grow stronger. m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} m_sharedMaterial: {fileID: -2364689171920820918, guid: 8a682b7747d4a664089b7b1065aa0035, @@ -5646,7 +5648,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 941226756191808757} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5681,7 +5683,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uACBD\uD5D8\uCE58 +80" + m_text: exp +80 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} m_sharedMaterial: {fileID: -2364689171920820918, guid: 8a682b7747d4a664089b7b1065aa0035, @@ -5954,6 +5956,188 @@ MonoBehaviour: m_ColorMode: 2 m_BlurMode: 0 m_AdvancedBlur: 0 +--- !u!1 &7907653448220730878 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 197712378475369246} + - component: {fileID: 6233707369841862120} + - component: {fileID: 3798165730089094704} + - component: {fileID: 7411743460054279102} + - component: {fileID: 8984634997496475654} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &197712378475369246 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7907653448220730878} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 941226756191808757} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6233707369841862120 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7907653448220730878} + m_CullTransparentMesh: 0 +--- !u!114 &3798165730089094704 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7907653448220730878} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Yggdrasil 9 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: fbdd9e13ed3434479bd5950b4becbfb3, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 8 + m_fontSizeMax: 32 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &7411743460054279102 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7907653448220730878} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d668203cf6645c0bb09a4991d4bbe06, type: 3} + m_Name: + m_EditorClassIdentifier: + fixedFontAsset: 0 + fixedFontStyle: 0 + fixedFontSizeOffset: 1 + fixedSpacingOption: 1 + fixedMarginOption: 1 + fontMaterialType: 20 + l10nKey: + fontMaterialIndexInitialized: 0 + fontMaterialIndex: 0 + defaultFontStylesInitialized: 0 + defaultFontStyles: 0 + defaultFontSizeInitialized: 0 + defaultFontSize: 0 + defaultCharacterSpacingInitialized: 0 + defaultCharacterSpacing: 0 + defaultWordSpacingInitialized: 0 + defaultWordSpacing: 0 + defaultLineSpacingInitialized: 0 + defaultLineSpacing: 0 +--- !u!114 &8984634997496475654 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7907653448220730878} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &8230862612390237325 GameObject: m_ObjectHideFlags: 0 diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_CelebratesPopup.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_CelebratesPopup.prefab index c895f1e42db..2f7d53bda81 100644 --- a/nekoyume/Assets/Resources/UI/Prefabs/UI_CelebratesPopup.prefab +++ b/nekoyume/Assets/Resources/UI/Prefabs/UI_CelebratesPopup.prefab @@ -227,83 +227,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &2434147971286594546 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7859309226677157255} - - component: {fileID: 8356259838153085539} - - component: {fileID: 4974647648646992910} - m_Layer: 5 - m_Name: Blur - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &7859309226677157255 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2434147971286594546} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 846423683801030626} - m_Father: {fileID: 8641600393522862577} - 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 &8356259838153085539 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2434147971286594546} - m_CullTransparentMesh: 0 ---- !u!114 &4974647648646992910 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2434147971286594546} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.29411766} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 41b5de389005642e2b5a28f7b753938f, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 1 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &2447658876172908879 GameObject: m_ObjectHideFlags: 0 @@ -3457,7 +3380,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7859309226677157255} + - {fileID: 846423683801030626} - {fileID: 8212386141908899214} m_Father: {fileID: 0} m_RootOrder: 0 @@ -3619,7 +3542,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 7859309226677157255} + m_TransformParent: {fileID: 8641600393522862577} m_Modifications: - target: {fileID: 1907849136098932, guid: 087d608eb50946b409525e83801de9d2, type: 3} propertyPath: m_Name diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_DialogPopup.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_DialogPopup.prefab index 581f9f9c611..7dff6685e07 100644 --- a/nekoyume/Assets/Resources/UI/Prefabs/UI_DialogPopup.prefab +++ b/nekoyume/Assets/Resources/UI/Prefabs/UI_DialogPopup.prefab @@ -857,12 +857,12 @@ MonoBehaviour: m_EditorClassIdentifier: tutorialTargets: [] tutorialActions: - textInterval: 0.06 + textInterval: 0.03 itemTextColor: {r: 0, g: 0.8679245, b: 0.30615816, a: 1} txtName: {fileID: 3129280787550516413} txtDialog: {fileID: 3054745048649352052} imgCharacter: {fileID: 8958640411932125811} - time: 5 + time: 3 textArrow: {fileID: 3281531917789288862} textTimer: {fileID: 8640917690875780567} --- !u!114 &1406151063027682931 diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_IntroScreen.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_IntroScreen.prefab index ac01b3e881c..cf35b40faba 100644 --- a/nekoyume/Assets/Resources/UI/Prefabs/UI_IntroScreen.prefab +++ b/nekoyume/Assets/Resources/UI/Prefabs/UI_IntroScreen.prefab @@ -788,6 +788,7 @@ MonoBehaviour: codeReaderView: {fileID: 7809378597130806631} mobileIndicator: {fileID: 8398331285720780686} videoPlayer: {fileID: 8606067998831991754} + videoSkipButton: {fileID: 2267575148265824976} --- !u!1 &1150622409532579200 GameObject: m_ObjectHideFlags: 0 @@ -1678,6 +1679,128 @@ MonoBehaviour: defaultWordSpacing: 0 defaultLineSpacingInitialized: 0 defaultLineSpacing: 0 +--- !u!1 &2002745523105583487 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6342500254836390343} + - component: {fileID: 8620718424308710297} + - component: {fileID: 960203906111439601} + - component: {fileID: 2267575148265824976} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6342500254836390343 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2002745523105583487} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4799028695467199565} + m_Father: {fileID: 379524854130658829} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -30, y: -30} + m_SizeDelta: {x: 120, y: 60} + m_Pivot: {x: 1, y: 1} +--- !u!222 &8620718424308710297 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2002745523105583487} + m_CullTransparentMesh: 1 +--- !u!114 &960203906111439601 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2002745523105583487} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2267575148265824976 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2002745523105583487} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + 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: 960203906111439601} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &2463368721563030302 GameObject: m_ObjectHideFlags: 0 @@ -5333,6 +5456,141 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6522662022849632166 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4799028695467199565} + - component: {fileID: 7455833470509127015} + - component: {fileID: 7252198366774053824} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4799028695467199565 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6522662022849632166} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6342500254836390343} + 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 &7455833470509127015 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6522662022849632166} + m_CullTransparentMesh: 1 +--- !u!114 &7252198366774053824 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6522662022849632166} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Skip + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 0de5ad765f53d464dbc47574cb28982e, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 32 + m_fontSizeBase: 32 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 8 + m_fontSizeMax: 32 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &6530683011086445864 GameObject: m_ObjectHideFlags: 0 @@ -5510,7 +5768,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 6342500254836390343} m_Father: {fileID: 2724005287680946405} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5541,7 +5800,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_Menu.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_Menu.prefab index 153c63f0cc4..26d69c5e1a5 100644 --- a/nekoyume/Assets/Resources/UI/Prefabs/UI_Menu.prefab +++ b/nekoyume/Assets/Resources/UI/Prefabs/UI_Menu.prefab @@ -6933,7 +6933,7 @@ PrefabInstance: - target: {fileID: 240416203314308822, guid: 9c3d233eb0a5b44be817eb9d0d14c468, type: 3} propertyPath: m_fontSize - value: 14.3 + value: 18 objectReference: {fileID: 0} - target: {fileID: 594167242409240970, guid: 9c3d233eb0a5b44be817eb9d0d14c468, type: 3} @@ -6998,7 +6998,7 @@ PrefabInstance: - target: {fileID: 2002551441400839633, guid: 9c3d233eb0a5b44be817eb9d0d14c468, type: 3} propertyPath: m_fontSize - value: 14.3 + value: 18 objectReference: {fileID: 0} - target: {fileID: 2053865732027394049, guid: 9c3d233eb0a5b44be817eb9d0d14c468, type: 3} @@ -7038,12 +7038,12 @@ PrefabInstance: - target: {fileID: 5086351725061315552, guid: 9c3d233eb0a5b44be817eb9d0d14c468, type: 3} propertyPath: m_fontSize - value: 14.3 + value: 18 objectReference: {fileID: 0} - target: {fileID: 5147247009366019605, guid: 9c3d233eb0a5b44be817eb9d0d14c468, type: 3} propertyPath: m_fontSize - value: 14.3 + value: 18 objectReference: {fileID: 0} - target: {fileID: 5393157893329361940, guid: 9c3d233eb0a5b44be817eb9d0d14c468, type: 3} @@ -9935,12 +9935,12 @@ PrefabInstance: - target: {fileID: 7755361176131704418, guid: 2d793ad4fed23994fad4b7fd5c99b304, type: 3} propertyPath: m_fontColor.a - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7755361176131704418, guid: 2d793ad4fed23994fad4b7fd5c99b304, type: 3} propertyPath: m_fontColor32.rgba - value: 16777215 + value: 4294967295 objectReference: {fileID: 0} - target: {fileID: 7903365846577066387, guid: 2d793ad4fed23994fad4b7fd5c99b304, type: 3} diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_SettingPopup.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_SettingPopup.prefab index 7cac3f0d59f..e67d6708996 100644 --- a/nekoyume/Assets/Resources/UI/Prefabs/UI_SettingPopup.prefab +++ b/nekoyume/Assets/Resources/UI/Prefabs/UI_SettingPopup.prefab @@ -113,10 +113,12 @@ MonoBehaviour: arenaPushToggle: {fileID: 7745150274104569190} worldbossPushToggle: {fileID: 1980548993132109895} pushDisabledImage: {fileID: 7600204300296211921} + addressShareButton: {fileID: 3864307491314838022} mobileDisabledMenus: - {fileID: 911237695392969182} mobileEnabledMenus: - {fileID: 4135752086046613942} + - {fileID: 7868347252884664485} --- !u!1 &91925049523724212 GameObject: m_ObjectHideFlags: 0 @@ -1114,6 +1116,7 @@ RectTransform: - {fileID: 7105344268149811207} - {fileID: 3032292529448256829} - {fileID: 8820338053993161877} + - {fileID: 9033961331850012377} m_Father: {fileID: 2610623906008013406} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1956,6 +1959,175 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1217214592763788177 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8472009589929177372} + - component: {fileID: 7955746363984921733} + - component: {fileID: 5575468340486890699} + - component: {fileID: 5657863264295184528} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8472009589929177372 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1217214592763788177} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9033961331850012377} + 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: 3} + m_SizeDelta: {x: 0, y: -6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7955746363984921733 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1217214592763788177} + m_CullTransparentMesh: 0 +--- !u!114 &5575468340486890699 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1217214592763788177} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Share + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 7a651b26cd62dc0479659cbcab053405, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4291093247 + m_fontColor: {r: 1, g: 0.884434, b: 0.7688679, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 8 + m_fontSizeMax: 20 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &5657863264295184528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1217214592763788177} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d668203cf6645c0bb09a4991d4bbe06, type: 3} + m_Name: + m_EditorClassIdentifier: + fixedFontAsset: 0 + fixedFontStyle: 0 + fixedFontSizeOffset: 0 + fixedSpacingOption: 0 + fixedMarginOption: 0 + fontMaterialType: 1 + l10nKey: UI_SHARE + fontMaterialIndexInitialized: 0 + fontMaterialIndex: 0 + defaultFontStylesInitialized: 0 + defaultFontStyles: 0 + defaultFontSizeInitialized: 0 + defaultFontSize: 0 + defaultCharacterSpacingInitialized: 0 + defaultCharacterSpacing: 0 + defaultWordSpacingInitialized: 0 + defaultWordSpacing: 0 + defaultLineSpacingInitialized: 0 + defaultLineSpacing: 0 --- !u!1 &1235256584323855112 GameObject: m_ObjectHideFlags: 0 @@ -4028,10 +4200,10 @@ RectTransform: m_Father: {fileID: 4418934471072564330} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100.415, y: -16.285} - m_SizeDelta: {x: 150.83, y: 32.57} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8987180367996288701 CanvasRenderer: @@ -4350,9 +4522,9 @@ RectTransform: m_Father: {fileID: 4418934471072564330} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -16.285} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2829422909616499840 @@ -13543,11 +13715,168 @@ MonoBehaviour: m_HandleRect: {fileID: 4514510073181407524} m_Direction: 2 m_Value: 0 - m_Size: 0.8994975 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &7868347252884664485 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9033961331850012377} + - component: {fileID: 4700287342292869045} + - component: {fileID: 5108485629167957174} + - component: {fileID: 3864307491314838022} + - component: {fileID: 1968831533931855297} + - component: {fileID: 8733230530603441247} + m_Layer: 5 + m_Name: ShareButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9033961331850012377 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7868347252884664485} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8472009589929177372} + m_Father: {fileID: 489833632461702486} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -90, y: 0} + m_SizeDelta: {x: 100, y: 40} + m_Pivot: {x: 1, y: 1} +--- !u!222 &4700287342292869045 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7868347252884664485} + m_CullTransparentMesh: 0 +--- !u!114 &5108485629167957174 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7868347252884664485} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3483b1826aa594389a7d7299dcab8151, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3864307491314838022 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7868347252884664485} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + 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: Highlighted + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 5108485629167957174} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!95 &1968831533931855297 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7868347252884664485} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 22100000, guid: 2db93b3f45b9c144f9d5d985f2a95adf, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &8733230530603441247 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7868347252884664485} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a31d2fe1de140e1b55dcc96e488b751, type: 3} + m_Name: + m_EditorClassIdentifier: + type: 0 --- !u!1 &7928899846040298898 GameObject: m_ObjectHideFlags: 0 diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_Tutorial.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_Tutorial.prefab index 85a40df100c..e9707cafd60 100644 --- a/nekoyume/Assets/Resources/UI/Prefabs/UI_Tutorial.prefab +++ b/nekoyume/Assets/Resources/UI/Prefabs/UI_Tutorial.prefab @@ -66,7 +66,7 @@ MonoBehaviour: - type: 3 item: {fileID: 7187191535903708824} animator: {fileID: 4927431873330913612} - playTime: 2 + playTime: 1 --- !u!222 &6744442424251077906 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/nekoyume/Assets/Resources/UI/Textures/icon_executable.png b/nekoyume/Assets/Resources/UI/Textures/icon_executable.png index e9d6b12bdb6..b76243c8ccf 100644 Binary files a/nekoyume/Assets/Resources/UI/Textures/icon_executable.png and b/nekoyume/Assets/Resources/UI/Textures/icon_executable.png differ diff --git a/nekoyume/Assets/StreamingAssets/Localization/common.csv b/nekoyume/Assets/StreamingAssets/Localization/common.csv index ec86a842100..7dc72cd5e98 100644 --- a/nekoyume/Assets/StreamingAssets/Localization/common.csv +++ b/nekoyume/Assets/StreamingAssets/Localization/common.csv @@ -61,6 +61,7 @@ UI_AFTER_N_SECONDS,"After {0:0} seconds,",{0:0}초 후,Após {0: 0} segundos,{0: UI_BATTLE_RESULT_NEXT_STAGE_FORMAT,{0} You will proceed to the next stage.,{0} 다음 스테이지로 이동합니다.,{0} você irá para a próxima fase.,{0} 次のステージへ進みます。,{0} avanzarás al siguiente escenario.,{0} คุณจะเข้าสู่ด่านต่อไป,{0} kamu akan melanjutkan ke stage berikutnya.,,{0}，您将进入下一阶段。,{0} 您將進入下一關卡。,{0} Ikaw ay tutungo na sa susunod na paglalakbay. UI_BATTLE_RESULT_REPEAT_STAGE_FORMAT,{0} You will repeat the current stage.,{0} 이번 스테이지를 다시 시작합니다.,{0} você repetirá a fase atual.,{0} 現在のステージをくり返します。,{0} repetiras el mismo escenario,{0} คุณจะเข้าสู่ด่านเดิมอีกครั้ง,{0} kamu akan mengulang stage ini kembali.,,{0}，您将重复当前阶段。,{0} 您將重複當前關卡。,{0} Uulitin mo ang kasalukiyang paglalakbay na ito. UI_BATTLE_RESULT_NOT_ENOUGH_ACTION_POINT_FORMAT,You do not have enough action points. {0} you will be returned to the lobby.,행동력이 부족하기 때문에 {0} 메인으로 이동합니다.,Você não tem ponto de ação suficiente. {0} você retornará ao principal,アクションポイントが足りません。 {0} メイン画面へ戻ります。,No tienes suficientes puntos de acción. {0} serás devuelto al menú principal,คุณมีแต้ม action point ไม่เพียงพอ {0} คุณจะกลับไปที่หน้าหลัก,Action point-mu tidak cukup. {0} kamu akan kembali ke lobi.,,您没有足够的动作点。 {0}您将返回大厅,您沒有足夠的行動點。 {0} 您將返回大廳,"Hindi sapat ang iyong ""action points"". {0} Babalik ka sa panimulang ""lobby""." +UI_BATTLE_RESULT_NOT_ENOUGH_ACTION_POINT,You do not have enough action points.,,,,,,,,,, UI_BATTLE_AGAIN,Again,다시 전투,De novo,もう一度,Repetir,อีกครั้ง,Lagi,,再次,再次,Ulit UI_BATTLE_AGAIN_FORMAT,{0} Battle starts again.,{0} 다시 전투를 시작합니다.,{0} batalha começa novamente,{0} もう一度バトルを始めます。,{0} la batalla empieza nuevamente,{0} การต่อสู้เริ่มขึ้นอีกครั้ง,{0} pertarungan kembali dimulai,,{0}战斗再次开始,{0}戰鬥再次開始,{0} Ulitin ang laban UI_BATTLE_EXIT_FORMAT,{0} You will be returned to the lobby.,{0} 메인으로 이동합니다.,{0} você retornará ao principal,{0} ロビーへ戻ります。,{0} serás devuelto al menú principal,{0} คุณจะกลับไปที่หน้าหลัก,{0} kamu akan kembali ke lobby,,{0}您将返回大厅,{0}您將返回大廳,"{0} Babalik ka sa panimulang ""lobby""" @@ -565,6 +566,12 @@ UI_GOT_IT,Got it,확인,Está bem,OK,Entendido,ตกลง,,,确认,知道了,K UI_SKIP,Skip,스킵,Pular,スキップ,Omitir,ข้าม,,,跳跃,跳過,Laktawan UI_COPY,Copy,복사,cópia de,写す,Copiar,คัดลอก,,,复制,複製,Kopyahin UI_COPIED,Copied to clipboard!,클립보드에 복사되었습니다!,Copiado para a área de transferência!,クリップボードにコピーしました！,Copiado al portapapeles,คัดลอกไปยังคลิปบอร์ด!,Disalin ke Clipboard!,Скопирован в буфер обмена!,复制到剪贴板！,複製到剪貼板！,Nakopya sa clipboard! +UI_SHARE,Share,공유,,,,,,,,, +UI_SHARE_QR_TITLE,Nine Chronicle KeyBackUp,,,,,,,,,, +UI_SHARE_QR_CONTENT,"Hello, player +The requested keystore backup. +Please save the image in a safe place. +When you restore an account using that key store, you must have the password you saved.",,,,,,,,,, UI_PRESS_TO_START,Press to Start,Press to Start,Press to Start,Press to Start,Presiona una tecla para comenzar.,Press to Start,Press to Start,Press to Start,Press to Start,點擊後開始,Pindutin para Magsimula UI_MAIN_MENU_MIMISBRUNNR,Mimisbrunnr,미미르의 샘,Mimisbrunnr,ミミスブルンニュ,Mimisbrunnr,mimisbrunnr,Mimisbrunnr,МИМИСБРУННР,Mimisbrunnr,mimisbrunnr,Mimisbrunnr UI_MIMISBRUNNR,MIMISBRUNNR,미미르의 샘,mímisbrunnr,ミーミルの泉,Mimisbrunnr,MIMISBRUNNR,MIMISBRUNNR,MIMISBRUNNR,密米尔之泉,mimisbrunnr,MIMISBRUNNR diff --git a/nekoyume/Assets/StreamingAssets/google-services-desktop.json b/nekoyume/Assets/StreamingAssets/google-services-desktop.json new file mode 100644 index 00000000000..7d3e3384576 --- /dev/null +++ b/nekoyume/Assets/StreamingAssets/google-services-desktop.json @@ -0,0 +1,39 @@ +{ + "project_info": { + "project_number": "449111430622", + "project_id": "nine-chronicles-390701", + "storage_bucket": "nine-chronicles-390701.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:449111430622:android:585f8125b18665fb9ef94f", + "android_client_info": { + "package_name": "com.planetariumlabs.ninechroniclesmobile" + } + }, + "oauth_client": [ + { + "client_id": "449111430622-7ehqssk2i611nk9i5lan69lvokperpj4.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyAOqAU2hnZWMvWX_Dil7nzfps9JxEzf1Jg" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "449111430622-7ehqssk2i611nk9i5lan69lvokperpj4.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/nekoyume/Assets/StreamingAssets/google-services-desktop.json.meta b/nekoyume/Assets/StreamingAssets/google-services-desktop.json.meta new file mode 100644 index 00000000000..5bce3cc4fe2 --- /dev/null +++ b/nekoyume/Assets/StreamingAssets/google-services-desktop.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 195419ffb367d49a8bca383f5e9a22c9 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/_Scripts/Analyzer.cs b/nekoyume/Assets/_Scripts/Analyzer.cs index 23091a0cc3e..b07e603e184 100644 --- a/nekoyume/Assets/_Scripts/Analyzer.cs +++ b/nekoyume/Assets/_Scripts/Analyzer.cs @@ -1,8 +1,17 @@ +#if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IOS) +#define ENABLE_FIREBASE +#endif #nullable enable using System.Collections.Generic; +using Firebase.Analytics; using mixpanel; using Nekoyume.State; + +#if ENABLE_FIREBASE +using NineChronicles.GoogleServices.Firebase.Runtime; +#endif + //using Sentry; /* * [ISSUE TRACKER] @@ -40,9 +49,11 @@ public Analyzer( SetUniqueId(uniqueId); rpcServerHost ??= "no-rpc-host"; + // ReSharper disable Unity.UnknownResource var clientHost = Resources.Load("ClientHost")?.text ?? "no-host"; var clientHash = Resources.Load("ClientHash")?.text ?? "no-hash"; var targetNetwork = Resources.Load("TargetNetwork")?.text ?? "no-target"; + // ReSharper restore Unity.UnknownResource InitializeMixpanel( clientHost, @@ -54,6 +65,14 @@ public Analyzer( clientHash, targetNetwork, rpcServerHost); +#if ENABLE_FIREBASE + InitializeFirebaseAnalytics( + clientHost, + clientHash, + targetNetwork, + rpcServerHost); +#endif + UpdateAvatarAddress(); Game.Event.OnRoomEnter.AddListener(_ => UpdateAvatarAddress()); @@ -70,6 +89,10 @@ public static void SetUniqueId(string? uniqueId = null) Mixpanel.People.Set("AgentAddress", uniqueId); Mixpanel.People.Name = uniqueId; // SentrySdk.ConfigureScope(scope => { scope.User.Id = uniqueId; }); +#if ENABLE_FIREBASE + FirebaseAnalytics.SetUserId(uniqueId); + FirebaseAnalytics.SetUserProperty("AgentAddress", uniqueId); +#endif } private static void InitializeMixpanel( @@ -101,6 +124,20 @@ private static void InitializeSentry( // }); } +#if ENABLE_FIREBASE + private static void InitializeFirebaseAnalytics( + string clientHost, + string clientHash, + string targetNetwork, + string rpcServerHost) + { + FirebaseAnalytics.SetUserProperty("client-host", clientHost); + FirebaseAnalytics.SetUserProperty("client-hash", clientHash); + FirebaseAnalytics.SetUserProperty("target-network", targetNetwork); + FirebaseAnalytics.SetUserProperty("rpc-server-host", rpcServerHost); + } +#endif + //private ITransaction CreateTrace(string eventName, Dictionary properties) //{ // if (!_isTrackable) @@ -140,19 +177,32 @@ public void Track(string eventName, params (string key, string value)[] properti if (properties.Length == 0) { Mixpanel.Track(eventName); +#if ENABLE_FIREBASE + FirebaseAnalytics.LogEvent(eventName); +#endif return; } - var result = new Value(); - foreach (var (key, value) in properties) + var mixpanelValues = new Value(); +#if ENABLE_FIREBASE + var firebaseParameters = new Parameter[properties.Length]; +#endif + for (var i = 0; i < properties.Length; i++) { - result[key] = value; + var (key, value) = properties[i]; + mixpanelValues[key] = value; +#if ENABLE_FIREBASE + firebaseParameters[i] = new Parameter(key, value); +#endif } - Mixpanel.Track(eventName, result); + Mixpanel.Track(eventName, mixpanelValues); +#if ENABLE_FIREBASE + FirebaseAnalytics.LogEvent(eventName, firebaseParameters); +#endif } - public ITransaction Track( + public ITransaction? Track( string eventName, Dictionary valueDict, bool returnTrace = false) @@ -168,8 +218,13 @@ public ITransaction Track( // item => item.Key, // item => item.Value.ToString())); - var value = new Value(valueDict); - Mixpanel.Track(eventName, value); + var mixpanelValue = new Value(valueDict); + Mixpanel.Track(eventName, mixpanelValue); + +#if ENABLE_FIREBASE + var firebaseParameters = ValuesToParameters(valueDict); + FirebaseAnalytics.LogEvent(eventName, firebaseParameters); +#endif // if (returnTrace) // { @@ -195,11 +250,38 @@ private static void UpdateAvatarAddress() var avatarState = States.Instance.CurrentAvatarState; if (avatarState is null) { - Mixpanel.Unregister("AvatarAddress"); + Mixpanel.Register("AvatarAddress", string.Empty); +#if ENABLE_FIREBASE + FirebaseAnalytics.SetUserProperty("AvatarAddress", string.Empty); +#endif return; } - Mixpanel.Register("AgentAddress", avatarState.address.ToHex()); + Mixpanel.Register("AvatarAddress", avatarState.address.ToHex()); +#if ENABLE_FIREBASE + FirebaseAnalytics.SetUserProperty("AvatarAddress", avatarState.address.ToHex()); +#endif + } + +#if ENABLE_FIREBASE + private static Parameter ValueToParameter(KeyValuePair item) + { + var (key, value) = item; + var str = value.ToString(); + return new Parameter(key, str); + } + + private static Parameter[] ValuesToParameters(Dictionary values) + { + var parameters = new Parameter[values.Count]; + var i = 0; + foreach (var pair in values) + { + parameters[i++] = ValueToParameter(pair); + } + + return parameters; } +#endif } } diff --git a/nekoyume/Assets/_Scripts/Game/ActionCamera.cs b/nekoyume/Assets/_Scripts/Game/ActionCamera.cs index 9249a8a2830..39f4e919332 100644 --- a/nekoyume/Assets/_Scripts/Game/ActionCamera.cs +++ b/nekoyume/Assets/_Scripts/Game/ActionCamera.cs @@ -92,6 +92,7 @@ public struct ShakeData : _cam = GetComponent(); public bool InPrologue = false; + private bool _isStaticRatio; #region Mono @@ -382,20 +383,42 @@ PivotPresetType spritePivot private void InitScreenResolution() { - _defaultAspect = (float) referenceResolution.x / referenceResolution.y; - _defaultOrthographicSize = Cam.orthographicSize; - #if UNITY_ANDROID - UpdateLetterBox(); + UpdateStaticRatioWithLetterBox(); +#else + UpdateDynamicRatio(); #endif + } - _defaultOrthographicSizeTimesAspect = _defaultOrthographicSize * GetCameraAspect(); + public void ChangeRatioState() + { + if (_isStaticRatio) + { + UpdateDynamicRatio(); + } + else + { + UpdateStaticRatioWithLetterBox(); + } + } + private void UpdateDynamicRatio() + { + _defaultAspect = (float)referenceResolution.x / referenceResolution.y; + _defaultOrthographicSize = Cam.orthographicSize; + Cam.aspect = Screen.safeArea.width / Screen.safeArea.height; + Cam.rect = new Rect(0,0,1,1); + _defaultOrthographicSizeTimesAspect = _defaultOrthographicSize * GetCameraAspect(); UpdateScreenResolution(); + _isStaticRatio = false; + GL.Clear(true, true, Color.black); } - private void UpdateLetterBox() + private void UpdateStaticRatioWithLetterBox() { + _defaultAspect = (float)referenceResolution.x / referenceResolution.y; + _defaultOrthographicSize = Cam.orthographicSize; + float fixedAspectRatio = _defaultAspect; Cam.aspect = _defaultAspect; float currentAspectRatio = Screen.safeArea.width / Screen.safeArea.height; @@ -414,6 +437,12 @@ private void UpdateLetterBox() rect.x = (1f - scalewidth) / 2f; } Cam.rect = rect; + + _defaultOrthographicSizeTimesAspect = _defaultOrthographicSize * GetCameraAspect(); + + UpdateScreenResolution(); + _isStaticRatio = true; + GL.Clear(true, true, Color.black); } void OnPreCull() => GL.Clear(true, true, Color.black); diff --git a/nekoyume/Assets/_Scripts/Game/Game.cs b/nekoyume/Assets/_Scripts/Game/Game.cs index 6d03445d4d8..98a8f34bc4c 100644 --- a/nekoyume/Assets/_Scripts/Game/Game.cs +++ b/nekoyume/Assets/_Scripts/Game/Game.cs @@ -1,3 +1,7 @@ +#if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IOS) +#define ENABLE_FIREBASE +#endif + using System; using System.Collections; using System.Collections.Generic; @@ -23,7 +27,6 @@ using Nekoyume.Helper; using Nekoyume.IAPStore; using Nekoyume.L10n; -using Nekoyume.Model.Mail; using Nekoyume.Model.State; using Nekoyume.Pattern; using Nekoyume.State; @@ -38,9 +41,13 @@ using Menu = Nekoyume.UI.Menu; using Random = UnityEngine.Random; #if UNITY_ANDROID +using Nekoyume.Model.Mail; using NineChronicles.ExternalServices.IAPService.Runtime.Models; using UnityEngine.Android; #endif +#if ENABLE_FIREBASE +using NineChronicles.GoogleServices.Firebase.Runtime; +#endif namespace Nekoyume.Game { @@ -235,16 +242,6 @@ protected override void Awake() LocalLayer = new LocalLayer(); LocalLayerActions = new LocalLayerActions(); MainCanvas.instance.InitializeIntro(); - -#if !UNITY_ANDROID - // NOTE: Initialize Analyzer after Load CommandLineOptions, Initialize State - InitializeAnalyzer( - agentAddr: _commandLineOptions.PrivateKey is null - ? null - : PrivateKey.FromString(_commandLineOptions.PrivateKey).ToAddress(), - rpcServerHost: _commandLineOptions.RpcServerHost); - Analyzer.Track("Unity/Started"); -#endif } private IEnumerator Start() @@ -267,15 +264,20 @@ private IEnumerator Start() _commandLineOptions = liveAssetManager.CommandLineOptions; OnLoadCommandlineOptions(); _deepLinkHandler = new DeepLinkHandler(_commandLineOptions.MeadPledgePortalUrl); +#endif - // NOTE: Initialize Analyzer after Load CommandLineOptions, Initialize State +#if ENABLE_FIREBASE + // NOTE: Initialize Firebase. + yield return FirebaseManager.InitializeAsync().ToCoroutine(); +#endif + // NOTE: Initialize Analyzer after load CommandLineOptions, initialize States, + // initialize Firebase Manager. InitializeAnalyzer( agentAddr: _commandLineOptions.PrivateKey is null ? null : PrivateKey.FromString(_commandLineOptions.PrivateKey).ToAddress(), rpcServerHost: _commandLineOptions.RpcServerHost); Analyzer.Track("Unity/Started"); -#endif #if ENABLE_IL2CPP // Because of strict AOT environments, use StaticCompositeResolver for IL2CPP. @@ -429,7 +431,8 @@ private void OnLoadCommandlineOptions() if (debugConsolePrefab != null && _commandLineOptions.IngameDebugConsole) { UnityEngine.Debug.unityLogger.logEnabled = true; - Instantiate(debugConsolePrefab); + Util.IngameDebugConsoleCommands.IngameDebugConsoleObj = Instantiate(debugConsolePrefab); + Util.IngameDebugConsoleCommands.Initailize(); } else { @@ -991,8 +994,15 @@ private IEnumerator CoLogin(Action callback) } else { - var intro = Widget.Find(); - intro.Show(_commandLineOptions.KeyStorePath, _commandLineOptions.PrivateKey); + if (loginPopup.CheckLocalPassphrase()) + { + Widget.Find().Show("UI_LOAD_WORLD", true); + } + else + { + var intro = Widget.Find(); + intro.Show(_commandLineOptions.KeyStorePath, _commandLineOptions.PrivateKey); + } yield return new WaitUntil(() => loginPopup.Login); } @@ -1349,9 +1359,9 @@ private void ReserveWorldbossTicketPush(long currentBlockIndex) private void InitializeAnalyzer( Address? agentAddr = null, - string? rpcServerHost = null) + string rpcServerHost = null) { - var uniqueId = agentAddr?.ToString() ?? null; + var uniqueId = agentAddr?.ToString(); #if UNITY_EDITOR Debug.Log("This is editor mode."); Analyzer = new Analyzer(uniqueId, rpcServerHost); @@ -1378,6 +1388,11 @@ private void InitializeAnalyzer( isTrackable); } + public void ShowCLO() + { + Debug.Log(_commandLineOptions.ToString()); + } + #if UNITY_ANDROID void Update() { diff --git a/nekoyume/Assets/_Scripts/Game/Prologue.cs b/nekoyume/Assets/_Scripts/Game/Prologue.cs index 2b7e9d2b960..73d955c1a4c 100644 --- a/nekoyume/Assets/_Scripts/Game/Prologue.cs +++ b/nekoyume/Assets/_Scripts/Game/Prologue.cs @@ -261,7 +261,7 @@ private IEnumerator CoFenrirFinisher() yield return new WaitWhile(() => Widget.Find().isActiveAndEnabled); yield return StartCoroutine(_fenrir.CoFinisher(new[] {580214, 999999}, new[] {true, true})); yield return new WaitForSeconds(1f); - Time.timeScale = 1f; + Time.timeScale = 1.25f; _fenrir.Animator.Idle(); } } diff --git a/nekoyume/Assets/_Scripts/Game/RaidCamera.cs b/nekoyume/Assets/_Scripts/Game/RaidCamera.cs index 380226bff36..0ec4b9a1cff 100644 --- a/nekoyume/Assets/_Scripts/Game/RaidCamera.cs +++ b/nekoyume/Assets/_Scripts/Game/RaidCamera.cs @@ -88,6 +88,7 @@ public struct ShakeData : _cam = GetComponent(); public bool InPrologue = false; + private bool _isStaticRatio; #region Mono @@ -118,20 +119,42 @@ public void Shake() private void InitScreenResolution() { - _defaultAspect = (float) referenceResolution.x / referenceResolution.y; - _defaultOrthographicSize = Cam.orthographicSize; - #if UNITY_ANDROID - UpdateLetterBox(); + UpdateStaticRatioWithLetterBox(); +#else + UpdateDynamicRatio(); #endif + } - _defaultOrthographicSizeTimesAspect = _defaultOrthographicSize * GetCameraAspect(); + public void ChangeRatioState() + { + if (_isStaticRatio) + { + UpdateDynamicRatio(); + } + else + { + UpdateStaticRatioWithLetterBox(); + } + } + private void UpdateDynamicRatio() + { + _defaultAspect = (float)referenceResolution.x / referenceResolution.y; + _defaultOrthographicSize = Cam.orthographicSize; + Cam.aspect = Screen.safeArea.width / Screen.safeArea.height; + Cam.rect = new Rect(0, 0, 1, 1); + _defaultOrthographicSizeTimesAspect = _defaultOrthographicSize * GetCameraAspect(); UpdateScreenResolution(); + _isStaticRatio = false; + GL.Clear(true, true, Color.black); } - private void UpdateLetterBox() + private void UpdateStaticRatioWithLetterBox() { + _defaultAspect = (float)referenceResolution.x / referenceResolution.y; + _defaultOrthographicSize = Cam.orthographicSize; + float fixedAspectRatio = _defaultAspect; Cam.aspect = _defaultAspect; float currentAspectRatio = Screen.safeArea.width / Screen.safeArea.height; @@ -150,6 +173,12 @@ private void UpdateLetterBox() rect.x = (1f - scalewidth) / 2f; } Cam.rect = rect; + + _defaultOrthographicSizeTimesAspect = _defaultOrthographicSize * GetCameraAspect(); + + UpdateScreenResolution(); + _isStaticRatio = true; + GL.Clear(true, true, Color.black); } void OnPreCull() => GL.Clear(true, true, Color.black); diff --git a/nekoyume/Assets/_Scripts/Game/Stage.cs b/nekoyume/Assets/_Scripts/Game/Stage.cs index e0c166d5416..e21db5e1486 100644 --- a/nekoyume/Assets/_Scripts/Game/Stage.cs +++ b/nekoyume/Assets/_Scripts/Game/Stage.cs @@ -316,7 +316,6 @@ private IEnumerator CoPlayStage(BattleLog log) Game.instance.IsInWorld = true; yield return StartCoroutine(CoStageEnter(log)); - HelpTooltip.HelpMe(100005, true); foreach (var e in log) { yield return StartCoroutine(e.CoExecute(this)); @@ -586,9 +585,7 @@ private IEnumerator CoStageEnd(BattleLog log) } else if (_battleResultModel.ActionPointNotEnough) { - _battleResultModel.NextState = StageType == StageType.EventDungeon - ? BattleResultPopup.NextState.None - : BattleResultPopup.NextState.GoToMain; + _battleResultModel.NextState = BattleResultPopup.NextState.None; } else if (isClear) { diff --git a/nekoyume/Assets/_Scripts/Game/Util/IngameDebugConsoleCommands.cs b/nekoyume/Assets/_Scripts/Game/Util/IngameDebugConsoleCommands.cs new file mode 100644 index 00000000000..d3e8ed7f36d --- /dev/null +++ b/nekoyume/Assets/_Scripts/Game/Util/IngameDebugConsoleCommands.cs @@ -0,0 +1,40 @@ +using IngameDebugConsole; +using UnityEngine; +using Cysharp.Threading.Tasks; + +namespace Nekoyume.Game.Util +{ + public class IngameDebugConsoleCommands + { + public static GameObject IngameDebugConsoleObj; + public static void Initailize() + { + DebugLogConsole.AddCommand("screen", "Change Screen Ratio State ", () => + { + ActionCamera.instance.ChangeRatioState(); + var raidCam = Component.FindObjectOfType(); + if (raidCam != null) + raidCam.ChangeRatioState(); + + ClearScreen().Forget(); + async UniTaskVoid ClearScreen() + { + if(IngameDebugConsoleObj != null) + { + var blackClearingImg = IngameDebugConsoleObj.transform.Find("BlackClearingImg"); + if(blackClearingImg != null) + { + blackClearingImg.gameObject.SetActive(true); + await UniTask.WaitForEndOfFrame(); + blackClearingImg.gameObject.SetActive(false); + } + } + } + }); + + DebugLogConsole.AddCommand("clo","show current commandline option", ()=>{ + Game.instance.ShowCLO(); + }); + } + } +} diff --git a/nekoyume/Assets/_Scripts/Game/Util/IngameDebugConsoleCommands.cs.meta b/nekoyume/Assets/_Scripts/Game/Util/IngameDebugConsoleCommands.cs.meta new file mode 100644 index 00000000000..28f7e1fcfe7 --- /dev/null +++ b/nekoyume/Assets/_Scripts/Game/Util/IngameDebugConsoleCommands.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3e22231513b0d7841bdc99421c65a819 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/_Scripts/Helper/CommandLineParser.cs b/nekoyume/Assets/_Scripts/Helper/CommandLineParser.cs index d3339c5f05d..1aa5a2d59ff 100644 --- a/nekoyume/Assets/_Scripts/Helper/CommandLineParser.cs +++ b/nekoyume/Assets/_Scripts/Helper/CommandLineParser.cs @@ -8,6 +8,7 @@ using System.Text.Json.Serialization; using UnityEngine; using System.Runtime.InteropServices; +using System.Reflection; namespace Nekoyume.Helper { @@ -427,6 +428,39 @@ public bool IngameDebugConsole } } + public override string ToString() + { + string result = ""; + IEnumerable properties = GetType().GetProperties(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic); + + foreach (PropertyInfo property in properties) + { + OptionAttribute optAttr = Attribute.GetCustomAttribute(property, typeof(OptionAttribute)) as OptionAttribute; + if (optAttr != null && property.GetValue(this) != null) + { + + if (property.PropertyType.ToString() == "System.Collections.Generic.IEnumerable`1[System.String]") + { + string[] value = property.GetValue(this) as string[]; + + if (value.Length == 0) + continue; + + result += $"[{optAttr.LongName}]\n"; + foreach (var item in value) + { + result += $" {item}\n"; + } + } + else + { + result += $"[{optAttr.LongName}] {property.GetValue(this)}\n"; + } + } + } + return result; + } + public static CommandLineOptions Load(string localPath) { var options = CommandLineParser.GetCommandLineOptions(); diff --git a/nekoyume/Assets/_Scripts/Helper/Util.cs b/nekoyume/Assets/_Scripts/Helper/Util.cs index 65cc0e591a1..ade43b3513f 100644 --- a/nekoyume/Assets/_Scripts/Helper/Util.cs +++ b/nekoyume/Assets/_Scripts/Helper/Util.cs @@ -1,12 +1,15 @@ using System; using System.Collections.Generic; using System.Globalization; +using System.IO; using System.Linq; +using System.Security.Cryptography; using System.Text; using System.Threading.Tasks; using Bencodex.Types; using Cysharp.Threading.Tasks; using Lib9c.Model.Order; +using Libplanet.KeyStore; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Game.LiveAsset; @@ -17,7 +20,10 @@ using Nekoyume.TableData; using Org.BouncyCastle.Crypto.Digests; using UnityEngine; +using ZXing; +using ZXing.QrCode; using Inventory = Nekoyume.Model.Item.Inventory; +using FormatException = System.FormatException; namespace Nekoyume.Helper { @@ -415,5 +421,101 @@ public static void TryGetAppProtocolVersionFromToken(string token, out int apv) apv = version; } + + public static string AesEncrypt(string plainText) + { + using Aes aesAlg = Aes.Create(); + using SHA256 sha256 = SHA256.Create(); + aesAlg.Key = sha256.ComputeHash(Encoding.UTF8.GetBytes(SystemInfo.deviceUniqueIdentifier)); + byte[] iv = new byte[16]; + Array.Copy(aesAlg.Key, iv, 16); + aesAlg.IV = iv; + + ICryptoTransform encryptor = aesAlg.CreateEncryptor(aesAlg.Key, aesAlg.IV); + + using var msEncrypt = new System.IO.MemoryStream(); + using var csEncrypt = new CryptoStream(msEncrypt, encryptor, CryptoStreamMode.Write); + using (var swEncrypt = new System.IO.StreamWriter(csEncrypt)) + { + swEncrypt.Write(plainText); + } + + return Convert.ToBase64String(msEncrypt.ToArray()); + } + + public static string AesDecrypt(string encryptedText) + { + string result = string.Empty; + try { + using Aes aesAlg = Aes.Create(); + using SHA256 sha256 = SHA256.Create(); + aesAlg.Key = sha256.ComputeHash(Encoding.UTF8.GetBytes(SystemInfo.deviceUniqueIdentifier)); + byte[] iv = new byte[16]; + Array.Copy(aesAlg.Key, iv, 16); + aesAlg.IV = iv; + + ICryptoTransform decryptor = aesAlg.CreateDecryptor(aesAlg.Key, aesAlg.IV); + + using var msDecrypt = new System.IO.MemoryStream(Convert.FromBase64String(encryptedText)); + using var csDecrypt = new CryptoStream(msDecrypt, decryptor, CryptoStreamMode.Read); + using var srDecrypt = new System.IO.StreamReader(csDecrypt); + result = srDecrypt.ReadToEnd(); + } + catch + { + return result; + } + return result; + } + + public static string GetKeystoreJson() + { + IKeyStore store; + + if (Platform.IsMobilePlatform()) + { + string dataPath = Platform.GetPersistentDataPath("keystore"); + store = new Web3KeyStore(dataPath); + } + else + { + store = Web3KeyStore.DefaultKeyStore; + } + + if (!store.ListIds().Any()) + { + return string.Empty; + } + + var ppk = store.Get(store.ListIds().First()); + var stream = new MemoryStream(); + ppk.WriteJson(stream); + return Encoding.ASCII.GetString(stream.ToArray()); + } + + public static Texture2D GetQrCodePngFromKeystore() + { + var json = GetKeystoreJson(); + if (string.IsNullOrEmpty(json)) + { + return null; + } + + var writer = new BarcodeWriter + { + Format = BarcodeFormat.QR_CODE, + Options = new QrCodeEncodingOptions + { + Width = 400, + Height = 400, + }, + }; + + var encoded = new Texture2D(400, 400); + var res = writer.Write(json); + encoded.SetPixels32(res); + + return encoded; + } } } diff --git a/nekoyume/Assets/_Scripts/Nekoyume.asmdef b/nekoyume/Assets/_Scripts/Nekoyume.asmdef index f6ba44ed566..de5418be45d 100644 --- a/nekoyume/Assets/_Scripts/Nekoyume.asmdef +++ b/nekoyume/Assets/_Scripts/Nekoyume.asmdef @@ -37,7 +37,9 @@ "GUID:d0bf1e9f644394e1de13e6ae02458b07", "GUID:94e1de2458b07d0bf1e9f13e6ae06443", "GUID:7bb1ee73ebb9f114188944f67b1333d6", - "GUID:3de88c88fbbb8f944b9210d496af9762" + "GUID:3de88c88fbbb8f944b9210d496af9762", + "GUID:9f261155ae25749798db4f4b1777332c", + "GUID:2ace7ebb826df10459d12b4f3c4a9407" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/nekoyume/Assets/_Scripts/UI/Module/Lobby/MainMenu.cs b/nekoyume/Assets/_Scripts/UI/Module/Lobby/MainMenu.cs index f09a7875811..5045c9a0720 100644 --- a/nekoyume/Assets/_Scripts/UI/Module/Lobby/MainMenu.cs +++ b/nekoyume/Assets/_Scripts/UI/Module/Lobby/MainMenu.cs @@ -95,10 +95,8 @@ private bool PointEnterTrigger() { if (!IsUnlocked) { - if (_cat) - { - _cat.Hide(); - } + var tooltip = Widget.Find(); + tooltip.HideAll(false); _cat = Widget.Find() .Show(true, _messageForCat, gameObject); @@ -115,6 +113,7 @@ private bool PointExitTrigger() } else { +#if !UNITY_ANDROID if (!_cat) { return IsUnlocked; @@ -122,6 +121,7 @@ private bool PointExitTrigger() _cat.Hide(); _cat = null; +#endif } return IsUnlocked; diff --git a/nekoyume/Assets/_Scripts/UI/Tutorial/TutorialController.cs b/nekoyume/Assets/_Scripts/UI/Tutorial/TutorialController.cs index d0d9b7df2eb..006d3db8e19 100644 --- a/nekoyume/Assets/_Scripts/UI/Tutorial/TutorialController.cs +++ b/nekoyume/Assets/_Scripts/UI/Tutorial/TutorialController.cs @@ -104,7 +104,6 @@ private void Play(int id) _tutorial.gameObject.SetActive(false); WidgetHandler.Instance.IsActiveTutorialMaskWidget = false; }); - HelpTooltip.HelpMe(100001, true); } } diff --git a/nekoyume/Assets/_Scripts/UI/Tween/HoverScaleTweener.cs b/nekoyume/Assets/_Scripts/UI/Tween/HoverScaleTweener.cs index 74cf826d731..2a3e9e603d5 100644 --- a/nekoyume/Assets/_Scripts/UI/Tween/HoverScaleTweener.cs +++ b/nekoyume/Assets/_Scripts/UI/Tween/HoverScaleTweener.cs @@ -15,8 +15,8 @@ public class HoverScaleTweener : MonoBehaviour [SerializeField] private RectTransform target; - private ObservablePointerEnterTrigger _enterTrigger; - private ObservablePointerExitTrigger _exitTrigger; + private ObservableEventTrigger _enterTrigger; + private ObservableEventTrigger _exitTrigger; private Func _onPointerEnter; private Func _onPointerExit; @@ -32,8 +32,7 @@ public class HoverScaleTweener : MonoBehaviour private void Awake() { _originLocalScale = target.localScale; - _enterTrigger = gameObject.AddComponent(); - _exitTrigger = gameObject.AddComponent(); + _enterTrigger = gameObject.AddComponent(); } private void OnEnable() @@ -42,7 +41,7 @@ private void OnEnable() _enterTrigger.OnPointerEnterAsObservable() .Subscribe(OnPointerEnter) .AddTo(_disposables); - _exitTrigger.OnPointerExitAsObservable() + _enterTrigger.OnPointerExitAsObservable() .Subscribe(OnPointerExit) .AddTo(_disposables); } diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Base/Widget.cs b/nekoyume/Assets/_Scripts/UI/Widget/Base/Widget.cs index 30991280896..6e084896d69 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/Base/Widget.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/Base/Widget.cs @@ -460,6 +460,13 @@ protected virtual void OnCompleteOfCloseAnimationInternal() private void CheckInput() { +#if UNITY_ANDROID + if (Input.anyKeyDown) + { + WidgetHandler.Instance.HideAllMessageCat(); + } +#endif + if (!CanHandleInputEvent) { return; @@ -483,7 +490,6 @@ private void CheckInput() if (Input.GetKeyDown(KeyCode.Return)) { - WidgetHandler.Instance.HideAllMessageCat(); SubmitWidget?.Invoke(); } } diff --git a/nekoyume/Assets/_Scripts/UI/Widget/BattlePreparation.cs b/nekoyume/Assets/_Scripts/UI/Widget/BattlePreparation.cs index 4c54af96b31..acd68d5a210 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/BattlePreparation.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/BattlePreparation.cs @@ -213,7 +213,6 @@ public void Show( startButton.gameObject.SetActive(true); startButton.Interactable = true; coverToBlockClick.SetActive(false); - ShowHelpTooltip(_stageType); switch (_stageType) { @@ -688,24 +687,6 @@ private static int GetBoostMaxCount(int stageId) return maxActionPoint / stage.CostAP; } - private static void ShowHelpTooltip(StageType stageType) - { - switch (stageType) - { - case StageType.HackAndSlash: - HelpTooltip.HelpMe(100004, true); - break; - case StageType.Mimisbrunnr: - HelpTooltip.HelpMe(100020, true); - break; - case StageType.EventDungeon: - // ignore. - break; - default: - throw new ArgumentOutOfRangeException(nameof(stageType), stageType, null); - } - } - private bool CheckEquipmentElementalType() { var (equipments, _) = States.Instance.GetEquippedItems(BattleType.Adventure); diff --git a/nekoyume/Assets/_Scripts/UI/Widget/CombinationMain.cs b/nekoyume/Assets/_Scripts/UI/Widget/CombinationMain.cs index ed933d746d1..2ef74ff431a 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/CombinationMain.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/CombinationMain.cs @@ -93,7 +93,6 @@ public override void Show(bool ignoreShowAnimation = false) AudioController.instance.PlayMusic(musicName); } - HelpTooltip.HelpMe(100007, true); StartCoroutine(speechBubble.CoShowText(true)); } diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Craft.cs b/nekoyume/Assets/_Scripts/UI/Widget/Craft.cs index f5d3e3f2cd7..19d23ee63c2 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/Craft.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/Craft.cs @@ -266,11 +266,6 @@ public void ShowWithToggleIndex(int toggleIndex, bool ignoreShowAnimation = fals break; } - if (!Game.Game.instance.Stage.TutorialController.IsPlaying) - { - HelpTooltip.HelpMe(100016, true); - } - if (!AudioController.instance.CurrentPlayingMusicName .Equals(AudioController.MusicCode.Combination)) { diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Enhancement.cs b/nekoyume/Assets/_Scripts/UI/Widget/Enhancement.cs index 7b1291744fc..e0e9505ce65 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/Enhancement.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/Enhancement.cs @@ -127,7 +127,6 @@ public override void Initialize() public override void Show(bool ignoreShowAnimation = false) { Clear(); - HelpTooltip.HelpMe(100017, true); enhancementInventory.Set(ShowItemTooltip, UpdateInformation); base.Show(ignoreShowAnimation); } diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Login.cs b/nekoyume/Assets/_Scripts/UI/Widget/Login.cs index c1611ba1a23..a7e003130c7 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/Login.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/Login.cs @@ -89,12 +89,6 @@ public override void Show(bool ignoreShowAnimation = false) AudioController.instance.PlayMusic(AudioController.MusicCode.SelectCharacter); } - protected override void OnCompleteOfShowAnimationInternal() - { - base.OnCompleteOfShowAnimationInternal(); - HelpTooltip.HelpMe(100000, true); - } - private void ClearPlayers() { foreach (var player in players) diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Menu.cs b/nekoyume/Assets/_Scripts/UI/Widget/Menu.cs index ce1ccf64ff8..61270da2842 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/Menu.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/Menu.cs @@ -13,6 +13,8 @@ using UnityEngine; using Random = UnityEngine.Random; using mixpanel; +using Nekoyume.Action; +using Nekoyume.Blockchain; using Nekoyume.Helper; using Nekoyume.L10n; using Nekoyume.Model.EnumType; @@ -160,6 +162,48 @@ protected override void Awake() .AddTo(gameObject); } + private static void HackAndSlashForTutorial(int stageId) + { + var sheets = Game.Game.instance.TableSheets; + var stageRow = sheets.StageSheet.OrderedList.FirstOrDefault(row => row.Id == stageId); + if (stageRow is null) + { + return; + } + + var requiredCost = stageRow.CostAP; + if (States.Instance.CurrentAvatarState.actionPoint < requiredCost) + { + OneLineSystem.Push( + MailType.System, + L10nManager.Localize("ERROR_ACTION_POINT"), + NotificationCell.NotificationType.Alert); + return; + } + + if (!sheets.WorldSheet.TryGetByStageId(stageId, out var worldRow)) + { + return; + } + + var worldId = worldRow.Id; + + Find().Show(); + Find().UpdateAssets(HeaderMenuStatic.AssetVisibleState.Battle); + + var stage = Game.Game.instance.Stage; + stage.IsExitReserved = false; + var player = stage.GetPlayer(); + player.StartRun(); + ActionCamera.instance.ChaseX(player.transform); + ActionRenderHandler.Instance.Pending = true; + var emptyGuids = new List(); + Game.Game.instance.ActionManager + .HackAndSlash(emptyGuids, emptyGuids, new List(), + new List(), worldId, stageId) + .Subscribe(); + } + private void HackAndSlash(int stageId) { if (TableSheets.Instance.WorldSheet.TryGetByStageId(stageId, out var worldRow) && @@ -644,7 +688,7 @@ private void StopSpeeches() public void TutorialActionHackAndSlash() { - HackAndSlash(GuidedQuest.WorldQuest?.Goal ?? 1); + HackAndSlashForTutorial(GuidedQuest.WorldQuest?.Goal ?? 1); } // Invoke from TutorialController.PlayAction() diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Popup/AvatarInfoPopup.cs b/nekoyume/Assets/_Scripts/UI/Widget/Popup/AvatarInfoPopup.cs index 9e5048178d7..2f696cdf330 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/Popup/AvatarInfoPopup.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/Popup/AvatarInfoPopup.cs @@ -190,7 +190,6 @@ public override void Show(bool ignoreShowAnimation = false) grindModeToggle.isOn = false; information.UpdateInventory(BattleType.Adventure); OnClickPresetTab(adventureButton, BattleType.Adventure, _onToggleCallback[BattleType.Adventure]); - HelpTooltip.HelpMe(100013, true); var avatarState = Game.Game.instance.States.CurrentAvatarState; var isActiveDcc = Dcc.instance.IsVisible(avatarState.address, out var id, out var isVisible); diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Popup/BattleResultPopup.cs b/nekoyume/Assets/_Scripts/UI/Widget/Popup/BattleResultPopup.cs index e2787b8664a..2fbcaf28109 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/Popup/BattleResultPopup.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/Popup/BattleResultPopup.cs @@ -91,6 +91,7 @@ public struct RewardsArea public struct DefeatTextArea { public GameObject root; + public TextMeshProUGUI worldStageId; public TextMeshProUGUI defeatText; public TextMeshProUGUI expText; } @@ -397,7 +398,6 @@ public void Show(Model model, bool isBoosted) nextButton.gameObject.SetActive(false); UpdateView(isBoosted); - HelpTooltip.HelpMe(100006, true); } public override void Close(bool ignoreCloseAnimation = false) @@ -505,6 +505,11 @@ private void UpdateViewAsDefeat(BattleLog.Result result) key = "UI_BATTLE_RESULT_TIMEOUT_MESSAGE"; } + var stageText = StageInformation.GetStageIdString( + SharedModel.StageType, + SharedModel.StageID, + true); + defeatTextArea.worldStageId.text = $"{SharedModel.WorldName} {stageText}"; defeatTextArea.defeatText.text = L10nManager.Localize(key); defeatTextArea.expText.text = $"EXP + {SharedModel.Exp}"; bottomText.enabled = false; @@ -607,6 +612,11 @@ private IEnumerator CoUpdateBottom(int limitSeconds) repeatButton.gameObject.SetActive(value); repeatButton.interactable = value; } + else + { + stagePreparationButton.gameObject.SetActive(true); + stagePreparationButton.interactable = true; + } if (!SharedModel.IsEndStage && isActionPointEnough && SharedModel.IsClear) { @@ -618,9 +628,7 @@ private IEnumerator CoUpdateBottom(int limitSeconds) { case NextState.GoToMain: SubmitWidget = closeButton.onClick.Invoke; - fullFormat = SharedModel.ActionPointNotEnough - ? L10nManager.Localize("UI_BATTLE_RESULT_NOT_ENOUGH_ACTION_POINT_FORMAT") - : L10nManager.Localize("UI_BATTLE_EXIT_FORMAT"); + fullFormat = L10nManager.Localize("UI_BATTLE_EXIT_FORMAT"); break; case NextState.RepeatStage: SubmitWidget = repeatButton.onClick.Invoke; @@ -631,7 +639,9 @@ private IEnumerator CoUpdateBottom(int limitSeconds) fullFormat = L10nManager.Localize("UI_BATTLE_RESULT_NEXT_STAGE_FORMAT"); break; default: - bottomText.text = string.Empty; + bottomText.text = SharedModel.ActionPointNotEnough + ? L10nManager.Localize("UI_BATTLE_RESULT_NOT_ENOUGH_ACTION_POINT") + : string.Empty; yield break; } diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Popup/ChatPopup.cs b/nekoyume/Assets/_Scripts/UI/Widget/Popup/ChatPopup.cs index 7372bfa06b7..3f600f0cd8e 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/Popup/ChatPopup.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/Popup/ChatPopup.cs @@ -13,7 +13,6 @@ public override void Initialize() confirm.onClick.AddListener(() => { Application.OpenURL(GameConfig.DiscordLink); - HelpTooltip.HelpMe(100012, true); Close(true); }); @@ -30,7 +29,6 @@ protected override void OnEnable() SubmitWidget = () => { Application.OpenURL(GameConfig.DiscordLink); - HelpTooltip.HelpMe(100012, true); Close(true); }; diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Popup/CombinationSlotsPopup.cs b/nekoyume/Assets/_Scripts/UI/Widget/Popup/CombinationSlotsPopup.cs index 7de7b4124de..369c57c7d95 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/Popup/CombinationSlotsPopup.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/Popup/CombinationSlotsPopup.cs @@ -53,7 +53,6 @@ public override void Show(bool ignoreShowAnimation = false) { base.Show(ignoreShowAnimation); UpdateSlots(Game.Game.instance.Agent.BlockIndex); - HelpTooltip.HelpMe(100008, true); } public override void Close(bool ignoreCloseAnimation = false) diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Popup/DialogPopup.cs b/nekoyume/Assets/_Scripts/UI/Widget/Popup/DialogPopup.cs index 8d218b338cb..c6f27b55cfd 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/Popup/DialogPopup.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/Popup/DialogPopup.cs @@ -15,7 +15,7 @@ namespace Nekoyume.UI { public class DialogPopup : PopupWidget { - public float textInterval = 0.06f; + public float textInterval = 0.03f; public Color itemTextColor; private const string TimerFormat = "({0})"; diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Popup/MailPopup.cs b/nekoyume/Assets/_Scripts/UI/Widget/Popup/MailPopup.cs index 50616bec531..ca7d4e7c8d6 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/Popup/MailPopup.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/Popup/MailPopup.cs @@ -278,7 +278,6 @@ public override void Show(bool ignoreShowAnimation = false) ChangeState(0); UpdateTabs(); base.Show(ignoreShowAnimation); - HelpTooltip.HelpMe(100010, true); } #endregion diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Popup/QuestPopup.cs b/nekoyume/Assets/_Scripts/UI/Widget/Popup/QuestPopup.cs index 01187b42e30..310c60e52b3 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/Popup/QuestPopup.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/Popup/QuestPopup.cs @@ -66,7 +66,6 @@ public override void Show(bool ignoreShowAnimation = false) ChangeState(0); DoneScrollAnimation(); base.Show(ignoreShowAnimation); - HelpTooltip.HelpMe(100011, true); } #endregion diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Popup/SettingPopup.cs b/nekoyume/Assets/_Scripts/UI/Widget/Popup/SettingPopup.cs index f08bd2f8105..8389786b731 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/Popup/SettingPopup.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/Popup/SettingPopup.cs @@ -13,6 +13,7 @@ using TimeSpan = System.TimeSpan; using Nekoyume.UI.Scroller; + namespace Nekoyume.UI { public class SettingPopup : PopupWidget @@ -96,6 +97,9 @@ public class SettingPopup : PopupWidget [SerializeField] private Image pushDisabledImage; + [SerializeField] + private Button addressShareButton; + [SerializeField] private List mobileDisabledMenus; @@ -133,6 +137,9 @@ protected override void Awake() NotificationCell.NotificationType.Notification)) .AddTo(addressCopyButton); + addressShareButton.OnClickAsObservable().Subscribe(_ => SharePrivateKeyToQRCode()) + .AddTo(addressShareButton); + privateKeyCopyButton.OnClickAsObservable().Subscribe(_ => CopyPrivateKeyToClipboard()) .AddTo(privateKeyCopyButton); @@ -230,7 +237,6 @@ public override void Show(bool ignoreStartAnimation = false) worldbossPushToggle.isOn = settings.isWorldbossPushEnabled; base.Show(true); - HelpTooltip.HelpMe(100014, true); #if UNITY_ANDROID || UNITY_IOS foreach (var menu in mobileEnabledMenus) @@ -290,6 +296,14 @@ private void CopyPrivateKeyToClipboard() // todo: 복사되었습니다. 토스트. } + + private void SharePrivateKeyToQRCode() + { + new NativeShare().AddFile(Util.GetQrCodePngFromKeystore(), "shareQRImg.png") + .SetSubject(L10nManager.Localize("UI_SHARE_QR_TITLE")) + .SetText(L10nManager.Localize("UI_SHARE_QR_CONTENT")) + .Share(); + } private void SetVolumeMaster(float value) { diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Screen/IntroScreen.cs b/nekoyume/Assets/_Scripts/UI/Widget/Screen/IntroScreen.cs index a1a63fdfa6b..88d1e5504bd 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/Screen/IntroScreen.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/Screen/IntroScreen.cs @@ -36,6 +36,7 @@ public class IntroScreen : LoadingScreen [SerializeField] private LoadingIndicator mobileIndicator; [SerializeField] private VideoPlayer videoPlayer; + [SerializeField] private Button videoSkipButton; private int _guideIndex = 0; private const int GuideCount = 3; @@ -52,6 +53,7 @@ protected override void Awake() mobileIndicator.Close(); videoPlayer.loopPointReached += _ => OnVideoEnd(); + videoSkipButton.onClick.AddListener(OnVideoEnd); startButton.onClick.AddListener(() => { @@ -80,6 +82,7 @@ protected override void Awake() startButton.interactable = true; signinButton.interactable = true; qrCodeGuideNextButton.interactable = true; + videoSkipButton.interactable = true; GetGuestPrivateKey(); } @@ -109,16 +112,21 @@ private IEnumerator CoShowMobile() yield return new WaitForSeconds(2); // PlayerPrefs FirstPlay - if (PlayerPrefs.GetInt("FirstPlay", 0) == 0) - { - PlayerPrefs.SetInt("FirstPlay", 1); - PlayerPrefs.Save(); - - videoImage.gameObject.SetActive(true); - videoPlayer.Play(); - Analyzer.Instance.Track("Unity/Intro/Video/Start"); - } - else + // if (PlayerPrefs.GetInt("FirstPlay", 0) == 0) + // { + // PlayerPrefs.SetInt("FirstPlay", 1); + // PlayerPrefs.Save(); + // + // videoImage.gameObject.SetActive(true); + // videoSkipButton.gameObject.SetActive(false); + // videoPlayer.Play(); + // Analyzer.Instance.Track("Unity/Intro/Video/Start"); + // + // yield return new WaitForSeconds(5); + // + // videoSkipButton.gameObject.SetActive(true); + // } + // else { AudioController.instance.PlayMusic(AudioController.MusicCode.Title); } diff --git a/nekoyume/Assets/_Scripts/UI/Widget/ShopBuy.cs b/nekoyume/Assets/_Scripts/UI/Widget/ShopBuy.cs index 1741636ddc4..f18bea3fcca 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/ShopBuy.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/ShopBuy.cs @@ -100,7 +100,6 @@ private async void ShowAsync(bool ignoreShowAnimation = false) ReactiveShopState.BuyItemProducts, ReactiveShopState.BuyFungibleAssetProducts, ShowItemTooltip); - HelpTooltip.HelpMe(100018, true); AudioController.instance.PlayMusic(AudioController.MusicCode.Shop); Find().Close(); } diff --git a/nekoyume/Assets/_Scripts/UI/Widget/StageInformation.cs b/nekoyume/Assets/_Scripts/UI/Widget/StageInformation.cs index 3d5ad5ed56a..703ff8e3560 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/StageInformation.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/StageInformation.cs @@ -162,7 +162,6 @@ public void Show( base.Show(true); world.ShowByStageId(_sharedViewModel.SelectedStageId.Value, questStageId); - HelpTooltip.HelpMe(100003, true); } public void Show( @@ -386,8 +385,7 @@ public static string GetStageIdString( switch (stageType) { case StageType.HackAndSlash: - return stageId.ToString() - .ToString(CultureInfo.InvariantCulture); + return stageId.ToString(CultureInfo.InvariantCulture); case StageType.Mimisbrunnr: var enter = isTitle ? string.Empty : "\n"; return $"{enter}{stageId % 10000000}"; diff --git a/nekoyume/Assets/_Scripts/UI/Widget/System/LoginSystem.cs b/nekoyume/Assets/_Scripts/UI/Widget/System/LoginSystem.cs index 8b19c16c407..9762bccba9c 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/System/LoginSystem.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/System/LoginSystem.cs @@ -278,6 +278,28 @@ public void CheckRetypePassphrase(string text) } } + public bool CheckLocalPassphrase() + { + if (Platform.IsMobilePlatform()) + { + try + { + _privateKey = CheckPrivateKey(KeyStore, GetPassPhrase()); + if (_privateKey != null) + { + Login = true; + return true; + } + } + catch + { + return false; + } + } + + return false; + } + private bool CheckPasswordVaildInCreate() { var passPhrase = passPhraseField.text; @@ -286,6 +308,16 @@ private bool CheckPasswordVaildInCreate() passPhrase == retyped && CheckPassWord(passPhrase); } + private void SetPassPhrase(string passPhrase) + { + PlayerPrefs.SetString("LOCAL_PASSPHRASE", Helper.Util.AesEncrypt(passPhrase)); + } + + private string GetPassPhrase() + { + return Helper.Util.AesDecrypt(PlayerPrefs.GetString("LOCAL_PASSPHRASE", string.Empty)); + } + private void CheckLogin(System.Action success) { try @@ -301,6 +333,10 @@ private void CheckLogin(System.Action success) var login = _privateKey is not null; if (login) { + if (Platform.IsMobilePlatform()) + { + SetPassPhrase(loginField.text); + } success?.Invoke(); } else diff --git a/nekoyume/Assets/_Scripts/UI/Widget/WorldMap.cs b/nekoyume/Assets/_Scripts/UI/Widget/WorldMap.cs index 3965bdd41b6..54ed8d75f2d 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/WorldMap.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/WorldMap.cs @@ -165,7 +165,6 @@ public void Show(WorldInformation worldInformation, bool blockWorldUnlockPopup = var status = Find(); status.Close(true); Show(true); - HelpTooltip.HelpMe(100002, true); if (!blockWorldUnlockPopup) { diff --git a/nekoyume/ProjectSettings/AndroidResolverDependencies.xml b/nekoyume/ProjectSettings/AndroidResolverDependencies.xml new file mode 100644 index 00000000000..038d2cfe539 --- /dev/null +++ b/nekoyume/ProjectSettings/AndroidResolverDependencies.xml @@ -0,0 +1,82 @@ + + + com.google.android.gms:play-services-base:18.2.0 + com.google.firebase:firebase-analytics:21.3.0 + com.google.firebase:firebase-analytics-unity:11.3.0 + com.google.firebase:firebase-app-unity:11.3.0 + com.google.firebase:firebase-common:20.3.3 + + + Assets/Plugins/Android/androidx.annotation.annotation-1.5.0.jar + Assets/Plugins/Android/androidx.arch.core.core-common-2.0.0.jar + Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.0.aar + Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar + Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar + Assets/Plugins/Android/androidx.concurrent.concurrent-futures-1.1.0.jar + Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar + Assets/Plugins/Android/androidx.core.core-1.2.0.aar + Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar + Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar + Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar + Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar + Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar + Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar + Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar + Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar + Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar + Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar + Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar + Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar + Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar + Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar + Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar + Assets/Plugins/Android/androidx.print.print-1.0.0.aar + Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar + Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar + Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar + Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar + Assets/Plugins/Android/com.google.android.gms.play-services-ads-identifier-18.0.0.aar + Assets/Plugins/Android/com.google.android.gms.play-services-base-18.2.0.aar + Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.1.0.aar + Assets/Plugins/Android/com.google.android.gms.play-services-measurement-21.3.0.aar + Assets/Plugins/Android/com.google.android.gms.play-services-measurement-api-21.3.0.aar + Assets/Plugins/Android/com.google.android.gms.play-services-measurement-base-21.3.0.aar + Assets/Plugins/Android/com.google.android.gms.play-services-measurement-impl-21.3.0.aar + Assets/Plugins/Android/com.google.android.gms.play-services-measurement-sdk-21.3.0.aar + Assets/Plugins/Android/com.google.android.gms.play-services-measurement-sdk-api-21.3.0.aar + Assets/Plugins/Android/com.google.android.gms.play-services-stats-17.0.2.aar + Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.2.aar + Assets/Plugins/Android/com.google.errorprone.error_prone_annotations-2.9.0.jar + Assets/Plugins/Android/com.google.firebase.firebase-analytics-21.3.0.aar + Assets/Plugins/Android/com.google.firebase.firebase-analytics-unity-11.3.0.aar + Assets/Plugins/Android/com.google.firebase.firebase-annotations-16.2.0.jar + Assets/Plugins/Android/com.google.firebase.firebase-app-unity-11.3.0.aar + Assets/Plugins/Android/com.google.firebase.firebase-common-20.3.3.aar + Assets/Plugins/Android/com.google.firebase.firebase-components-17.1.0.aar + Assets/Plugins/Android/com.google.firebase.firebase-installations-17.0.1.aar + Assets/Plugins/Android/com.google.firebase.firebase-installations-interop-17.0.1.aar + Assets/Plugins/Android/com.google.firebase.firebase-measurement-connector-19.0.0.aar + Assets/Plugins/Android/com.google.guava.listenablefuture-1.0.jar + Assets/Plugins/Android/javax.inject.javax.inject-1.jar + Assets/Plugins/Android/org.jetbrains.annotations-13.0.jar + Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-1.7.10.jar + Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-common-1.7.10.jar + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nekoyume/ProjectSettings/GvhProjectSettings.xml b/nekoyume/ProjectSettings/GvhProjectSettings.xml new file mode 100644 index 00000000000..fd361a11932 --- /dev/null +++ b/nekoyume/ProjectSettings/GvhProjectSettings.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/nekoyume/ProjectSettings/ProjectSettings.asset b/nekoyume/ProjectSettings/ProjectSettings.asset index bd947378593..1a79904dc72 100644 --- a/nekoyume/ProjectSettings/ProjectSettings.asset +++ b/nekoyume/ProjectSettings/ProjectSettings.asset @@ -136,7 +136,7 @@ PlayerSettings: 16:10: 0 16:9: 1 Others: 0 - bundleVersion: 0.0.17 + bundleVersion: 30.0.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -165,7 +165,7 @@ PlayerSettings: iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 1 - AndroidBundleVersionCode: 18 + AndroidBundleVersionCode: 20 AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 33 AndroidPreferredInstallLocation: 2 diff --git a/nekoyume/ProjectSettings/QualitySettings.asset b/nekoyume/ProjectSettings/QualitySettings.asset index 465179bd58a..600150a1089 100644 --- a/nekoyume/ProjectSettings/QualitySettings.asset +++ b/nekoyume/ProjectSettings/QualitySettings.asset @@ -227,3 +227,4 @@ QualitySettings: Android: 0 Server: 0 Standalone: 0 + iPhone: 0 diff --git a/nekoyume/ProjectSettings/TimeManager.asset b/nekoyume/ProjectSettings/TimeManager.asset index ca574dcc606..21d6b76750e 100644 --- a/nekoyume/ProjectSettings/TimeManager.asset +++ b/nekoyume/ProjectSettings/TimeManager.asset @@ -5,5 +5,5 @@ TimeManager: m_ObjectHideFlags: 0 Fixed Timestep: 0.02 Maximum Allowed Timestep: 0.1 - m_TimeScale: 1.15 + m_TimeScale: 1.25 Maximum Particle Timestep: 0.03