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

Merge branch 'dev_language' into dev_release

Browse Source 
# Conflicts:
#	Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab
#	Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab
This commit is contained in:
Caiyanpeng committed 2021-11-25 10:04:35 +08:00
2 parents 9ff3de1d10 23e5ae6ebd
commit 134dc76ec5
94 files changed
+10234 -2610
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ProjectSettings/GraphicsSettings.asset
-1
View File
@@ -38,7 +38,6 @@ GraphicsSettings:
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}
ProjectSettings/ProjectSettings.asset
+3 -3
View File
@@ -180,7 +180,7 @@ PlayerSettings:
Android: com.ZhiXingPai.PowerFunUnity
buildNumber:
iPhone: 2.0.7.0
AndroidBundleVersionCode: 11
AndroidBundleVersionCode: 12
AndroidMinSdkVersion: 24
AndroidTargetSdkVersion: 30
AndroidPreferredInstallLocation: 1
@@ -256,7 +256,7 @@ PlayerSettings:
clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
templatePackageId: com.unity.template.3d@4.2.8
templateDefaultScene: Assets/Scenes/SampleScene.unity
AndroidTargetArchitectures: 1
AndroidTargetArchitectures: 3
AndroidSplashScreenScale: 0
androidSplashScreen: {fileID: 0}
AndroidKeystoreName: '{inproject}: Assets/Plugins/Android/powerfun.keystore'
@@ -868,7 +868,7 @@ PlayerSettings:
platformArchitecture:
iPhone: 1
scriptingBackend:
Android: 0
Android: 1
Standalone: 0
il2cppCompilerConfiguration:
Standalone: 0