puxuan/c1_unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev_20231009

Browse Source 
# 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Editor/BFBuildProjectTools/BuildProjectWindow/BuildProjectWindow.cs
View File

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

BIN
Assets/arts/textures/background/battle/bg_8.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 MiB

After

Width:  |  Height:  |  Size: 857 KiB

2
Assets/arts/textures/background/battle/bg_8.png.meta
View File

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

BIN
Assets/arts/textures/background/battle/bg_9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 MiB

After

Width:  |  Height:  |  Size: 871 KiB

2
Assets/arts/textures/background/battle/bg_9.png.meta
View File

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

BIN
Assets/arts/textures/background/chapter/chapter_8.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 67 KiB

BIN
Assets/arts/textures/background/chapter/chapter_9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 74 KiB

BIN
Assets/lua/app/config/activity_pvp_robot.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/userdata/arena/arena_data.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/userdata/hero/hero_data.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/userdata/hero/hero_entity.lua.bytes
View File

Binary file not shown.