提升版本号

Assets/Editor/BFBuildProjectTools/BuildProjectWindow/BuildProjectWindow.cs

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

Assets/Editor/BFBuildProjectTools/Utils/BuildAndroidUtils.cs

@@ -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))
 			{

Assets/Editor/BFOthersTools/ExportExcelTools/ExportExcelTools.cs

@@ -136,71 +136,17 @@ namespace BFEditor
 	        var configFileInfos = configDirInfo.GetFiles(suffix, SearchOption.TopDirectoryOnly);
 
 			// 检查棋盘文件格式
+			checkBoard("chapter_board", env, sb);
+			checkBoard("chapter_board_bossrush", env, sb);
+			checkBoard("chapter_board_daily_challenge", env, sb);
+			checkBoard("chapter_board_dungeon_armor", env, sb);
+			checkBoard("chapter_board_dungeon_equip", env, sb);
+			checkBoard("chapter_board_dungeon_gold", env, sb);
+			checkBoard("chapter_board_dungeon_shards", env, sb);
+			checkBoard("chapter_board_rune", env, sb);
+			checkBoard("activity_pvp_board", env, sb);
+			checkBoard("arena_board", env, sb);
 
-			var luaScriptString = @"local cfg = require('app/config/chapter_board')
-									if not cfg or not cfg.data then
-										return ''
-									end
-									cfg = cfg.data
-									local tempMap = {}
-									local addErrorInfo = function(errorInfo, cfgId, errorStr)
-										if not tempMap[cfgId] then
-											tempMap[cfgId] = true
-											table.insert(errorInfo, 'cfgId = ' .. cfgId)
-										end
-
-										table.insert(errorInfo, '     ' .. errorStr)
-									end
-
-									local errorInfo = {}
-									for k, info in pairs(cfg) do
-										local board = info.board
-										if not board then
-											addErrorInfo(errorInfo, k, '没有board字段，请检查')
-										end
-
-										if #board < 49 then
-											addErrorInfo(errorInfo, k, '没有board长度不足，请检查，当前长度为' .. #board)
-										end
-
-										for index, v in ipairs(board) do
-											if not v[1] then
-												addErrorInfo(errorInfo, k, 'board字段中' .. index .. '索引没有格子类型')
-											end
-											if not v[2] then
-												addErrorInfo(errorInfo, k, 'board字段中' .. index .. '索引没有元素类型')
-											end
-										end
-
-										local mystery_box_board = info.mystery_box_board
-										if mystery_box_board then
-											for index, v in ipairs(mystery_box_board) do
-												if not v[1] then
-													addErrorInfo(errorInfo, k, 'mystery_box_board字段中' .. index .. '索引没有格子类型')
-												end
-												if not v[2] then
-													addErrorInfo(errorInfo, k, 'mystery_box_board字段中' .. index .. '索引没有元素类型')
-												end
-											end
-										end
-									end
-									if #errorInfo > 0 then
-										return table.concat(errorInfo, '\n');
-									end
-
-									return ''";
-			var resultStr = env.DoString(luaScriptString);
-			if (resultStr.Length > 0)
-			{
-				foreach(var strObj in resultStr)
-				{
-					var str = Convert.ToString(strObj);
-					if(!String.IsNullOrEmpty(str))
-					{
-						sb.Append(str + "\n");
-					}
-				}
-			}
 
 			// 检查monster
 			string monsterConfigListLua = "{";
@@ -213,7 +159,7 @@ namespace BFEditor
 				}
 			}
 			monsterConfigListLua += "}";
-			luaScriptString = "local ids = {}\n local MONSTER_LIST = " + monsterConfigListLua + "\n";
+			var luaScriptString = "local ids = {}\n local MONSTER_LIST = " + monsterConfigListLua + "\n";
 			luaScriptString += @"local str = {}
 								for i, name in ipairs(MONSTER_LIST) do
 									if name ~= 'monster_base' and name ~= 'monster_position' and name ~= 'monster_position_base' then
