Merge remote-tracking branch 'refs/remotes/origin/taptap'

# Conflicts:
#	Assets/000_assets/material/M_SquareFrame 1.mat
#	Assets/FR2_Cache.asset
#	Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset
#	Packages/packages-lock.json
#	ProjectSettings/PackageManagerSettings.asset
#	ProjectSettings/ProjectSettings.asset
#	UserSettings/Layouts/CurrentMaximizeLayout.dwlt
#	UserSettings/Layouts/default-6000.dwlt
#	ichni Official_WwiseProject/.cache/SoundBankInfoCache.dat
#	ichni_Official.slnx
This commit is contained in:
2026-06-15 12:44:31 +08:00
79 changed files with 720 additions and 378 deletions

View File

@@ -0,0 +1,24 @@
<dependencies>
<packages>
<package>com.taptap.sdk:tap-core-unity:4.5.4</package>
<package>com.taptap.sdk:tap-login-unity:4.5.4</package>
</packages>
<files />
<settings>
<setting name="androidAbis" value="arm64-v8a,armeabi-v7a" />
<setting name="bundleId" value="com.Soullies.ichni" />
<setting name="explodeAars" value="True" />
<setting name="gradleBuildEnabled" value="True" />
<setting name="gradlePropertiesTemplateEnabled" value="True" />
<setting name="gradleTemplateEnabled" value="True" />
<setting name="installAndroidPackages" value="True" />
<setting name="localMavenRepoDir" value="Assets/GeneratedLocalRepo" />
<setting name="packageDir" value="Assets/Plugins/Android" />
<setting name="patchAndroidManifest" value="True" />
<setting name="patchMainTemplateGradle" value="True" />
<setting name="projectExportEnabled" value="False" />
<setting name="useFullCustomMavenRepoPathWhenExport" value="True" />
<setting name="useFullCustomMavenRepoPathWhenNotExport" value="False" />
<setting name="useJetifier" value="True" />
</settings>
</dependencies>

View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<projectSettings>
<projectSetting name="com.google.external-dependency-managerAnalyticsCookie" value="0ee05935852240ba8f2aa7a1a5eb6d09" />
<projectSetting name="com.google.external-dependency-managerAnalyticsEnabled" value="True" />
<projectSetting name="Google.IOSResolver.VerboseLoggingEnabled" value="False" />
<projectSetting name="Google.PackageManagerResolver.VerboseLoggingEnabled" value="False" />
<projectSetting name="Google.VersionHandler.VerboseLoggingEnabled" value="False" />
<projectSetting name="GooglePlayServices.PromptBeforeAutoResolution" value="False" />
<projectSetting name="GooglePlayServices.UseJetifier" value="True" />
</projectSettings>