Compare commits

...

23 Commits

Author SHA1 Message Date
xiekaidong
90af1ffd08 提升版本号 2024-12-26 09:39:41 +08:00
xiekaidong
405413a212 更新配置 2024-12-23 14:40:01 +08:00
xiekaidong
9488ff2513 fix 2024-11-25 15:03:43 +08:00
xiekaidong
2a42432a18 更新配置 2024-11-21 17:17:59 +08:00
xiekaidong
874e4f85fc 提升版本号 2024-10-29 09:47:07 +08:00
xiekaidong
62c2e9cfc3 fix 2024-10-29 09:43:50 +08:00
xiekaidong
49bafa2fac 更新配置 2024-10-28 09:38:39 +08:00
xiekaidong
7739b7d291 提升版本号 2024-09-23 15:06:20 +08:00
xiekaidong
f0f4c639c0 更新配置 2024-09-23 15:03:28 +08:00
xiekaidong
b6d20fe9cd 提升版本号 2024-08-27 11:12:01 +08:00
xiekaidong
f7a4d2aa47 更新配置 2024-08-27 11:10:52 +08:00
chenxi
f3cac19afe 打包设置 2024-07-22 18:11:18 +08:00
xiekaidong
8538803485 更新配置 2024-07-22 16:47:06 +08:00
xiekaidong
be63ed686d 提升版本号 2024-07-22 16:28:09 +08:00
xiekaidong
67e9e2606f 提升APITarget 2024-07-22 16:19:55 +08:00
xiekaidong
7a015b49c0 更新配置 2024-07-22 12:02:26 +08:00
xiekaidong
8910eb7a9a 升版本 2024-06-24 15:08:26 +08:00
xiekaidong
7736db2fd8 Merge branch 'dev_20240625' 2024-06-24 15:06:32 +08:00
xiekaidong
f7e06bbbb0 更新配置 2024-06-24 15:06:20 +08:00
xiekaidong
9c606c912c 更新配置 2024-06-24 11:07:14 +08:00
chenxi
b29592f4ba 删除不删除不用的过时的库 2024-06-19 14:49:35 +08:00
chenxi
93870ca319 Merge branch 'master' of git.juzugame.com:b6-client/b6-unity 2024-06-19 11:53:17 +08:00
chenxi
10a8fb1bd4 升级支付库 2024-06-19 11:53:08 +08:00
17 changed files with 507 additions and 294 deletions

View File

@ -13,8 +13,8 @@ namespace BFEditor.Build
public class BuildProjectWindow : EditorWindow
{
private static int versionCode = 17;
private static string versionName = "1.5.8";
private static int versionCode = 18;
private static string versionName = "1.6.5";
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";

View File

@ -620,12 +620,6 @@ namespace BFEditor.Build
var buildGradlePath = Path.Combine(PublishAsProjectPath, "launcher/build.gradle");
var buildGradleText = File.ReadAllText(buildGradlePath);
var regex1 = new Regex("implementation 'com.google.android.play:core:1.10.0'");
if (!regex1.IsMatch(buildGradleText))
{
var regex12 = new Regex("dependencies {");
buildGradleText = regex12.Replace(buildGradleText, "dependencies {\n implementation 'com.google.android.play:core:1.10.0'");
}
var regex2 = new Regex("assetPacks = [\":install_time_pack\"]");
if (!regex2.IsMatch(buildGradleText))
{

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -7,7 +7,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.android.tools.build:gradle:7.1.3'
classpath 'com.google.gms:google-services:4.3.13'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1'
}

View File

@ -1,6 +1,5 @@
org.gradle.jvmargs=-Xmx4096M
org.gradle.parallel=true
android.enableR8=false
android.useAndroidX=true
android.enableJetifier=true
unityStreamingAssets=.unity3d, .bytes, .ab, UnityServicesProjectConfiguration.json

View File

@ -16,10 +16,10 @@ android {
}
}
compileSdkVersion 33
compileSdkVersion 34
buildToolsVersion '30.0.2'
defaultConfig {
targetSdkVersion 33
targetSdkVersion 34
}
lintOptions {

View File

@ -50,7 +50,7 @@ dependencies {
implementation(name: 'UnityUtils-release', ext:'aar')
implementation(name: 'facebook-android-wrapper-15.1.0', ext:'aar')
implementation 'com.google.android.gms:play-services-auth:20.1.0'
implementation "com.android.billingclient:billing:5.0.0"
implementation "com.android.billingclient:billing:6.2.1"
// firebase
implementation 'com.google.firebase:firebase-analytics:21.1.0'
@ -119,17 +119,17 @@ dependencies {
}
android {
compileSdkVersion 33
compileSdkVersion 34
buildToolsVersion '30.0.2'
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
defaultConfig {
minSdkVersion 19
targetSdkVersion 33
minSdkVersion 24
targetSdkVersion 34
ndk {
abiFilters 'armeabi-v7a', 'arm64-v8a'
}

View File

@ -10,17 +10,17 @@ dependencies {
}
android {
compileSdkVersion 33
compileSdkVersion 34
buildToolsVersion '30.0.2'
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
defaultConfig {
minSdkVersion 19
targetSdkVersion 33
minSdkVersion 24
targetSdkVersion 34
applicationId 'REPLACE_APPLICATION_ID'
ndk {
abiFilters 'armeabi-v7a', 'arm64-v8a'