@@ -230,7 +176,7 @@ namespace BFEditor
 									return table.concat(str, '\n');
 								end
 								return ''";
-			resultStr = env.DoString(luaScriptString);
+			var resultStr = env.DoString(luaScriptString);
 			if (resultStr.Length > 0)
 			{
 				foreach(var strObj in resultStr)
@@ -299,6 +245,76 @@ namespace BFEditor
 			return sb;
 		}
 
+		public static void checkBoard(string configName, LuaEnv env, in StringBuilder sb)
+		{
+			var luaScriptString = @"
+									if not cfg or not cfg.data then
+										return ''
+									end
+									cfg = cfg.data
+									local tempMap = {}
+									local addErrorInfo = function(errorInfo, cfgId, errorStr)
+										if not tempMap[cfgId] then
+											tempMap[cfgId] = true
+											table.insert(errorInfo, 'cfgId = ' .. cfgId)
+										end
+
+										table.insert(errorInfo, '     ' .. errorStr)
+									end
+
+									local errorInfo = {}
+									for k, info in pairs(cfg) do
+										local board = info.board or info.board_daily_challenge
+										if not board then
+											addErrorInfo(errorInfo, k, configName .. ' 没有board字段，请检查')
+										else
+											if #board < 49 then
+												addErrorInfo(errorInfo, k, configName .. ' 没有board长度不足，请检查，当前长度为' .. #board)
+											end
+
+											for index, v in ipairs(board) do
+												if not v[1] then
+													addErrorInfo(errorInfo, k, configName .. ' board字段中' .. index .. '索引没有格子类型')
+												end
+												if not v[2] then
+													addErrorInfo(errorInfo, k, configName .. ' board字段中' .. index .. '索引没有元素类型')
+												elseif v[2] > 5 or v[2] < 0 then
+													addErrorInfo(errorInfo, k, configName .. ' board字段中' .. index .. '元素类型不合法，当前为' .. v[2])
+												end
+											end
+
+											local mystery_box_board = info.mystery_box_board
+											if mystery_box_board then
+												for index, v in ipairs(mystery_box_board) do
+													if not v[1] then
+														addErrorInfo(errorInfo, k, configName .. ' mystery_box_board字段中' .. index .. '索引没有格子类型')
+													end
+													if not v[2] then
+														addErrorInfo(errorInfo, k, configName .. ' mystery_box_board字段中' .. index .. '索引没有元素类型')
+													end
+												end
+											end
+										end
+									end
+									if #errorInfo > 0 then
+										return table.concat(errorInfo, '\n');
+									end
+
+									return ''";
+			var resultStr = env.DoString(" local cfg = require('app/config/" + configName + "')\n" + "local configName = '" + configName + "'\n" + luaScriptString);
+			if (resultStr.Length > 0)
+			{
+				foreach(var strObj in resultStr)
+				{
+					var str = Convert.ToString(strObj);
+					if(!String.IsNullOrEmpty(str))
+					{
+						sb.Append(str + "\n");
+					}
+				}
+			}
+		}
+
 		public static bool FastExportExcelToLua(bool isDeveloper, string designExcelPath)
 		{
 			failFlag = false;

BFVersions/android/dz_google_apk/build.gradle

@@ -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'
     }

BFVersions/android/dz_google_apk/gradle.properties

@@ -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

BFVersions/android/dz_google_apk/unityLibrary/IronSource.androidlib/build.gradle

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

BFVersions/android/dz_google_apk/unityLibrary/build.gradle

@@ -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
+        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     defaultConfig {
-        minSdkVersion 19
+        minSdkVersion 24
-        targetSdkVersion 33
+        targetSdkVersion 34
         ndk {
             abiFilters 'armeabi-v7a', 'arm64-v8a'
         }

BFVersions/android/google_common/launcher/build.gradle

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