diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..12301490 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml new file mode 100644 index 00000000..609ebf03 --- /dev/null +++ b/.github/workflows/ci-windows.yml @@ -0,0 +1,134 @@ +name: CI-Windows + +on: + push: + branches: [ develop ] + +env: + UNITY_EDITOR_BASE_PATH: C:\Program Files\Unity\Hub\Editor + +jobs: + windows: + runs-on: windows-latest + + strategy: + matrix: + unity: + [ + { version: 5.6.7f1, hash: e80cc3114ac1 }, + { version: 2017.4.40f1, hash: 6e14067f8a9a }, + { version: 2018.4.36f1, hash: 6cd387d23174 }, + { version: 2019.4.40f1, hash: ffc62b691db5 }, + { version: 2020.3.37f1, hash: 8c66806a0c04 }, + { version: 2021.3.6f1, hash: 7da38d85baf6 }, + ] + + steps: + - name: Checkout + uses: actions/checkout@v1 + + - name: Setup .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 6.0.x + + - name: Set Unity editor path variable + run: echo "UNITY_EDITOR_PATH=${{ env.UNITY_EDITOR_BASE_PATH }}\${{ matrix.unity.version }}" >> $Env:GITHUB_ENV + shell: pwsh + + - name: Replace UnityVersion value in Directory.Build.Props files + run: | + $filePaths = @( + '_DOTween.Assembly/Directory.Build.Props' + ) + + foreach ($filePath in $filePaths) { + $fileContent = Get-Content $filePath -Encoding UTF8 -Raw + $fileContent = $fileContent -replace '(.*)', '${{ matrix.unity.version }}' + + Set-Content -Encoding UTF8 $filePath -Value $fileContent -NoNewline + + Write-Output "$($filePath): '$fileContent'" + } + shell: pwsh + + - name: Enable Unity Cache Support + id: cache-unity + uses: actions/cache@v3 + with: + key: ${{ runner.os }}-unitycache-${{ matrix.unity.version }} + path: UnityCache + + - name: Download Unity + if: steps.cache-unity.outputs.cache-hit != 'true' + run: bitsadmin /TRANSFER unity /DOWNLOAD /PRIORITY foreground "https://download.unity3d.com/download_unity/${{ matrix.unity.hash }}/Windows64EditorInstaller/UnitySetup64-${{ matrix.unity.version }}.exe" "%CD%\unitysetup.exe" + shell: cmd + + - name: Install Unity + if: steps.cache-unity.outputs.cache-hit != 'true' + run: unitysetup.exe /UI=reduced /S /D=${{ env.UNITY_EDITOR_PATH }} + shell: cmd + + - name: Prepare Managed Cache + if: steps.cache-unity.outputs.cache-hit != 'true' + run: Copy-Item -Path "${{ env.UNITY_EDITOR_PATH }}\Editor\Data\Managed" -Destination "UnityCache\Managed" -Recurse + shell: pwsh + + - name: Prepare MonoBleedingEdge Cache + if: steps.cache-unity.outputs.cache-hit != 'true' + run: Copy-Item -Path "${{ env.UNITY_EDITOR_PATH }}\Editor\Data\MonoBleedingEdge" -Destination "UnityCache\MonoBleedingEdge" -Recurse + shell: pwsh + + - name: Prepare GUISystem Cache + if: ${{ (startsWith(matrix.unity.version, '5.6') || startsWith(matrix.unity.version, '2017') || startsWith(matrix.unity.version, '2018') || startsWith(matrix.unity.version, '2019.1') || startsWith(matrix.unity.version, '2019.2')) && steps.cache-unity.outputs.cache-hit != 'true' }} + run: Copy-Item -Path "${{ env.UNITY_EDITOR_PATH }}\Editor\Data\UnityExtensions\Unity\GUISystem" -Destination "UnityCache\GUISystem" -Recurse + shell: pwsh + + - name: Restore Managed Cache + if: steps.cache-unity.outputs.cache-hit == 'true' + run: Copy-Item -Path "UnityCache\Managed" -Destination "${{ env.UNITY_EDITOR_PATH }}\Editor\Data\Managed" -Recurse + shell: pwsh + + - name: Restore MonoBleedingEdge Cache + if: steps.cache-unity.outputs.cache-hit == 'true' + run: Copy-Item -Path "UnityCache\MonoBleedingEdge" -Destination "${{ env.UNITY_EDITOR_PATH }}\Editor\Data\MonoBleedingEdge" -Recurse + shell: pwsh + + - name: Restore GUISystem Cache + if: ${{ (startsWith(matrix.unity.version, '5.6') || startsWith(matrix.unity.version, '2017') || startsWith(matrix.unity.version, '2018') || startsWith(matrix.unity.version, '2019.1') || startsWith(matrix.unity.version, '2019.2')) && steps.cache-unity.outputs.cache-hit == 'true' }} + run: Copy-Item -Path "UnityCache\GUISystem" -Destination "${{ env.UNITY_EDITOR_PATH }}\Editor\Data\UnityExtensions\Unity\GUISystem" -Recurse + shell: pwsh + + - name: Build DOTween + run: dotnet build -c Release _DOTween.Assembly/DOTween/DOTween.csproj + shell: pwsh + + - name: Build DOTweenEditor + run: dotnet build -c Release _DOTween.Assembly/DOTweenEditor/DOTweenEditor.csproj + shell: pwsh + + # UnityEngine.UI.dll can only be referenced up to Unity 2019.2, after that version it does not come installed with the editor. + - name: Build DOTween_LooseScripts + if: ${{ startsWith(matrix.unity.version, '5.6') || startsWith(matrix.unity.version, '2017') || startsWith(matrix.unity.version, '2018') || startsWith(matrix.unity.version, '2019.1') || startsWith(matrix.unity.version, '2019.2') }} + run: dotnet build -c Release _DOTween.Assembly/DOTween_LooseScripts/DOTween_LooseScripts.csproj + shell: pwsh + + - name: Replace if true to false in the modules to use the version defines in package + run: | + foreach ($filePath in [System.IO.Directory]::GetFiles("Package/DOTween/Modules", "*.cs", [System.IO.SearchOption]::TopDirectoryOnly)) { + $fileContent = Get-Content $filePath -Encoding UTF8 -Raw + $fileContent = $fileContent -replace '#if (\(?)true', '#if $1false' + + Set-Content -Encoding UTF8 $filePath -Value $fileContent -NoNewline + + Write-Output "$($filePath): '$fileContent'" + } + shell: pwsh + + - name: Upload package artifact + uses: actions/upload-artifact@v3 + if: ${{ !startsWith(matrix.unity.version, '5.6') && !startsWith(matrix.unity.version, '2017') && !startsWith(matrix.unity.version, '2018') }} + with: + name: Package-${{ matrix.unity.version }} + path: Package + retention-days: 1 diff --git a/.gitignore b/.gitignore index 6da46fc5..fc915c5b 100644 --- a/.gitignore +++ b/.gitignore @@ -55,4 +55,11 @@ biz screenshots zzTemp* -_DOTween.Timeline \ No newline at end of file +_DOTween.Timeline + +Package/**/*.cs +Package/**/*.dll +Package/**/*.dll.mdb +Package/**/*.xml +Package/**/*.jpg +Package/**/*.png \ No newline at end of file diff --git a/Package/DOTween.meta b/Package/DOTween.meta new file mode 100644 index 00000000..bd807adc --- /dev/null +++ b/Package/DOTween.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1c3bcea8ec0d5b24aa9965c3dc158569 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/DOTween.dll.mdb.meta b/Package/DOTween/DOTween.dll.mdb.meta new file mode 100644 index 00000000..60c54dec --- /dev/null +++ b/Package/DOTween/DOTween.dll.mdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8675e32b8ad50a74e83eee86c0f5503d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/DOTween.dll.meta b/Package/DOTween/DOTween.dll.meta new file mode 100644 index 00000000..d97eb5b4 --- /dev/null +++ b/Package/DOTween/DOTween.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: b79603e038c6c12439b661cc1bb71433 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/DOTween.xml.meta b/Package/DOTween/DOTween.xml.meta new file mode 100644 index 00000000..215ae051 --- /dev/null +++ b/Package/DOTween/DOTween.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6246f0bf2867e5c4cacfc3ce7a67d5cf +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/Editor.meta b/Package/DOTween/Editor.meta new file mode 100644 index 00000000..2ee53d51 --- /dev/null +++ b/Package/DOTween/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b242fb4fa664a2546b8792f4932611ab +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/Editor/DOTweenEditor.dll.mdb.meta b/Package/DOTween/Editor/DOTweenEditor.dll.mdb.meta new file mode 100644 index 00000000..5d7cd297 --- /dev/null +++ b/Package/DOTween/Editor/DOTweenEditor.dll.mdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d2c9fa369d29bbe478866b833e9ece80 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/Editor/DOTweenEditor.dll.meta b/Package/DOTween/Editor/DOTweenEditor.dll.meta new file mode 100644 index 00000000..f5387aff --- /dev/null +++ b/Package/DOTween/Editor/DOTweenEditor.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: e4d2c14df1e9d134eb88172d8a3e1a0a +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/Package/DOTween/Editor/DOTweenEditor.xml.meta b/Package/DOTween/Editor/DOTweenEditor.xml.meta new file mode 100644 index 00000000..26a60523 --- /dev/null +++ b/Package/DOTween/Editor/DOTweenEditor.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5850708c48e6f0f41b6001c30b2116b9 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/Editor/DOTweenUpgradeManager.dll.mdb.meta b/Package/DOTween/Editor/DOTweenUpgradeManager.dll.mdb.meta new file mode 100644 index 00000000..ae10f581 --- /dev/null +++ b/Package/DOTween/Editor/DOTweenUpgradeManager.dll.mdb.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 33cc4f404327810468681e36d336861e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/Editor/DOTweenUpgradeManager.dll.meta b/Package/DOTween/Editor/DOTweenUpgradeManager.dll.meta new file mode 100644 index 00000000..a4b7260e --- /dev/null +++ b/Package/DOTween/Editor/DOTweenUpgradeManager.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 5e5e3d6418c75d74a8b01cd0d3aa1bfc +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + 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/Package/DOTween/Editor/DOTweenUpgradeManager.xml.meta b/Package/DOTween/Editor/DOTweenUpgradeManager.xml.meta new file mode 100644 index 00000000..84c514ef --- /dev/null +++ b/Package/DOTween/Editor/DOTweenUpgradeManager.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b9c2989029946ac488da2a9f0b765156 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/Editor/Imgs.meta b/Package/DOTween/Editor/Imgs.meta new file mode 100644 index 00000000..167d4fcb --- /dev/null +++ b/Package/DOTween/Editor/Imgs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e0baa0885fad4e24592b43fe409995ff +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/Editor/Imgs/DOTweenIcon.png.meta b/Package/DOTween/Editor/Imgs/DOTweenIcon.png.meta new file mode 100644 index 00000000..0c8b9467 --- /dev/null +++ b/Package/DOTween/Editor/Imgs/DOTweenIcon.png.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: a1c8d93bd70fa4346b7cc37b9e32efc0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/Editor/Imgs/DOTweenMiniIcon.png.meta b/Package/DOTween/Editor/Imgs/DOTweenMiniIcon.png.meta new file mode 100644 index 00000000..903b4968 --- /dev/null +++ b/Package/DOTween/Editor/Imgs/DOTweenMiniIcon.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 275123f54be7ace4ea29aaf7e5fdcd8c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/Editor/Imgs/Footer.png.meta b/Package/DOTween/Editor/Imgs/Footer.png.meta new file mode 100644 index 00000000..19952cab --- /dev/null +++ b/Package/DOTween/Editor/Imgs/Footer.png.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: 19c5fbf641b241b47bb435f136237b45 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/Editor/Imgs/Footer_dark.png.meta b/Package/DOTween/Editor/Imgs/Footer_dark.png.meta new file mode 100644 index 00000000..8d28d756 --- /dev/null +++ b/Package/DOTween/Editor/Imgs/Footer_dark.png.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: af6883624ea803d43997a9002764a3a3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/Editor/Imgs/Header.jpg.meta b/Package/DOTween/Editor/Imgs/Header.jpg.meta new file mode 100644 index 00000000..77d5012a --- /dev/null +++ b/Package/DOTween/Editor/Imgs/Header.jpg.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: 63373706de76d7f488a3332144af3fec +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/Modules.meta b/Package/DOTween/Modules.meta new file mode 100644 index 00000000..4daf58cd --- /dev/null +++ b/Package/DOTween/Modules.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ff75aa93ec75e4c46be1ad4d94e1d927 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/Modules/DOTween.Modules.asmdef b/Package/DOTween/Modules/DOTween.Modules.asmdef new file mode 100644 index 00000000..ddc80395 --- /dev/null +++ b/Package/DOTween/Modules/DOTween.Modules.asmdef @@ -0,0 +1,35 @@ +{ + "name": "DOTween.Modules", + "rootNamespace": "", + "references": [], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [ + { + "name": "com.unity.modules.audio", + "expression": "", + "define": "AUDIO_DOTWEEN" + }, + { + "name": "com.unity.modules.physics", + "expression": "", + "define": "PHYSICS_DOTWEEN" + }, + { + "name": "com.unity.modules.physics2d", + "expression": "", + "define": "PHYSICS2D_DOTWEEN" + }, + { + "name": "com.unity.ugui", + "expression": "", + "define": "UGUI_DOTWEEN" + } + ], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Package/DOTween/Modules/DOTween.Modules.asmdef.meta b/Package/DOTween/Modules/DOTween.Modules.asmdef.meta new file mode 100644 index 00000000..70b17ea5 --- /dev/null +++ b/Package/DOTween/Modules/DOTween.Modules.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b85a9b696dea92b4f9d0efe8b3f0e5b7 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/Modules/DOTweenModuleAudio.cs.meta b/Package/DOTween/Modules/DOTweenModuleAudio.cs.meta new file mode 100644 index 00000000..9494cbca --- /dev/null +++ b/Package/DOTween/Modules/DOTweenModuleAudio.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b51928c6780ec0045876e55f07760037 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/Modules/DOTweenModuleEPOOutline.cs.meta b/Package/DOTween/Modules/DOTweenModuleEPOOutline.cs.meta new file mode 100644 index 00000000..61e600a7 --- /dev/null +++ b/Package/DOTween/Modules/DOTweenModuleEPOOutline.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0593bbfd991f4df42953184d70e0ad81 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/Modules/DOTweenModulePhysics.cs.meta b/Package/DOTween/Modules/DOTweenModulePhysics.cs.meta new file mode 100644 index 00000000..9321a9f5 --- /dev/null +++ b/Package/DOTween/Modules/DOTweenModulePhysics.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9a7ab48ed4cb5da4bb047ded29094635 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/Modules/DOTweenModulePhysics2D.cs.meta b/Package/DOTween/Modules/DOTweenModulePhysics2D.cs.meta new file mode 100644 index 00000000..0cdf54a0 --- /dev/null +++ b/Package/DOTween/Modules/DOTweenModulePhysics2D.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f0d8dd9e4f14b894198bbc8bbd9ae82d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/Modules/DOTweenModuleSprite.cs.meta b/Package/DOTween/Modules/DOTweenModuleSprite.cs.meta new file mode 100644 index 00000000..ba4236bf --- /dev/null +++ b/Package/DOTween/Modules/DOTweenModuleSprite.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fa3b4aeddfc4f244f865ca6873cdbfcb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/Modules/DOTweenModuleUI.cs.meta b/Package/DOTween/Modules/DOTweenModuleUI.cs.meta new file mode 100644 index 00000000..3f17e578 --- /dev/null +++ b/Package/DOTween/Modules/DOTweenModuleUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3211c98c35c2e7f4cb7bf19b3d8a44b6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/Modules/DOTweenModuleUnityVersion.cs.meta b/Package/DOTween/Modules/DOTweenModuleUnityVersion.cs.meta new file mode 100644 index 00000000..025f175d --- /dev/null +++ b/Package/DOTween/Modules/DOTweenModuleUnityVersion.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 167f051cc042292498861556b3325ff1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/Modules/DOTweenModuleUtils.cs.meta b/Package/DOTween/Modules/DOTweenModuleUtils.cs.meta new file mode 100644 index 00000000..61560bba --- /dev/null +++ b/Package/DOTween/Modules/DOTweenModuleUtils.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 50e00c871ae334b48a8fc7c23bd48dd1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/DOTween/readme.txt b/Package/DOTween/readme.txt new file mode 100644 index 00000000..37ff7ef5 --- /dev/null +++ b/Package/DOTween/readme.txt @@ -0,0 +1,29 @@ +DOTween and DOTween Pro are copyright (c) 2014-2018 Daniele Giardini - Demigiant + +// IMPORTANT!!! ///////////////////////////////////////////// +// Upgrading DOTween from versions older than 1.2.000 /////// +// (or DOTween Pro older than 1.0.000) ////////////////////// +------------------------------------------------------------- +If you're upgrading your project from a version of DOTween older than 1.2.000 (or DOTween Pro older than 1.0.000) please follow these instructions carefully. +1) Import the new version in the same folder as the previous one, overwriting old files. A lot of errors will appear but don't worry +2) Close and reopen Unity (and your project). This is fundamental: skipping this step will cause a bloodbath +3) Open DOTween's Utility Panel (Tools > Demigiant > DOTween Utility Panel) if it doesn't open automatically, then press "Setup DOTween...": this will run the upgrade setup +4) From the Add/Remove Modules panel that opens, activate/deactivate Modules for Unity systems and for external assets (Pro version only) + +// GET STARTED ////////////////////////////////////////////// + +- After importing a new DOTween update, select DOTween's Utility Panel from the "Tools/Demigiant" menu (if it doesn't open automatically) and press the "Setup DOTween..." button to activate/deactivate Modules. You can also access a Preferences Tab from there to choose default settings for DOTween. +- In your code, add "using DG.Tweening" to each class where you want to use DOTween. +- You're ready to tween. Check out the links below for full documentation and license info. + + +// LINKS /////////////////////////////////////////////////////// + +DOTween website (documentation, examples, etc): http://dotween.demigiant.com +DOTween license: http://dotween.demigiant.com/license.php +DOTween repository (Google Code): https://code.google.com/p/dotween/ +Demigiant website (documentation, examples, etc): http://www.demigiant.com + +// NOTES ////////////////////////////////////////////////////// + +- DOTween's Utility Panel can be found under "Tools > Demigiant > DOTween Utility Panel" and also contains other useful options, plus a tab to set DOTween's preferences \ No newline at end of file diff --git a/Package/DOTween/readme.txt.meta b/Package/DOTween/readme.txt.meta new file mode 100644 index 00000000..ef27a757 --- /dev/null +++ b/Package/DOTween/readme.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c4677c9bc78c3284b86896427be2b896 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/LICENSE b/Package/LICENSE new file mode 100644 index 00000000..2aa385b9 --- /dev/null +++ b/Package/LICENSE @@ -0,0 +1,8 @@ +Copyright (c) 2015 Daniele Giardini, Demigiant + +To check out DOTween license, visit this page: http://dotween.demigiant.com/license.php + +In short: +- You can freely use DOTween in both commercial and non-commercial projects +- You can redistribute verbatim copies of the code, along with any readme files and attributions +- You can modify the code only for your own use and you cannot redistribute modified versions (but you can send pull requests to me) diff --git a/Package/LICENSE.meta b/Package/LICENSE.meta new file mode 100644 index 00000000..2a86d7c5 --- /dev/null +++ b/Package/LICENSE.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 66e89eee0b7361049a8e7fee1631381a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/README.md b/Package/README.md new file mode 100644 index 00000000..23ce51d4 --- /dev/null +++ b/Package/README.md @@ -0,0 +1,5 @@ +# DOTween + +[DOTween](http://dotween.demigiant.com) is a fast, efficient, fully type-safe object-oriented animation engine, optimized for C#. + +Developed by [Daniele Giardini](http://www.demigiant.com). \ No newline at end of file diff --git a/Package/README.md.meta b/Package/README.md.meta new file mode 100644 index 00000000..33e93419 --- /dev/null +++ b/Package/README.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 646ad4e42585bd54f902890e7da1ba75 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Package/package.json b/Package/package.json new file mode 100644 index 00000000..7009ea9c --- /dev/null +++ b/Package/package.json @@ -0,0 +1,12 @@ +{ + "name": "com.demigiant.dotween", + "displayName": "DOTween", + "description": "DOTween is a fast, efficient, fully type-safe object-oriented animation engine, optimized for C#.", + "version": "1.0.0", + "unity": "2020.3", + "author": { + "name": "Daniele Giardini", + "email": "babeler@invisibleville.com", + "url": "http://dotween.demigiant.com" + } +} diff --git a/Package/package.json.meta b/Package/package.json.meta new file mode 100644 index 00000000..c6387769 --- /dev/null +++ b/Package/package.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8bc0ca5a5d217de49b86d6b67d857baa +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/README.md b/README.md index 6a0eba79..4cbfc816 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,13 @@ Developed by Daniele Giardini - http://www.demigiant.com Check the docs on DOTween's website - http://dotween.demigiant.com -![DOTween](screenshots/splash_dotween.png "DOTween") -![DOTween](screenshots/splash_shortcuts.png "DOTween") -![DOTween](screenshots/splash_lambda.png "DOTween") +# Building + +Requirements: +- Windows, the scripts that are executed in post build events are *.bat files. +- .NET SDK +- Unity installation of the version defined in file [_DOTween.Assembly/Directory.Build.Props](_DOTween.Assembly/Directory.Build.Props) + +Open the solution and build at least the DOTween and DOTweenEditor projects. These projects have several post build events with *.targets files that copy files to the [Package](Package) folder structure. + +The repository has a workflow defined that checks in several versions of Unity that they compile the DOTween, DOTweenEditor and DOTweenUpgradeManager assemblies correctly to prevent breaking changes in the Unity API. \ No newline at end of file diff --git a/_DOTween.Assembly/DOTween.targets b/_DOTween.Assembly/DOTween.targets new file mode 100644 index 00000000..6d72b1d3 --- /dev/null +++ b/_DOTween.Assembly/DOTween.targets @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/_DOTween.Assembly/DOTween/DOTween.csproj b/_DOTween.Assembly/DOTween/DOTween.csproj index a27fe4b8..bfcbcc4b 100644 --- a/_DOTween.Assembly/DOTween/DOTween.csproj +++ b/_DOTween.Assembly/DOTween/DOTween.csproj @@ -1,188 +1,62 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {DE17C145-3E8D-45D6-BBB6-D06BD7D80A55} - Library - Properties + Demigiant + Copyright © Daniele Giardini, 2014 + DOTween + DOTween + 1.0.0.0 DG.Tweening DOTween - v3.5 - 512 - Unity Subset v3.5 + false + true + CS1573,CS1591 + false - - true - full - false - ..\bin\ - DEBUG;TRACE - prompt - 4 - ..\bin\DOTween.XML - 1591 + + + net35;netstandard2.0 - - pdbonly - true - ..\bin\ - TRACE - prompt - 4 - ..\bin\DOTween.XML - 1573 + + + net472;netstandard2.0 - - ..\bin\ - TRACE;COMPATIBLE,RIGIDBODY - ..\bin\DOTween.XML - true - 1573 - pdbonly - AnyCPU - prompt - false - false + + + UNITY_2019_OR_NEWER;$(DefineConstants) - - OnOutputUpdated + + + ../bin + ../bin/$(AssemblyName).xml + + + + ../package_bin + ../package_bin/$(AssemblyName).xml - - ..\bin\ - TRACE - ..\bin\DOTween.XML - true - 1573 + + pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset + True + + + pdbonly + True + + - - - C:\Program Files\Unity\Hub\Editor\5.6.7f1\Editor\Data\Managed\UnityEngine.dll - False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - call $(SolutionDir)PostBuild_DOTween.bat $(SolutionDir) $(TargetDir) $(TargetFileName) $(TargetName) DOTween bin + $(ProjectDir)../ + DOTween/ + + $(DOTweenSolutionDir)bin/ - + + + + \ No newline at end of file diff --git a/_DOTween.Assembly/DOTween/Properties/AssemblyInfo.cs b/_DOTween.Assembly/DOTween/Properties/AssemblyInfo.cs index 6855938e..443a102b 100644 --- a/_DOTween.Assembly/DOTween/Properties/AssemblyInfo.cs +++ b/_DOTween.Assembly/DOTween/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ -using System.Reflection; -using System.Runtime.CompilerServices; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // Friends @@ -10,35 +9,10 @@ [assembly: InternalsVisibleTo("DOTweenPro")] [assembly: InternalsVisibleTo("DOTweenProEditor")] -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("DOTween")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Demigiant")] -[assembly: AssemblyProduct("DOTween")] -[assembly: AssemblyCopyright("Copyright © Daniele Giardini, 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("807e068c-2a0e-4c81-a303-4b4fd3924511")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: Guid("807e068c-2a0e-4c81-a303-4b4fd3924511")] \ No newline at end of file diff --git a/_DOTween.Assembly/DOTweenEditor/DOTweenEditor.csproj b/_DOTween.Assembly/DOTweenEditor/DOTweenEditor.csproj index 758fb0da..4718814d 100644 --- a/_DOTween.Assembly/DOTweenEditor/DOTweenEditor.csproj +++ b/_DOTween.Assembly/DOTweenEditor/DOTweenEditor.csproj @@ -1,109 +1,69 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {421ACC19-8922-4E98-8921-B52240CE172A} - Library - Properties + Demigiant + Copyright © Daniele Giardini, 2014 + DOTweenEditor + DOTweenEditor + 1.0.0.0 DG.DOTweenEditor DOTweenEditor - v3.5 - 512 - Unity Subset v3.5 + false + true + CS1573,CS1591 + false - - true - full - false - ..\bin\Editor\ - DEBUG;TRACE - prompt - 4 - ..\bin\Editor\DOTweenEditor.XML - 1591 + + + net35;netstandard2.0 - - pdbonly - true - ..\bin\Editor\ - TRACE - prompt - 4 - ..\bin\Editor\DOTweenEditor.XML - 1591 + + + net472;netstandard2.0 - - ..\bin\Editor\ - TRACE;COMPATIBLE,RIGIDBODY - ..\bin\Editor\DOTweenEditor.XML - true - 1591 - pdbonly - AnyCPU - prompt - true - true + + + ../bin/Editor + ../bin/Editor/$(AssemblyName).xml - - OnOutputUpdated + + + ../package_bin/Editor + ../package_bin//Editor/$(AssemblyName).xml - - ..\bin\Editor\ - TRACE - ..\bin\Editor\DOTweenEditor.XML - true - 1591 + + pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset + True + + + pdbonly + True + + - - - C:\Program Files\Unity\Hub\Editor\5.6.7f1\Editor\Data\Managed\UnityEditor.dll - False - - - C:\Program Files\Unity\Hub\Editor\5.6.7f1\Editor\Data\Managed\UnityEngine.dll - False - + + - - - - - - - - - - - - - - + + - - {DE17C145-3E8D-45D6-BBB6-D06BD7D80A55} + DOTween False - + - call $(SolutionDir)PostBuild_DOTween.bat $(SolutionDir) $(TargetDir) $(TargetFileName) $(TargetName) DOTween bin Editor + $(ProjectDir)../ + DOTween/ + Editor/ + $(DOTweenSolutionDir)bin/ - + + + + \ No newline at end of file diff --git a/_DOTween.Assembly/DOTweenEditor/DOTweenProcessors.cs b/_DOTween.Assembly/DOTweenEditor/DOTweenProcessors.cs index 42bdb265..51790a0e 100644 --- a/_DOTween.Assembly/DOTweenEditor/DOTweenProcessors.cs +++ b/_DOTween.Assembly/DOTweenEditor/DOTweenProcessors.cs @@ -64,7 +64,7 @@ static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAsse importedAssets, name => name.Contains("DOTween") && !name.EndsWith(".meta") && !name.EndsWith(".jpg") && !name.EndsWith(".png") ); bool dotweenImported = dotweenFile != null; - if (dotweenImported) { + if (dotweenImported && !EditorUtils.isPackage) { // DOTween or Pro or Timeline imported // Reapply modules and ASMDEF EditorUtils.DelayedCall(0.1f, ()=> { diff --git a/_DOTween.Assembly/DOTweenEditor/EditorUtils.cs b/_DOTween.Assembly/DOTweenEditor/EditorUtils.cs index b8d22277..7b80f807 100644 --- a/_DOTween.Assembly/DOTweenEditor/EditorUtils.cs +++ b/_DOTween.Assembly/DOTweenEditor/EditorUtils.cs @@ -22,8 +22,11 @@ public static class EditorUtils #endregion + public const string packageId = "com.demigiant.dotween"; + public static string projectPath { get; private set; } // Without final slash public static string assetsPath { get; private set; } // Without final slash + public static bool isPackage { get { RetrieveDependenciesData(); return _isPackage; } } public static bool hasPro { get { RetrieveDependenciesData(); return _hasPro; } } public static bool hasDOTweenTimeline { get { RetrieveDependenciesData(); return _hasDOTweenTimeline; } } public static bool hasDOTweenTimelineUnityPackage { get { RetrieveDependenciesData(); return _hasDOTweenTimelineUnityPackage; } } @@ -53,6 +56,7 @@ public static class EditorUtils static readonly StringBuilder _Strb = new StringBuilder(); static bool _retrievedDependenciesData; + static bool _isPackage; static bool _hasPro; static bool _hasDOTweenTimeline; static bool _hasDOTweenTimelineUnityPackage; @@ -91,6 +95,14 @@ static EditorUtils() public static void RetrieveDependenciesData(bool force = false) { +#if UNITY_2019_OR_NEWER + var packageInfo = UnityEditor.PackageManager.PackageInfo.FindForAssembly(Assembly.GetExecutingAssembly()); + + _isPackage = packageInfo != null; +#else + _isPackage = false; +#endif + if (!force && _retrievedDependenciesData) return; _retrievedDependenciesData = true; CheckForPro(); @@ -400,17 +412,26 @@ static void CheckForTimeline() // AssetDatabase formatted path to DOTween's Editor folder static void StoreEditorADBDir() { -// string codeBase = Assembly.GetExecutingAssembly().CodeBase; -// UriBuilder uri = new UriBuilder(codeBase); -// string fullPath = Path.GetDirectoryName(Uri.UnescapeDataString(uri.Path)); - string fullPath = Path.GetDirectoryName(GetAssemblyFilePath(Assembly.GetExecutingAssembly())); - string adbPath = fullPath.Substring(Application.dataPath.Length + 1); - _editorADBDir = adbPath.Replace("\\", "/") + "/"; + // string codeBase = Assembly.GetExecutingAssembly().CodeBase; + // UriBuilder uri = new UriBuilder(codeBase); + // string fullPath = Path.GetDirectoryName(Uri.UnescapeDataString(uri.Path)); + if (!isPackage) { + string fullPath = Path.GetDirectoryName(GetAssemblyFilePath(Assembly.GetExecutingAssembly())); + string adbPath = fullPath.Substring(Application.dataPath.Length + 1); + _editorADBDir = adbPath.Replace("\\", "/") + "/"; + } else { + _editorADBDir = packageId + "/DOTween/Editor/"; + } } static void StoreDOTweenDirsAndFilePaths() { - _dotweenDir = Path.GetDirectoryName(GetAssemblyFilePath(Assembly.GetExecutingAssembly())); + if (!isPackage) { + _dotweenDir = Path.GetDirectoryName(GetAssemblyFilePath(Assembly.GetExecutingAssembly())); + } else { + _dotweenDir = Path.Combine(Application.dataPath, "Plugins/Demigiant/DOTween/"); + } + string pathSeparator = _dotweenDir.IndexOf("/") != -1 ? "/" : "\\"; _dotweenDir = _dotweenDir.Substring(0, _dotweenDir.LastIndexOf(pathSeparator) + 1); string dotweenParentDir = _dotweenDir.Substring(0, _dotweenDir.LastIndexOf(pathSeparator)); @@ -462,5 +483,22 @@ static bool IsValidBuildTargetGroup(BuildTargetGroup group) // Debug.Log((isValid ? "" : "") + group + " > " + targetString + " / " + platformName + " > " + isValid + "/" + miIsPlatformSupportLoaded.Invoke(null, new object[] {group.ToString()}) + ""); return isValid; } + + static void DebugPaths() { + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.AppendLine(string.Format("editorADBDir: {0}", editorADBDir)); + stringBuilder.AppendLine(string.Format("editorADBDir: {0}", demigiantDir)); + stringBuilder.AppendLine(string.Format("editorADBDir: {0}", dotweenDir)); + stringBuilder.AppendLine(string.Format("editorADBDir: {0}", dotweenProDir)); + stringBuilder.AppendLine(string.Format("dotweenProEditorDir: {0}", dotweenProEditorDir)); + stringBuilder.AppendLine(string.Format("dotweenModulesDir: {0}", dotweenModulesDir)); + stringBuilder.AppendLine(string.Format("dotweenTimelineDir: {0}", dotweenTimelineDir)); + stringBuilder.AppendLine(string.Format("dotweenTimelineScriptsDir: {0}", dotweenTimelineScriptsDir)); + stringBuilder.AppendLine(string.Format("dotweenTimelineScriptsDir: {0}", dotweenTimelineScriptsDir)); + stringBuilder.AppendLine(string.Format("dotweenTimelineEditorScriptsDir: {0}", dotweenTimelineEditorScriptsDir)); + stringBuilder.AppendLine(string.Format("dotweenTimelineUnityPackageFilePath: {0}", dotweenTimelineUnityPackageFilePath)); + + Debug.Log(stringBuilder.ToString()); + } } } \ No newline at end of file diff --git a/_DOTween.Assembly/DOTweenEditor/Properties/AssemblyInfo.cs b/_DOTween.Assembly/DOTweenEditor/Properties/AssemblyInfo.cs index 7d115762..51ea5a69 100644 --- a/_DOTween.Assembly/DOTweenEditor/Properties/AssemblyInfo.cs +++ b/_DOTween.Assembly/DOTweenEditor/Properties/AssemblyInfo.cs @@ -1,18 +1,4 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("DOTweenEditor")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Demigiant")] -[assembly: AssemblyProduct("DOTweenEditor")] -[assembly: AssemblyCopyright("Copyright © Daniele Giardini, 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] +using System.Runtime.InteropServices; // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from @@ -21,16 +7,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("807e068c-2a0e-4c81-a303-4b4fd3924511")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/_DOTween.Assembly/DOTweenEditor/UI/DOTweenComponentInspector.cs b/_DOTween.Assembly/DOTweenEditor/UI/DOTweenComponentInspector.cs index 443ccd9d..9a10a105 100644 --- a/_DOTween.Assembly/DOTweenEditor/UI/DOTweenComponentInspector.cs +++ b/_DOTween.Assembly/DOTweenEditor/UI/DOTweenComponentInspector.cs @@ -171,7 +171,11 @@ public override void OnInspectorGUI() void ConnectToSource(bool forceReconnection = false) { - _headerImg = AssetDatabase.LoadAssetAtPath("Assets/" + EditorUtils.editorADBDir + "Imgs/DOTweenIcon.png", typeof(Texture2D)) as Texture2D; + if (EditorUtils.isPackage) { + _headerImg = AssetDatabase.LoadAssetAtPath("Packages/" + EditorUtils.editorADBDir + "Imgs/DOTweenIcon.png", typeof(Texture2D)) as Texture2D; + } else { + _headerImg = AssetDatabase.LoadAssetAtPath("Assets/" + EditorUtils.editorADBDir + "Imgs/DOTweenIcon.png", typeof(Texture2D)) as Texture2D; + } if (_settings == null || forceReconnection) { _settings = _isRuntime diff --git a/_DOTween.Assembly/DOTweenEditor/UI/DOTweenUtilityWindow.cs b/_DOTween.Assembly/DOTweenEditor/UI/DOTweenUtilityWindow.cs index 5b5b73fa..7511582a 100644 --- a/_DOTween.Assembly/DOTweenEditor/UI/DOTweenUtilityWindow.cs +++ b/_DOTween.Assembly/DOTweenEditor/UI/DOTweenUtilityWindow.cs @@ -72,12 +72,20 @@ bool Init() if (_initialized) return true; if (_headerImg == null) { - _headerImg = AssetDatabase.LoadAssetAtPath("Assets/" + EditorUtils.editorADBDir + "Imgs/Header.jpg", typeof(Texture2D)) as Texture2D; + if (EditorUtils.isPackage) { + _headerImg = AssetDatabase.LoadAssetAtPath("Packages/" + EditorUtils.editorADBDir + "Imgs/Header.jpg", typeof(Texture2D)) as Texture2D; + } else { + _headerImg = AssetDatabase.LoadAssetAtPath("Assets/" + EditorUtils.editorADBDir + "Imgs/Header.jpg", typeof(Texture2D)) as Texture2D; + } if (_headerImg == null) return false; // DOTween imported for the first time and images not yet imported EditorUtils.SetEditorTexture(_headerImg, FilterMode.Bilinear, 512); _headerSize.x = _WinSize.x; _headerSize.y = (int)((_WinSize.x * _headerImg.height) / _headerImg.width); - _footerImg = AssetDatabase.LoadAssetAtPath("Assets/" + EditorUtils.editorADBDir + (EditorGUIUtility.isProSkin ? "Imgs/Footer.png" : "Imgs/Footer_dark.png"), typeof(Texture2D)) as Texture2D; + if (EditorUtils.isPackage) { + _footerImg = AssetDatabase.LoadAssetAtPath("Packages/" + EditorUtils.editorADBDir + (EditorGUIUtility.isProSkin ? "Imgs/Footer.png" : "Imgs/Footer_dark.png"), typeof(Texture2D)) as Texture2D; + } else { + _footerImg = AssetDatabase.LoadAssetAtPath("Assets/" + EditorUtils.editorADBDir + (EditorGUIUtility.isProSkin ? "Imgs/Footer.png" : "Imgs/Footer_dark.png"), typeof(Texture2D)) as Texture2D; + } EditorUtils.SetEditorTexture(_footerImg, FilterMode.Bilinear, 256); _footerSize.x = _WinSize.x; _footerSize.y = (int)((_WinSize.x * _footerImg.height) / _footerImg.width); @@ -190,8 +198,10 @@ void DrawSetupGUI() if (GUILayout.Button("Setup DOTween...\n(add/remove Modules)", EditorGUIUtils.btSetup, GUILayout.Width(200))) { // DOTweenDefines.Setup(); // _setupRequired = EditorUtils.DOTweenSetupRequired(); - DOTweenUtilityWindowModules.ApplyModulesSettings(); - ASMDEFManager.ApplyASMDEFSettings(); + if (!EditorUtils.isPackage) { + DOTweenUtilityWindowModules.ApplyModulesSettings(); + ASMDEFManager.ApplyASMDEFSettings(); + } _src.modules.showPanel = true; EditorUtility.SetDirty(_src); EditorUtils.DeleteLegacyNoModulesDOTweenFiles(); @@ -243,7 +253,7 @@ void DrawSetupGUI() using (new GUILayout.HorizontalScope()) { GUILayout.FlexibleSpace(); GUI.color = ASMDEFManager.hasModulesASMDEF ? Color.yellow : Color.cyan; - if (GUILayout.Button(ASMDEFManager.hasModulesASMDEF ? "Remove ASMDEF..." : "Create ASMDEF...", EditorGUIUtils.btSetup, GUILayout.Width(200))) { + if (!EditorUtils.isPackage && GUILayout.Button(ASMDEFManager.hasModulesASMDEF ? "Remove ASMDEF..." : "Create ASMDEF...", EditorGUIUtils.btSetup, GUILayout.Width(200))) { if (ASMDEFManager.hasModulesASMDEF) { string msg = "This will remove:\n-DOTween/Modules/DOTween.Modules.asmdef"; if (EditorUtils.hasPro) { @@ -265,20 +275,22 @@ void DrawSetupGUI() msg += "\n-DOTweenTimeline/Scripts/DOTweenTimeline.Scripts.asmdef" + "\n-DOTweenTimeline/Scripts/Editor/DOTweenTimeline.EditorScripts.asmdef"; } - if (EditorUtility.DisplayDialog("Create ASMDEF", msg, "Ok", "Cancel")) ASMDEFManager.CreateAllASMDEF(); + if (!EditorUtils.isPackage &&EditorUtility.DisplayDialog("Create ASMDEF", msg, "Ok", "Cancel")) ASMDEFManager.CreateAllASMDEF(); } } GUI.color = Color.white; GUILayout.FlexibleSpace(); } - GUILayout.Label( - "ASMDEFs are useful if you need to reference the extra DOTween modules API (like [UIelement].DOColor)" + - " from other ASMDEFs/Libraries instead of loose scripts," + - " but remember to have those ASMDEFs/Libraries reference DOTween ones," + - " except for DOTween's Editor ASMDEFs (DOTweenPro.EditorScripts) which must never be referenced" + - " by your runtime code or runtime ASMDEFs.", - EditorGUIUtils.wordWrapRichTextLabelStyle - ); + if (!EditorUtils.isPackage) { + GUILayout.Label( + "ASMDEFs are useful if you need to reference the extra DOTween modules API (like [UIelement].DOColor)" + + " from other ASMDEFs/Libraries instead of loose scripts," + + " but remember to have those ASMDEFs/Libraries reference DOTween ones," + + " except for DOTween's Editor ASMDEFs (DOTweenPro.EditorScripts) which must never be referenced" + + " by your runtime code or runtime ASMDEFs.", + EditorGUIUtils.wordWrapRichTextLabelStyle + ); + } } GUILayout.Space(3); diff --git a/_DOTween.Assembly/DOTweenEditor/UI/DOTweenUtilityWindowModules.cs b/_DOTween.Assembly/DOTweenEditor/UI/DOTweenUtilityWindowModules.cs index f424f26d..a752bded 100644 --- a/_DOTween.Assembly/DOTweenEditor/UI/DOTweenUtilityWindowModules.cs +++ b/_DOTween.Assembly/DOTweenEditor/UI/DOTweenUtilityWindowModules.cs @@ -76,18 +76,23 @@ public static bool Draw(EditorWindow editor, DOTweenSettings src) _src = src; if (!_refreshed) Refresh(_src); - GUILayout.Label("Add/Remove Modules", EditorGUIUtils.titleStyle); - + if (!EditorUtils.isPackage) { + GUILayout.Label("Add/Remove Modules", EditorGUIUtils.titleStyle); + } + GUILayout.BeginVertical(); EditorGUI.BeginDisabledGroup(EditorApplication.isCompiling); - GUILayout.BeginVertical(UnityEngine.GUI.skin.box); - GUILayout.Label("Unity", EditorGUIUtils.boldLabelStyle); - _audioModule.enabled = EditorGUILayout.Toggle("Audio", _audioModule.enabled); - _physicsModule.enabled = EditorGUILayout.Toggle("Physics", _physicsModule.enabled); - _physics2DModule.enabled = EditorGUILayout.Toggle("Physics2D", _physics2DModule.enabled); - _spriteModule.enabled = EditorGUILayout.Toggle("Sprites", _spriteModule.enabled); - _uiModule.enabled = EditorGUILayout.Toggle("UI", _uiModule.enabled); - GUILayout.EndVertical(); + + if (!EditorUtils.isPackage) { + GUILayout.BeginVertical(UnityEngine.GUI.skin.box); + GUILayout.Label("Unity", EditorGUIUtils.boldLabelStyle); + _audioModule.enabled = EditorGUILayout.Toggle("Audio", _audioModule.enabled); + _physicsModule.enabled = EditorGUILayout.Toggle("Physics", _physicsModule.enabled); + _physics2DModule.enabled = EditorGUILayout.Toggle("Physics2D", _physics2DModule.enabled); + _spriteModule.enabled = EditorGUILayout.Toggle("Sprites", _spriteModule.enabled); + _uiModule.enabled = EditorGUILayout.Toggle("UI", _uiModule.enabled); + GUILayout.EndVertical(); + } // External assets modules - free GUILayout.BeginVertical(UnityEngine.GUI.skin.box); GUILayout.Label("External Assets", EditorGUIUtils.boldLabelStyle); diff --git a/_DOTween.Assembly/DOTweenEditor/UI/EditorGUIUtils.cs b/_DOTween.Assembly/DOTweenEditor/UI/EditorGUIUtils.cs index 06dceb29..74fc23f1 100644 --- a/_DOTween.Assembly/DOTweenEditor/UI/EditorGUIUtils.cs +++ b/_DOTween.Assembly/DOTweenEditor/UI/EditorGUIUtils.cs @@ -38,7 +38,11 @@ public static Texture2D logo get { if (_logo == null) { - _logo = AssetDatabase.LoadAssetAtPath("Assets/" + EditorUtils.editorADBDir + "Imgs/DOTweenIcon.png", typeof(Texture2D)) as Texture2D; + if (EditorUtils.isPackage) { + _logo = AssetDatabase.LoadAssetAtPath("Packages/" + EditorUtils.editorADBDir + "Imgs/DOTweenIcon.png", typeof(Texture2D)) as Texture2D; + } else { + _logo = AssetDatabase.LoadAssetAtPath("Assets/" + EditorUtils.editorADBDir + "Imgs/DOTweenIcon.png", typeof(Texture2D)) as Texture2D; + } EditorUtils.SetEditorTexture(_logo, FilterMode.Bilinear, 128); } return _logo; @@ -50,7 +54,11 @@ public static Texture2D miniIcon get { if (_miniIcon == null) { - _miniIcon = AssetDatabase.LoadAssetAtPath("Assets/" + EditorUtils.editorADBDir + "Imgs/DOTweenMiniIcon.png", typeof(Texture2D)) as Texture2D; + if (EditorUtils.isPackage) { + _miniIcon = AssetDatabase.LoadAssetAtPath("Packages/" + EditorUtils.editorADBDir + "Imgs/DOTweenMiniIcon.png", typeof(Texture2D)) as Texture2D; + } else { + _miniIcon = AssetDatabase.LoadAssetAtPath("Assets/" + EditorUtils.editorADBDir + "Imgs/DOTweenMiniIcon.png", typeof(Texture2D)) as Texture2D; + } EditorUtils.SetEditorTexture(_miniIcon, FilterMode.Point, 16); } return _miniIcon; diff --git a/_DOTween.Assembly/DOTweenEditorPackage.targets b/_DOTween.Assembly/DOTweenEditorPackage.targets new file mode 100644 index 00000000..50d50961 --- /dev/null +++ b/_DOTween.Assembly/DOTweenEditorPackage.targets @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/_DOTween.Assembly/DOTweenPackage.targets b/_DOTween.Assembly/DOTweenPackage.targets new file mode 100644 index 00000000..b89c6a0d --- /dev/null +++ b/_DOTween.Assembly/DOTweenPackage.targets @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/_DOTween.Assembly/DOTweenShared.targets b/_DOTween.Assembly/DOTweenShared.targets new file mode 100644 index 00000000..0673c943 --- /dev/null +++ b/_DOTween.Assembly/DOTweenShared.targets @@ -0,0 +1,12 @@ + + + + + + + + + + \ No newline at end of file diff --git a/_DOTween.Assembly/DOTweenUpgradeManager/Autorun.cs b/_DOTween.Assembly/DOTweenUpgradeManager/Autorun.cs index a58c9813..6a294ddf 100644 --- a/_DOTween.Assembly/DOTweenUpgradeManager/Autorun.cs +++ b/_DOTween.Assembly/DOTweenUpgradeManager/Autorun.cs @@ -21,6 +21,20 @@ static class Autorun { static Autorun() { + bool _isPackage; + +#if UNITY_2019_OR_NEWER + var packageInfo = UnityEditor.PackageManager.PackageInfo.FindForAssembly(Assembly.GetExecutingAssembly()); + + _isPackage = packageInfo != null; +#else + _isPackage = false; +#endif + + if (_isPackage) { + return; + } + EditorApplication.update += OnUpdate; } diff --git a/_DOTween.Assembly/DOTweenUpgradeManager/DOTweenUpgradeManager.csproj b/_DOTween.Assembly/DOTweenUpgradeManager/DOTweenUpgradeManager.csproj index a7485bf4..7cb71411 100644 --- a/_DOTween.Assembly/DOTweenUpgradeManager/DOTweenUpgradeManager.csproj +++ b/_DOTween.Assembly/DOTweenUpgradeManager/DOTweenUpgradeManager.csproj @@ -1,68 +1,62 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {6BC7290B-999D-4688-959C-868306C1F52B} - Library - Properties + Demigiant + Copyright © Daniele Giardini, Demigiant 2018 + DOTweenUpgradeManager + DOTweenUpgradeManager + 1.0.0.0 DG.DOTweenUpgradeManager DOTweenUpgradeManager - v3.5 - 512 - Unity Subset v3.5 + false + true + CS1573,CS1591 + false - - true - full - false - ..\bin\Editor\ - DEBUG;TRACE - prompt - 4 - ..\bin\Editor\DOTweenUpgradeManager.XML - 1591 + + + net35;netstandard2.0 - + + + net472;netstandard2.0 + + + + ../bin/Editor + ../bin/Editor/$(AssemblyName).xml + + + + ../package_bin/Editor + ../package_bin//Editor/$(AssemblyName).xml + + + pdbonly - true - ..\bin\Editor\ - TRACE - prompt - 4 - ..\bin\Editor\DOTweenUpgradeManager.XML - 1591 + True - - OnOutputUpdated + + + pdbonly + True + - - - C:\Program Files\Unity\Hub\Editor\5.4.6\Editor\Data\Managed\UnityEditor.dll - False - - - C:\Program Files\Unity\Hub\Editor\5.4.6\Editor\Data\Managed\UnityEngine.dll - False - + + - - - + - + - call $(SolutionDir)PostBuild_DOTween.bat $(SolutionDir) $(TargetDir) $(TargetFileName) $(TargetName) DOTween bin Editor + $(ProjectDir)../ + DOTween/ + Editor/ + $(DOTweenSolutionDir)bin/ - + + + + \ No newline at end of file diff --git a/_DOTween.Assembly/DOTweenUpgradeManager/Properties/AssemblyInfo.cs b/_DOTween.Assembly/DOTweenUpgradeManager/Properties/AssemblyInfo.cs index 6d06ebc0..51ea5a69 100644 --- a/_DOTween.Assembly/DOTweenUpgradeManager/Properties/AssemblyInfo.cs +++ b/_DOTween.Assembly/DOTweenUpgradeManager/Properties/AssemblyInfo.cs @@ -1,18 +1,4 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("DOTweenUpgradeManager")] -[assembly: AssemblyDescription("Upgrade manager for DOTween")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Demigiant")] -[assembly: AssemblyProduct("DOTweenUpgradeManager")] -[assembly: AssemblyCopyright("Copyright © Daniele Giardini, Demigiant 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] +using System.Runtime.InteropServices; // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from @@ -21,16 +7,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("807e068c-2a0e-4c81-a303-4b4fd3924511")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/_DOTween.Assembly/DOTweenUpgradeManagerPackage.targets b/_DOTween.Assembly/DOTweenUpgradeManagerPackage.targets new file mode 100644 index 00000000..e3c6605f --- /dev/null +++ b/_DOTween.Assembly/DOTweenUpgradeManagerPackage.targets @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/_DOTween.Assembly/DOTween_LooseScripts/DOTween_LooseScripts.csproj b/_DOTween.Assembly/DOTween_LooseScripts/DOTween_LooseScripts.csproj index 4ec3c276..a9046d72 100644 --- a/_DOTween.Assembly/DOTween_LooseScripts/DOTween_LooseScripts.csproj +++ b/_DOTween.Assembly/DOTween_LooseScripts/DOTween_LooseScripts.csproj @@ -1,124 +1,127 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {0B529A90-0B97-4840-BEB6-4A6700B46655} - Library - Properties + Demigiant + Copyright © Daniele Giardini, Demigiant 2018 + DOTween_LooseScripts + DOTween_LooseScripts + Deals with lose scripts inside bin and bin_pro folders + 1.0.0.0 DG.Tweening DOTween_LooseScripts - v3.5 - 512 - Unity Subset v3.5 + false + true + CS1573,CS1591 + false + ../bin/ - - true - full - false - ..\bin\ - DEBUG;TRACE - prompt - 4 - - - 1591 + + + UNITY_5;$(DefineConstants) - + + + UNITY_2017_1_OR_NEWER;NET_4_6;$(DefineConstants) + + + + UNITY_2018_1_OR_NEWER;$(DefineConstants) + + + + UNITY_5;$(DefineConstants) + + + + net35 + + + + net472 + + + + netstandard2.0 + + + pdbonly - true - ..\bin\ - TRACE;UNITY_EDITOR;UNITY_4_3;UNITY_4_6;UNITY_5;UNITY_2017_1_OR_NEWER;UNITY_2018_1_OR_NEWER;NET_4_6 - prompt - 4 - - - 1573 + True + + + pdbonly + True + + - - ..\..\..\bin.Global_no_meta\DemiLib\Core\Editor\DemiEditor.dll - False - - - ..\..\..\bin.Global_no_meta\DemiLib\Core\DemiLib.dll - False - - - - C:\Program Files\Unity\Hub\Editor\5.6.7f1\Editor\Data\Managed\UnityEditor.dll - False - - - C:\Program Files\Unity\Hub\Editor\5.6.7f1\Editor\Data\Managed\UnityEngine.dll + + + + + + + + + + + + + + ../../../bin.Global_no_meta/DemiLib/Core/Editor/DemiEditor.dll False - - C:\Program Files\Unity\Hub\Editor\5.6.7f1\Editor\Data\UnityExtensions\Unity\GUISystem\UnityEngine.UI.dll + + ../../../bin.Global_no_meta/DemiLib/Core/DemiLib.dll False - - - bin\%(FileName) - - - bin\%(FileName) - - - bin\Modules\%(FileName) + + bin/%(FileName) - - bin\Modules\%(FileName) + + bin/%(FileName) + + + bin/Modules/%(FileName) - - bin_pro\%(FileName) + + bin/Modules/%(FileName) + + + bin_pro/%(FileName) - - bin_pro\%(FileName) + + bin_pro/%(FileName) + + + bin_pro/Editor/DOTweenAnimationInspector - - bin_pro\Editor\DOTweenAnimationInspector - - - bin_pro\Editor\DOTweenPreviewManager + + bin_pro/Editor/DOTweenPreviewManager + - + {421acc19-8922-4e98-8921-b52240ce172a} DOTweenEditor False - + {279545ae-d268-42f0-a4c6-aa5ba15fb9be} DOTweenProEditor False - + {20d2e542-d14f-4678-9c38-f3c0ecf6a2f6} DOTweenPro False - + {de17c145-3e8d-45d6-bbb6-d06bd7d80a55} DOTween False - - - - - - \ No newline at end of file diff --git a/_DOTween.Assembly/DOTween_LooseScripts/Properties/AssemblyInfo.cs b/_DOTween.Assembly/DOTween_LooseScripts/Properties/AssemblyInfo.cs index 977fd303..411f7658 100644 --- a/_DOTween.Assembly/DOTween_LooseScripts/Properties/AssemblyInfo.cs +++ b/_DOTween.Assembly/DOTween_LooseScripts/Properties/AssemblyInfo.cs @@ -1,18 +1,4 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("DOTween_LooseScripts")] -[assembly: AssemblyDescription("Deals with lose scripts inside bin and bin_pro folders")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Demigiant")] -[assembly: AssemblyProduct("DOTween_LooseScripts")] -[assembly: AssemblyCopyright("Copyright © Daniele Giardini, Demigiant 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] +using System.Runtime.InteropServices; // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from @@ -20,17 +6,4 @@ [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("807e068c-2a0e-4c81-a303-4b4fd3924511")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: Guid("807e068c-2a0e-4c81-a303-4b4fd3924511")] \ No newline at end of file diff --git a/_DOTween.Assembly/Directory.Build.Props b/_DOTween.Assembly/Directory.Build.Props new file mode 100644 index 00000000..5a011868 --- /dev/null +++ b/_DOTween.Assembly/Directory.Build.Props @@ -0,0 +1,11 @@ + + + 5.6.7f1 + + + true + + + $(DefineConstants);UNITY_2019_OR_NEWER + + \ No newline at end of file diff --git a/_DOTween.Assembly/PostBuild_DOTween.bat b/_DOTween.Assembly/PostBuild_DOTween.bat index 1e1db182..393a3d6d 100644 --- a/_DOTween.Assembly/PostBuild_DOTween.bat +++ b/_DOTween.Assembly/PostBuild_DOTween.bat @@ -4,7 +4,8 @@ :: %4 = $(TargetName) ► DLL filename without extension :: %5 = Main export dir ► Main folder inside bin.Global/etc where to copy the files (ex: "DOTween", "DOTweenPro") :: %6 = Bin dir name ► (ex: "bin", "bin_pro") -:: %7 = Eventual export subdir (can be NULL) ► Eventual subdirectory inside the main export dir (ex: "Editor") +:: %7 = $(UnityVersionInstallPath) ► Unity editor path (ex: "C:\Program Files\Unity\Hub\Editor\2020.3.36f1") +:: %8 = Eventual export subdir (can be NULL) ► Eventual subdirectory inside the main export dir (ex: "Editor") echo : echo : @@ -17,23 +18,26 @@ echo : echo : echo : echo : -echo :::::: TARGET: %5 %7 +echo :::::: TARGET: %5 %8 echo :::::: Deleting TMPs... -DEL %2*.tmp +IF EXIST %2*.tmp DEL %2*.tmp echo :::::: Converting PDB to MDB and deleting PDB... CD %2 -"c:\Program Files\pdb2mdb\pdb2mdb.exe" %3 -echo ::: Deleting PDB files: %4.pdb +"%~7\Editor\Data\MonoBleedingEdge\bin\mono.exe" "%~7\Editor\Data\MonoBleedingEdge\lib\mono\4.5\pdb2mdb.exe" %3 +echo ::: Deleting %4.pdb file: %4.pdb DEL %4.pdb -echo ::: PDB files deleted, PAUSE for 0.5 second +echo ::: %4.pdb file deleted, PAUSE for 0.5 second waitfor pdbFilesToBeDeletedIHope /t 0.5 2>NUL || type nul>nul +echo ::: Deleting %4.deps.json files: %4.deps.json +DEL %4.deps.json + echo :::::: Starting export... -set SubDir=%7 -if not "%SubDir%"=="" ( set SubDir=\%7 ) +set SubDir=%8 +if not "%SubDir%"=="" ( set SubDir=\%8 ) set CopyFromDir=%1%6%SubDir% set CopyToDir=%1..\..\bin.Global\%5%SubDir% diff --git a/_DOTween.Assembly/bin/Modules/DOTweenModuleAudio.cs b/_DOTween.Assembly/bin/Modules/DOTweenModuleAudio.cs index c195b6cc..5e97a631 100644 --- a/_DOTween.Assembly/bin/Modules/DOTweenModuleAudio.cs +++ b/_DOTween.Assembly/bin/Modules/DOTweenModuleAudio.cs @@ -1,7 +1,7 @@ // Author: Daniele Giardini - http://www.demigiant.com // Created: 2018/07/13 -#if true // MODULE_MARKER +#if true || AUDIO_DOTWEEN // MODULE_MARKER using System; using DG.Tweening.Core; using DG.Tweening.Plugins.Options; diff --git a/_DOTween.Assembly/bin/Modules/DOTweenModulePhysics.cs b/_DOTween.Assembly/bin/Modules/DOTweenModulePhysics.cs index 08b07006..efd49440 100644 --- a/_DOTween.Assembly/bin/Modules/DOTweenModulePhysics.cs +++ b/_DOTween.Assembly/bin/Modules/DOTweenModulePhysics.cs @@ -1,7 +1,7 @@ // Author: Daniele Giardini - http://www.demigiant.com // Created: 2018/07/13 -#if true // MODULE_MARKER +#if true || PHYSICS_DOTWEEN // MODULE_MARKER using System; using DG.Tweening.Core; using DG.Tweening.Core.Enums; diff --git a/_DOTween.Assembly/bin/Modules/DOTweenModulePhysics2D.cs b/_DOTween.Assembly/bin/Modules/DOTweenModulePhysics2D.cs index d01f7289..0e4681a7 100644 --- a/_DOTween.Assembly/bin/Modules/DOTweenModulePhysics2D.cs +++ b/_DOTween.Assembly/bin/Modules/DOTweenModulePhysics2D.cs @@ -1,7 +1,7 @@ // Author: Daniele Giardini - http://www.demigiant.com // Created: 2018/07/13 -#if true && (UNITY_4_3 || UNITY_4_4 || UNITY_4_5 || UNITY_4_6 || UNITY_5 || UNITY_2017_1_OR_NEWER) // MODULE_MARKER +#if (true || PHYSICS2D_DOTWEEN) && (UNITY_4_3 || UNITY_4_4 || UNITY_4_5 || UNITY_4_6 || UNITY_5 || UNITY_2017_1_OR_NEWER) // MODULE_MARKER using System; using DG.Tweening.Core; using DG.Tweening.Plugins; diff --git a/_DOTween.Assembly/bin/Modules/DOTweenModuleUI.cs b/_DOTween.Assembly/bin/Modules/DOTweenModuleUI.cs index b3a6fd1a..88de24e3 100644 --- a/_DOTween.Assembly/bin/Modules/DOTweenModuleUI.cs +++ b/_DOTween.Assembly/bin/Modules/DOTweenModuleUI.cs @@ -1,7 +1,7 @@ // Author: Daniele Giardini - http://www.demigiant.com // Created: 2018/07/13 -#if true && (UNITY_4_6 || UNITY_5 || UNITY_2017_1_OR_NEWER) // MODULE_MARKER +#if (true || UGUI_DOTWEEN) && (UNITY_4_6 || UNITY_5 || UNITY_2017_1_OR_NEWER) // MODULE_MARKER using System; using System.Globalization; diff --git a/_DOTween.Assembly/bin/Modules/DOTweenModuleUtils.cs b/_DOTween.Assembly/bin/Modules/DOTweenModuleUtils.cs index 12a365d4..7c718288 100644 --- a/_DOTween.Assembly/bin/Modules/DOTweenModuleUtils.cs +++ b/_DOTween.Assembly/bin/Modules/DOTweenModuleUtils.cs @@ -87,7 +87,7 @@ public static class Physics // Called via DOTweenExternalCommand callback public static void SetOrientationOnPath(PathOptions options, Tween t, Quaternion newRot, Transform trans) { -#if true // PHYSICS_MARKER +#if true || PHYSICS_DOTWEEN // PHYSICS_MARKER if (options.isRigidbody) ((Rigidbody)t.target).rotation = newRot; else trans.rotation = newRot; #else @@ -98,7 +98,7 @@ public static void SetOrientationOnPath(PathOptions options, Tween t, Quaternion // Returns FALSE if the DOTween's Physics2D Module is disabled, or if there's no Rigidbody2D attached public static bool HasRigidbody2D(Component target) { -#if true // PHYSICS2D_MARKER +#if true || PHYSICS2D_DOTWEEN // PHYSICS2D_MARKER return target.GetComponent() != null; #else return false; @@ -115,7 +115,7 @@ public static bool HasRigidbody2D(Component target) #endif public static bool HasRigidbody(Component target) { -#if true // PHYSICS_MARKER +#if true || PHYSICS_DOTWEEN // PHYSICS_MARKER return target.GetComponent() != null; #else return false; @@ -131,7 +131,7 @@ public static TweenerCore CreateDOTweenPathTween( ){ TweenerCore t = null; bool rBodyFoundAndTweened = false; -#if true // PHYSICS_MARKER +#if true || PHYSICS_DOTWEEN // PHYSICS_MARKER if (tweenRigidbody) { Rigidbody rBody = target.GetComponent(); if (rBody != null) { @@ -142,7 +142,7 @@ public static TweenerCore CreateDOTweenPathTween( } } #endif -#if true // PHYSICS2D_MARKER +#if true || PHYSICS2D_DOTWEEN // PHYSICS2D_MARKER if (!rBodyFoundAndTweened && tweenRigidbody) { Rigidbody2D rBody2D = target.GetComponent(); if (rBody2D != null) {