Merge branch 'master' into dev_20231009

# Conflicts:
#	Assets/lua/app/config/act_gift.lua.bytes
#	Assets/lua/app/config/const.lua.bytes
#	Assets/lua/app/config/skill.lua.bytes
#	Assets/lua/app/config/skill_rogue.lua.bytes
This commit is contained in:
xiekaidong 2023-10-09 15:48:59 +08:00
commit c86b965ee6
12 changed files with 3 additions and 3 deletions

View File

@ -14,7 +14,7 @@ namespace BFEditor.Build
public class BuildProjectWindow : EditorWindow
{
private static int versionCode = 16;
private static string versionName = "1.4.0";
private static string versionName = "1.4.3";
BFPlatformOptions platform = BFPlatformOptions.AndroidDev;
const string ANDROID_DEV_PACKAGE_NAME = "com.juzu.b6.dev.android";
const string ANDROID_RELEASE_PACKAGE_NAME = "com.juzu.b6.release.android";

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 MiB

After

Width:  |  Height:  |  Size: 857 KiB

View File

@ -79,7 +79,7 @@ TextureImporter:
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 47
textureFormat: 45
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 MiB

After

Width:  |  Height:  |  Size: 871 KiB

View File

@ -79,7 +79,7 @@ TextureImporter:
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 47
textureFormat: 45
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 67 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 74 KiB