lishuo/powerfun-unity
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo

Browse Source
This commit is contained in:
lishuo 2022-01-13 17:13:08 +08:00
commit 8a2d4f7b85
4 changed files with 1117 additions and 1117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2222
Assets/Scenes/Login-Mobile.unity
View File

File diff suppressed because it is too large Load Diff

2
Assets/Scripts/UIManager.cs
View File

@ -605,7 +605,7 @@ public class UIManager : MonoBehaviour
{ {
return; return;
} }
if (parent == UIManager.Instance.MainPanel) if (UIManager.Instance.MainPanel != null && parent == UIManager.Instance.MainPanel)
{ {
App.currentPageIsHome = panelToShow.Equals(UIManager.Instance.HomePanel); App.currentPageIsHome = panelToShow.Equals(UIManager.Instance.HomePanel);
} }

4
ProjectSettings/AndroidResolverDependencies.xml
View File

@ -13,7 +13,7 @@
</packages> </packages>
<files /> <files />
<settings> <settings>
<setting name="androidAbis" value="armeabi-v7a" /> <setting name="androidAbis" value="arm64-v8a,armeabi-v7a" />
<setting name="bundleId" value="com.ZhiXingPai.PowerFunUnity" /> <setting name="bundleId" value="com.ZhiXingPai.PowerFunUnity" />
<setting name="explodeAars" value="True" /> <setting name="explodeAars" value="True" />
<setting name="gradleBuildEnabled" value="True" /> <setting name="gradleBuildEnabled" value="True" />
@ -22,7 +22,7 @@
<setting name="packageDir" value="Assets/Plugins/Android" /> <setting name="packageDir" value="Assets/Plugins/Android" />
<setting name="patchAndroidManifest" value="True" /> <setting name="patchAndroidManifest" value="True" />
<setting name="patchMainTemplateGradle" value="True" /> <setting name="patchMainTemplateGradle" value="True" />
<setting name="projectExportEnabled" value="False" /> <setting name="projectExportEnabled" value="True" />
<setting name="useJetifier" value="False" /> <setting name="useJetifier" value="False" />
</settings> </settings>
</dependencies> </dependencies>

6
ProjectSettings/ProjectSettings.asset
View File

@ -179,7 +179,7 @@ PlayerSettings:
applicationIdentifier: applicationIdentifier:
Android: com.ZhiXingPai.PowerFunUnity Android: com.ZhiXingPai.PowerFunUnity
buildNumber: buildNumber:
iPhone: 2.1.1.0 iPhone: 2.1.1.1
AndroidBundleVersionCode: 15 AndroidBundleVersionCode: 15
AndroidMinSdkVersion: 24 AndroidMinSdkVersion: 24
AndroidTargetSdkVersion: 30 AndroidTargetSdkVersion: 30
@ -256,7 +256,7 @@ PlayerSettings:
clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
templatePackageId: com.unity.template.3d@4.2.8 templatePackageId: com.unity.template.3d@4.2.8
templateDefaultScene: Assets/Scenes/SampleScene.unity templateDefaultScene: Assets/Scenes/SampleScene.unity
AndroidTargetArchitectures: 1 AndroidTargetArchitectures: 3
AndroidSplashScreenScale: 0 AndroidSplashScreenScale: 0
androidSplashScreen: {fileID: 0} androidSplashScreen: {fileID: 0}
AndroidKeystoreName: '{inproject}: Assets/Plugins/Android/powerfun.keystore' AndroidKeystoreName: '{inproject}: Assets/Plugins/Android/powerfun.keystore'
@ -868,7 +868,7 @@ PlayerSettings:
platformArchitecture: platformArchitecture:
iPhone: 1 iPhone: 1
scriptingBackend: scriptingBackend:
Android: 0 Android: 1
Standalone: 0 Standalone: 0
il2cppCompilerConfiguration: il2cppCompilerConfiguration:
Standalone: 0 Standalone: 0