Compare commits
No commits in common. "dev_sdk" and "master" have entirely different histories.
1
.gitignore
vendored
1
.gitignore
vendored
@ -54,4 +54,3 @@ Assets/Editor/FYUtils
|
||||
|
||||
Assets/Editor/FYUtils.meta
|
||||
fbg.log
|
||||
.vsconfig
|
||||
@ -20,30 +20,59 @@ namespace BFEditor.Build
|
||||
}
|
||||
}
|
||||
|
||||
public static class BuildMode
|
||||
{
|
||||
public const string DEV = "dev";
|
||||
public const string TEST = "test";
|
||||
public const string PUBLISH = "publish";
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class BuildInfo
|
||||
{
|
||||
public string bundleName; // 包名
|
||||
public string version; // 版本号
|
||||
public string mode; // 内网测试包，外网测试包，外网正式包
|
||||
public int versionCode = 1; // 各自渠道的version code
|
||||
public string mode; // 渠道名_debug 或 渠道名_release
|
||||
public int version_code = 1; // 各自渠道的version_code
|
||||
public List<BulidGitInfo> git_info; // 打包的git信息
|
||||
public bool exportProject = false; // 是否只导出工程
|
||||
public bool onlyAssetBundle = false; // 是否只打ab包
|
||||
|
||||
[NonSerialized]
|
||||
public bool skipVersion = false; // 是否跳过版本校验
|
||||
|
||||
public bool IsGPChannel()
|
||||
{
|
||||
return bundleName == "com.combo.heroes.puzzle.rpg";
|
||||
}
|
||||
|
||||
public bool IsGPOfficial()
|
||||
{
|
||||
return bundleName == "com.combo.heroes.puzzle.rpg";
|
||||
}
|
||||
|
||||
// dev包使用mono编译，不会导出as工程
|
||||
public bool IsDevChannel()
|
||||
{
|
||||
return bundleName == "com.juzu.b6.dev" || bundleName == "com.juzu.b6.dev.android" ||
|
||||
bundleName == "com.juzu.b6.dev.ios";
|
||||
}
|
||||
|
||||
public bool IsReleaseChannel()
|
||||
{
|
||||
return !IsDevChannel();
|
||||
}
|
||||
|
||||
// 是否是内网release
|
||||
public bool IsLanRelease()
|
||||
{
|
||||
return bundleName == "com.juzu.b6.release.android" || bundleName == "com.juzu.b6.release.ios";
|
||||
}
|
||||
|
||||
public bool IsPublish()
|
||||
{
|
||||
return mode == BuildMode.PUBLISH;
|
||||
return !IsDevChannel() && !IsLanRelease();
|
||||
}
|
||||
|
||||
public bool IsIOSPlatform()
|
||||
{
|
||||
return bundleName.Contains("ios");
|
||||
}
|
||||
|
||||
public bool IsAndroidPlatform()
|
||||
{
|
||||
return !IsIOSPlatform();
|
||||
}
|
||||
|
||||
public string GetBundleName()
|
||||
|
||||
@ -48,12 +48,6 @@ namespace BFEditor.Build
|
||||
return false;
|
||||
}
|
||||
|
||||
// 只打ab包
|
||||
if (buildInfo.onlyAssetBundle)
|
||||
{
|
||||
AssetDatabase.Refresh();
|
||||
return true;
|
||||
}
|
||||
// 删除不进包的多语言
|
||||
// if (!DeleteOverLanguageAb(buildInfo))
|
||||
// {
|
||||
@ -79,10 +73,19 @@ namespace BFEditor.Build
|
||||
watch.Start();
|
||||
|
||||
var result = false;
|
||||
if (BuildAndroidUtils.BuildAndroidPlayer(buildInfo))
|
||||
|
||||
if (buildInfo.IsAndroidPlatform() && BuildAndroidUtils.BuildAndroidPlayer(buildInfo))
|
||||
{
|
||||
result = true;
|
||||
}
|
||||
|
||||
#if UNITY_EDITOR_OSX
|
||||
if (buildInfo.IsIOSPlatform() && BuildIOSUtils.BuildIOSPlayer(buildInfo))
|
||||
{
|
||||
result = true;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (result)
|
||||
{
|
||||
watch.Stop();
|
||||
@ -137,7 +140,8 @@ namespace BFEditor.Build
|
||||
var watch = new System.Diagnostics.Stopwatch();
|
||||
watch.Start();
|
||||
|
||||
var isRelease = true;
|
||||
// var buildTarget = buildInfo.IsIOSPlatform() ? BuildTarget.iOS : BuildTarget.Android;
|
||||
var isRelease = buildInfo.IsReleaseChannel();
|
||||
Debug.Log("[bfinfo]开始打包资源， bundleName : " + buildInfo.bundleName + " version : " + buildInfo.version + " mode : " + buildInfo.mode);
|
||||
|
||||
// // 检查平台
|
||||
@ -193,7 +197,7 @@ namespace BFEditor.Build
|
||||
}
|
||||
|
||||
// 本地缓存ab
|
||||
if (buildInfo.IsPublish())
|
||||
if (buildInfo.IsReleaseChannel())
|
||||
{
|
||||
Debug.Log("[bfinfo]正在缓存assetbundles...");
|
||||
BFEditorUtils.CopyDirWithIgnore(outputPath, Path.Combine(AssetBundleCachePath, buildInfo.version), new List<string> { ".meta" });
|
||||
|
||||
@ -6,19 +6,20 @@ namespace BFEditor.Build
|
||||
public enum BFPlatformOptions
|
||||
{
|
||||
AndroidDev = 1,
|
||||
AndroidTest,
|
||||
IOSDev,
|
||||
AndroidRelease,
|
||||
AndroidGP,
|
||||
AndroidGPRU
|
||||
}
|
||||
|
||||
public class BuildProjectWindow : EditorWindow
|
||||
{
|
||||
private static int VersionCode = 4;
|
||||
private static string VersionName = "1.2.10";
|
||||
private static int VersionCodeRU = 12;
|
||||
private static string VersionNameRU = "0.4.9";
|
||||
private static int versionCode = 18;
|
||||
private static string versionName = "1.6.5";
|
||||
BFPlatformOptions platform = BFPlatformOptions.AndroidDev;
|
||||
const string ANDROID_GP_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_GP_PACKAGE_NAME = "com.combo.heroes.puzzle.rpg";
|
||||
const string IOS_PACKAGE_NAME = "com.juzu.b6.dev.ios";
|
||||
|
||||
public BuildProjectWindow()
|
||||
{
|
||||
@ -29,93 +30,53 @@ namespace BFEditor.Build
|
||||
|
||||
void OnGUI()
|
||||
{
|
||||
GUILayout.BeginVertical("box");
|
||||
|
||||
EditorGUILayout.LabelField("选择渠道");
|
||||
platform = (BFPlatformOptions)EditorGUILayout.EnumPopup("", platform);
|
||||
EditorGUILayout.Space();
|
||||
|
||||
EditorGUILayout.LabelField("版本: " + versionName);
|
||||
EditorGUILayout.Space();
|
||||
|
||||
string packageName;
|
||||
string mode;
|
||||
string versionName = VersionName;
|
||||
int versionCode = VersionCode;
|
||||
bool skipVersion = false;
|
||||
string appType;
|
||||
if (platform == BFPlatformOptions.AndroidDev)
|
||||
{
|
||||
packageName = ANDROID_GP_PACKAGE_NAME;
|
||||
packageName = ANDROID_DEV_PACKAGE_NAME;
|
||||
skipVersion = true;
|
||||
mode = BuildMode.DEV;
|
||||
versionName = "0.1.0";
|
||||
versionCode = 1;
|
||||
appType = "内网测试包";
|
||||
mode = "dev_debug";
|
||||
}
|
||||
else if(platform == BFPlatformOptions.AndroidTest)
|
||||
else if(platform == BFPlatformOptions.AndroidRelease)
|
||||
{
|
||||
packageName = ANDROID_GP_PACKAGE_NAME;
|
||||
mode = BuildMode.TEST;
|
||||
versionName = "0.1.0";
|
||||
versionCode = 1;
|
||||
appType = "外网测试包";
|
||||
packageName = ANDROID_RELEASE_PACKAGE_NAME;
|
||||
mode = "release_release";
|
||||
}
|
||||
else if(platform == BFPlatformOptions.AndroidGP)
|
||||
{
|
||||
packageName = ANDROID_GP_PACKAGE_NAME;
|
||||
mode = BuildMode.PUBLISH;
|
||||
appType = "外网正式包";
|
||||
mode = "publish_release";
|
||||
}
|
||||
else
|
||||
{
|
||||
packageName = ANDROID_GP_PACKAGE_NAME;
|
||||
skipVersion = true;
|
||||
mode = BuildMode.DEV;
|
||||
versionName = "0.1.0";
|
||||
versionCode = 1;
|
||||
appType = "内网测试包";
|
||||
packageName = IOS_PACKAGE_NAME;
|
||||
mode = "dev_debug";
|
||||
}
|
||||
GUILayout.BeginVertical("box");
|
||||
EditorGUILayout.LabelField("选择");
|
||||
platform = (BFPlatformOptions)EditorGUILayout.EnumPopup("", platform);
|
||||
EditorGUILayout.Space();
|
||||
EditorGUILayout.LabelField("版本: " + versionName);
|
||||
EditorGUILayout.Space();
|
||||
EditorGUILayout.LabelField("包名: " + packageName);
|
||||
EditorGUILayout.Space();
|
||||
EditorGUILayout.LabelField(appType);
|
||||
EditorGUILayout.Space();
|
||||
EditorGUILayout.LabelField("mode: " + mode);
|
||||
EditorGUILayout.Space();
|
||||
|
||||
EditorGUILayout.Space();
|
||||
|
||||
if (GUILayout.Button("一键打包"))
|
||||
{
|
||||
var buildInfo = new BuildInfo();
|
||||
buildInfo.version = versionName;
|
||||
buildInfo.versionCode = versionCode;
|
||||
buildInfo.version_code = versionCode;
|
||||
buildInfo.mode = mode;
|
||||
buildInfo.bundleName = packageName;
|
||||
buildInfo.skipVersion = skipVersion;
|
||||
|
||||
if (GUILayout.Button("一键APK"))
|
||||
{
|
||||
buildInfo.exportProject = false;
|
||||
buildInfo.onlyAssetBundle = false;
|
||||
BuildProjectTools.BuildBFPlayer(buildInfo);
|
||||
}
|
||||
|
||||
EditorGUILayout.Space();
|
||||
EditorGUILayout.Space();
|
||||
EditorGUILayout.Space();
|
||||
EditorGUILayout.Space();
|
||||
EditorGUILayout.Space();
|
||||
|
||||
if (GUILayout.Button("仅导出工程"))
|
||||
{
|
||||
buildInfo.exportProject = true;
|
||||
buildInfo.onlyAssetBundle = false;
|
||||
BuildProjectTools.BuildBFPlayer(buildInfo);
|
||||
}
|
||||
|
||||
EditorGUILayout.Space();
|
||||
EditorGUILayout.Space();
|
||||
EditorGUILayout.Space();
|
||||
EditorGUILayout.Space();
|
||||
EditorGUILayout.Space();
|
||||
|
||||
if (GUILayout.Button("仅打ab包"))
|
||||
{
|
||||
buildInfo.exportProject = true;
|
||||
buildInfo.onlyAssetBundle = true;
|
||||
BuildProjectTools.BuildBFPlayer(buildInfo);
|
||||
}
|
||||
|
||||
|
||||
@ -77,12 +77,25 @@ namespace BFEditor.Build
|
||||
Directory.CreateDirectory(outputPath);
|
||||
}
|
||||
|
||||
AssetBundleManifest manifest = BuildPipeline.BuildAssetBundles(outputPath, options |
|
||||
AssetBundleManifest manifest;
|
||||
if (release)
|
||||
{
|
||||
manifest = BuildPipeline.BuildAssetBundles(outputPath, options |
|
||||
BuildAssetBundleOptions.StrictMode |
|
||||
BuildAssetBundleOptions.DisableLoadAssetByFileName |
|
||||
BuildAssetBundleOptions.DisableLoadAssetByFileNameWithExtension |
|
||||
BuildAssetBundleOptions.DeterministicAssetBundle,
|
||||
target);
|
||||
}
|
||||
else
|
||||
{
|
||||
manifest = BuildPipeline.BuildAssetBundles(outputPath, options |
|
||||
BuildAssetBundleOptions.StrictMode |
|
||||
BuildAssetBundleOptions.DisableLoadAssetByFileName |
|
||||
BuildAssetBundleOptions.DisableLoadAssetByFileNameWithExtension |
|
||||
BuildAssetBundleOptions.DeterministicAssetBundle,
|
||||
target);
|
||||
}
|
||||
|
||||
if (manifest == null)
|
||||
{
|
||||
@ -352,12 +365,12 @@ namespace BFEditor.Build
|
||||
SetProtoABName(Path.Combine(Application.dataPath, "proto"), index++ / total);
|
||||
SetSpineABName(Path.Combine(Application.dataPath, "arts", "spines"), index++ / total);
|
||||
SetFirstABName(Path.Combine(Application.dataPath, "first"), index++ / total);
|
||||
// SetTimelineABName(Path.Combine(Application.dataPath, "arts", "timeline"), index++ / total);
|
||||
// SetTimelineABName(Path.Combine(Application.dataPath, "arts", "timeline"), 16f / total);
|
||||
SetVideoABName(Path.Combine(Application.dataPath, "arts", "video"), index++ / total);
|
||||
// SetLanguageResABName(Resource.ResourceProcessConfig.LANGUAGE_PATH, index++ / total);
|
||||
// SetBakedatasABName(Path.Combine(Application.dataPath, "arts", "bakedatas"), index++ / total);
|
||||
// SetLightProbesABName(Path.Combine(Application.dataPath, "arts", "lightprobes"), index++ / total);
|
||||
// SetReflectionsABName(Path.Combine(Application.dataPath, "arts", "reflections"), index++ / total);
|
||||
// SetLanguageResABName(Resource.ResourceProcessConfig.LANGUAGE_PATH, 19f / total);
|
||||
// SetBakedatasABName(Path.Combine(Application.dataPath, "arts", "bakedatas"), 21f / total);
|
||||
// SetLightProbesABName(Path.Combine(Application.dataPath, "arts", "lightprobes"), 22f / total);
|
||||
// SetReflectionsABName(Path.Combine(Application.dataPath, "arts", "reflections"), 23f / total);
|
||||
|
||||
EditorUtility.ClearProgressBar();
|
||||
AssetDatabase.SaveAssets();
|
||||
@ -559,11 +572,11 @@ namespace BFEditor.Build
|
||||
{
|
||||
EditorUtility.DisplayProgressBar("提示", "正在设置spine ABName", progress);
|
||||
|
||||
string[] dirList = { "ui" , "characters" };
|
||||
for (var i = 0; i < dirList.Length; ++i)
|
||||
var dirInfo = new DirectoryInfo(dirPath);
|
||||
var dirs = dirInfo.GetDirectories();
|
||||
for (var i = 0; i < dirs.Length; i++)
|
||||
{
|
||||
var dirInfo = new DirectoryInfo(Path.Combine(dirPath, dirList[i]));
|
||||
SetABNameBySubDir(dirInfo);
|
||||
SetABNameBySubDir(dirs[i]);
|
||||
}
|
||||
}
|
||||
|
||||
@ -583,11 +596,6 @@ namespace BFEditor.Build
|
||||
var dirInfo = new DirectoryInfo(Path.Combine(dirPath, dirList[i]));
|
||||
SetABNameBySubDir(dirInfo);
|
||||
}
|
||||
var dirInfo2 = new DirectoryInfo(Path.Combine(dirPath, "ui", "activity"));
|
||||
if (dirInfo2.Exists)
|
||||
{
|
||||
SetABNameBySubDir(dirInfo2);
|
||||
}
|
||||
}
|
||||
|
||||
static void SetBackgroundABName(string dirPath)
|
||||
|
||||
@ -3,9 +3,9 @@ using UnityEditor;
|
||||
using System.IO;
|
||||
using UnityEditor.Build.Reporting;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Collections.Generic;
|
||||
using System;
|
||||
using System.Threading;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace BFEditor.Build
|
||||
{
|
||||
@ -24,13 +24,13 @@ namespace BFEditor.Build
|
||||
static string BuglyPath = Application.dataPath + "/../Bugly";
|
||||
static string BuglySOPath = Application.dataPath + "/../Bugly/so";
|
||||
static string GradleExcuteProjectPath = Application.dataPath + "/../BFVersions/android/ub-release";
|
||||
static string DevAsProjectPath = Application.dataPath + "/../BFVersions/android/dz_dev";
|
||||
static string LanReleaseAsProjectPath = Application.dataPath + "/../BFVersions/android/dz_release";
|
||||
static string GoogleAsProjectPath = Application.dataPath + "/../BFVersions/android/dz_google_apk";
|
||||
static string GoogleCommonProjectPath = Application.dataPath + "/../BFVersions/android/google_common";
|
||||
static string RuStoreProjectPath = Application.dataPath + "/../BFVersions/android/ru_store";
|
||||
static string RuProjectPath = Application.dataPath + "/../BFVersions/android/ru";
|
||||
static string GoogleServicesProjectPath = Application.dataPath + "/../BFVersions/android/google-services";
|
||||
static string GPAsProjectPath = Application.dataPath + "/../BFVersions/android/ub-gp"; // gp删档测试渠道
|
||||
static string GPOfficialAsProjectPath = Application.dataPath + "/../BFVersions/android/ub-google"; // gp正式渠道
|
||||
static string PublishAsProjectPath = Application.dataPath + "/../BFVersions/android/publish_release";
|
||||
static string KeystoreFilePath = Application.dataPath + "/../BFVersions/android/keystore/dz_keystore.txt";
|
||||
static string SignShellPath = Application.dataPath + "/../BFFiles/androidkey";
|
||||
static string GpAlginShellPath = Application.dataPath + "/../BFFiles/androidkey";
|
||||
static HashSet<string> AABInPackageFileHashSet = new HashSet<string>()
|
||||
@ -77,19 +77,10 @@ namespace BFEditor.Build
|
||||
var bpOptions = GetBuildOptions(buildInfo);
|
||||
var report = BuildPipeline.BuildPlayer(bpOptions);
|
||||
|
||||
// 导出工程成功
|
||||
// 打包成功
|
||||
if (report.summary.result == BuildResult.Succeeded)
|
||||
{
|
||||
MergeProject(buildInfo, GoogleAsProjectPath);
|
||||
FixGradleVersion(buildInfo.versionCode, buildInfo.version);
|
||||
if (buildInfo.exportProject)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return BuildAPK(buildInfo);
|
||||
}
|
||||
return BuildAndroidAPK(buildInfo);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -107,7 +98,7 @@ namespace BFEditor.Build
|
||||
PlayerSettings.bundleVersion = buildInfo.version;
|
||||
|
||||
// 设置VersionCode
|
||||
PlayerSettings.Android.bundleVersionCode = buildInfo.versionCode;
|
||||
PlayerSettings.Android.bundleVersionCode = buildInfo.version_code;
|
||||
|
||||
// 设置竖屏
|
||||
PlayerSettings.defaultInterfaceOrientation = UIOrientation.Portrait;
|
||||
@ -127,33 +118,41 @@ namespace BFEditor.Build
|
||||
|
||||
// 设置包名
|
||||
PlayerSettings.SetApplicationIdentifier(BuildTargetGroup.Android, buildInfo.bundleName);
|
||||
Debug.Log("[bfinfo]设置包名:" + buildInfo.bundleName);
|
||||
|
||||
// 跳过版本控制
|
||||
var symbols = ANDROID_DEFINE_SYMBOLS;
|
||||
if (buildInfo.skipVersion)
|
||||
{
|
||||
symbols = symbols + ";SKIP_VERSION";
|
||||
}
|
||||
if (buildInfo.mode == BuildMode.DEV)
|
||||
{
|
||||
symbols = symbols + ";BF_APP_DEV";
|
||||
}
|
||||
else if (buildInfo.mode == BuildMode.TEST)
|
||||
{
|
||||
symbols = symbols + ";BF_APP_TEST";
|
||||
symbols = symbols + ";SKIP_VERSION;";
|
||||
}
|
||||
|
||||
PlayerSettings.SetScriptingDefineSymbolsForGroup(BuildTargetGroup.Android, symbols);
|
||||
Debug.Log("[bfinfo]设置defineSymbols: " + symbols);
|
||||
|
||||
PlayerSettings.productName = "C1";
|
||||
EditorUserBuildSettings.development = false;
|
||||
EditorUserBuildSettings.androidBuildType = AndroidBuildType.Release;
|
||||
// 是否是dev
|
||||
var development = buildInfo.IsDevChannel() ? true : false;
|
||||
EditorUserBuildSettings.development = development;
|
||||
|
||||
// 商品名称
|
||||
// 应用名
|
||||
if (buildInfo.IsPublish())
|
||||
{
|
||||
PlayerSettings.productName = "Knights Combo";
|
||||
}
|
||||
else
|
||||
{
|
||||
PlayerSettings.productName = development ? "b6-dev" : "b6-release";
|
||||
}
|
||||
// BuildType设置dev/release
|
||||
EditorUserBuildSettings.androidBuildType = development ? AndroidBuildType.Debug : AndroidBuildType.Release;
|
||||
|
||||
// 是否导出as工程
|
||||
// EditorUserBuildSettings.exportAsGoogleAndroidProject = development ? false : true;
|
||||
EditorUserBuildSettings.exportAsGoogleAndroidProject = true;
|
||||
|
||||
var scriptImp = ScriptingImplementation.IL2CPP;
|
||||
// dev使用Mono release使用IL2CPP
|
||||
var scriptImp = development ? ScriptingImplementation.Mono2x : ScriptingImplementation.IL2CPP;
|
||||
PlayerSettings.SetScriptingBackend(BuildTargetGroup.Android, scriptImp);
|
||||
}
|
||||
|
||||
@ -165,9 +164,29 @@ namespace BFEditor.Build
|
||||
var bpOptions = new BuildPlayerOptions();
|
||||
bpOptions.scenes = AssetBundleUtils.GetBuildScenes();
|
||||
bpOptions.target = BuildTarget.Android;
|
||||
|
||||
// if (buildInfo.IsDevChannel())
|
||||
// {
|
||||
// bpOptions.locationPathName = GetDevApkPathName(buildInfo);
|
||||
// Debug.Log("[bfinfo]apk path : " + bpOptions.locationPathName);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// bpOptions.locationPathName = GetASProjectPathName();
|
||||
// Debug.Log("[bfinfo]asProject path : " + bpOptions.locationPathName);
|
||||
// }
|
||||
bpOptions.locationPathName = GetASProjectPathName(buildInfo);
|
||||
|
||||
BuildOptions options = BuildOptions.None;
|
||||
BuildOptions options;
|
||||
if (buildInfo.IsReleaseChannel())
|
||||
{
|
||||
options = BuildOptions.None;
|
||||
}
|
||||
else
|
||||
{
|
||||
options = BuildOptions.Development;
|
||||
}
|
||||
|
||||
bpOptions.options = options;
|
||||
return bpOptions;
|
||||
}
|
||||
@ -181,7 +200,7 @@ namespace BFEditor.Build
|
||||
|
||||
static string GetASProjectPathName(BuildInfo buildInfo)
|
||||
{
|
||||
var dir = Path.Combine(AS_PROJECT_PATH, "publish_release");
|
||||
var dir = Path.Combine(AS_PROJECT_PATH, buildInfo.mode);
|
||||
if (Directory.Exists(dir))
|
||||
{
|
||||
Directory.Delete(dir, true);
|
||||
@ -189,53 +208,32 @@ namespace BFEditor.Build
|
||||
return dir;
|
||||
}
|
||||
|
||||
static bool BuildAPK(BuildInfo buildInfo, bool isAAB = false)
|
||||
static bool BuildAPK(BuildInfo buildInfo)
|
||||
{
|
||||
// 设置jdk环境变量
|
||||
string javaHomePath = System.Environment.GetEnvironmentVariable("JAVE_HOME");
|
||||
if (string.IsNullOrEmpty(javaHomePath))
|
||||
if (buildInfo.IsGPChannel())
|
||||
{
|
||||
Debug.LogError("[bferror] 找不到环境变量JAVE_HOME");
|
||||
return false;
|
||||
MergeGPToReleaseProject(buildInfo);
|
||||
FixGradleVersion(buildInfo.version_code, buildInfo.version);
|
||||
}
|
||||
var gradleFilePath = Path.Combine(PublishAsProjectPath, "gradle.properties");
|
||||
var gradleFileText = File.ReadAllText(gradleFilePath);
|
||||
if (!gradleFileText.Contains("org.gradle.java.home"))
|
||||
{
|
||||
gradleFileText = gradleFileText + "\norg.gradle.java.home=" + javaHomePath.Replace("\\", "/");
|
||||
}
|
||||
File.WriteAllText(gradleFilePath, gradleFileText);
|
||||
|
||||
// 设置密钥密码
|
||||
if (File.Exists(KeystoreFilePath))
|
||||
if (buildInfo.IsLanRelease())
|
||||
{
|
||||
var password = File.ReadAllText(KeystoreFilePath).Replace("\n", "").Replace("\r", "");
|
||||
var buildGradlePath = Path.Combine(PublishAsProjectPath, "launcher/build.gradle");
|
||||
var text = File.ReadAllText(buildGradlePath);
|
||||
var regex = new Regex("REPLACE_PASSWORD");
|
||||
text = regex.Replace(text, password);
|
||||
File.WriteAllText(buildGradlePath, text);
|
||||
AddBuglyParamsToReleaseProject();
|
||||
}
|
||||
|
||||
Debug.Log("[bfinfo]正在buildApk...");
|
||||
var success = true;
|
||||
var args = "assembleRelease";
|
||||
if (isAAB)
|
||||
var args = "";
|
||||
if (buildInfo.IsReleaseChannel())
|
||||
{
|
||||
args = "bundleRelease";
|
||||
args += " assembleRelease";
|
||||
}
|
||||
string gradleHomePath = System.Environment.GetEnvironmentVariable("GRADLE_HOME");
|
||||
if (string.IsNullOrEmpty(gradleHomePath))
|
||||
else
|
||||
{
|
||||
Debug.LogError("[bferror] 找不到环境变量GRADLE_HOME");
|
||||
return false;
|
||||
args += " assembleDebug";
|
||||
}
|
||||
#if UNITY_EDITOR_OSX
|
||||
var gradleCommondPath = Path.Combine(gradleHomePath, "gradle");
|
||||
#else
|
||||
var gradleCommondPath = Path.Combine(gradleHomePath, "gradle.bat");
|
||||
#endif
|
||||
BFEditorUtils.RunCommond(gradleCommondPath, args, PublishAsProjectPath,
|
||||
|
||||
BFEditorUtils.RunCommond(GRADLE_PATH, args, GradleExcuteProjectPath,
|
||||
(msg) =>
|
||||
{
|
||||
},
|
||||
@ -247,35 +245,80 @@ namespace BFEditor.Build
|
||||
Debug.LogError("[bferror] " + errorMsg);
|
||||
}
|
||||
});
|
||||
|
||||
if (buildInfo.IsGPChannel())
|
||||
{
|
||||
// 尝试制作并上传bugly符号表 开新Thread不影响打包流程
|
||||
if (success)
|
||||
{
|
||||
CopySOAndUploadBuglySymbol(buildInfo.bundleName, buildInfo.version);
|
||||
}
|
||||
}
|
||||
|
||||
return success;
|
||||
}
|
||||
|
||||
static bool BuildAAB(BuildInfo buildInfo)
|
||||
{
|
||||
var result = true;
|
||||
if(buildInfo.IsGPChannel())
|
||||
{
|
||||
// MergeGPToReleaseProject(buildInfo);
|
||||
// FixGradleVersion(buildInfo.version_code, buildInfo.version);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
static bool BuildAndroidAPK(BuildInfo buildInfo)
|
||||
{
|
||||
var result = true;
|
||||
if(buildInfo.IsDevChannel())
|
||||
{
|
||||
MergeProject(buildInfo, DevAsProjectPath);
|
||||
var dir = Path.Combine(Application.dataPath, "../", AS_PROJECT_PATH, buildInfo.mode);
|
||||
BFEditorUtils.RunCommond("gradle", " assembleDebug", dir, (msg) => {
|
||||
}, (errorMsg) => {
|
||||
Debug.LogError("[bferror] " + errorMsg);
|
||||
});
|
||||
}
|
||||
else if(buildInfo.IsLanRelease())
|
||||
{
|
||||
MergeProject(buildInfo, LanReleaseAsProjectPath);
|
||||
}
|
||||
else if(buildInfo.IsGPChannel())
|
||||
{
|
||||
MergeProject(buildInfo, GoogleAsProjectPath);
|
||||
FixGradleVersion(buildInfo.version_code, buildInfo.version);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 合并工程
|
||||
/// 合并dev工程
|
||||
/// </summary>
|
||||
static void MergeProject(BuildInfo buildInfo, String asProjectPath)
|
||||
{
|
||||
Debug.Log("[bfinfo]正在整合 project...");
|
||||
Debug.Log("[bfinfo]正在整合dev project...");
|
||||
|
||||
var dir = Path.Combine(Application.dataPath, "../", AS_PROJECT_PATH, "publish_release");
|
||||
var dir = Path.Combine(Application.dataPath, "../", AS_PROJECT_PATH, buildInfo.mode);
|
||||
|
||||
var javaPath = Path.Combine(dir, "unityLibrary/src/main/java");
|
||||
var manifestPath = Path.Combine(dir, "unityLibrary/src/main/AndroidManifest.xml");
|
||||
|
||||
// 老版本unity需要替换这个，2021之后的新版本不需要
|
||||
// 获取到unity打出的build-id
|
||||
// var reader = new StreamReader(new FileStream(manifestPath, FileMode.Open));
|
||||
// string buildIdLine;
|
||||
// while ((buildIdLine = reader.ReadLine()) != null)
|
||||
// {
|
||||
// if (buildIdLine.Contains("unity.build-id"))
|
||||
// {
|
||||
// Debug.Log("[bfinfo]修正build-id: " + buildIdLine);
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// reader.Close();
|
||||
// reader.Dispose();
|
||||
var reader = new StreamReader(new FileStream(manifestPath, FileMode.Open));
|
||||
string buildIdLine;
|
||||
while ((buildIdLine = reader.ReadLine()) != null)
|
||||
{
|
||||
if (buildIdLine.Contains("unity.build-id"))
|
||||
{
|
||||
Debug.Log("[bfinfo]修正build-id: " + buildIdLine);
|
||||
break;
|
||||
}
|
||||
}
|
||||
reader.Close();
|
||||
reader.Dispose();
|
||||
|
||||
if (Directory.Exists(javaPath))
|
||||
{
|
||||
@ -283,33 +326,6 @@ namespace BFEditor.Build
|
||||
di.Delete(true);
|
||||
}
|
||||
|
||||
// 如果是俄罗斯支付 则需要覆盖为俄罗斯相关文件
|
||||
// if (buildInfo.bundleName == BF.BFPlatform.ANDROID_GP_PACKAGE_NAME_RU)
|
||||
// {
|
||||
// BFEditorUtils.CopyDir(RuProjectPath, dir);
|
||||
// // 获取到build.gradle和AndroidManifest
|
||||
// var buildGradlePath = Path.Combine(dir, "launcher/build.gradle");
|
||||
// var text = File.ReadAllText(buildGradlePath);
|
||||
// var regex = new Regex("REPLACE_APPLICATION_ID");
|
||||
// text = regex.Replace(text, buildInfo.bundleName);
|
||||
// File.WriteAllText(buildGradlePath, text);
|
||||
|
||||
// var androidManifestPath = Path.Combine(dir, "launcher/src/main/AndroidManifest.xml");
|
||||
// text = File.ReadAllText(androidManifestPath);
|
||||
// regex = new Regex("REPLACE_APPLICATION_ID");
|
||||
// text = regex.Replace(text, buildInfo.bundleName);
|
||||
// File.WriteAllText(androidManifestPath, text);
|
||||
|
||||
// // 还有另一个AndroidManifest
|
||||
// androidManifestPath = Path.Combine(dir, "unityLibrary/src/main/AndroidManifest.xml");
|
||||
// text = File.ReadAllText(androidManifestPath);
|
||||
// regex = new Regex("REPLACE_APPLICATION_ID");
|
||||
// text = regex.Replace(text, buildInfo.bundleName);
|
||||
// File.WriteAllText(androidManifestPath, text);
|
||||
// }
|
||||
// // 否则使用通用谷歌
|
||||
// else
|
||||
// {
|
||||
BFEditorUtils.CopyDir(GoogleCommonProjectPath, dir);
|
||||
// 获取到google_common复制过去的build.gradle和AndroidManifest
|
||||
var buildGradlePath = Path.Combine(dir, "launcher/build.gradle");
|
||||
@ -325,20 +341,56 @@ namespace BFEditor.Build
|
||||
File.WriteAllText(androidManifestPath, text);
|
||||
|
||||
BFEditorUtils.CopyDir(asProjectPath, dir);
|
||||
// 还有dz_google_apk下的AndroidManifest
|
||||
androidManifestPath = Path.Combine(dir, "unityLibrary/src/main/AndroidManifest.xml");
|
||||
text = File.ReadAllText(androidManifestPath);
|
||||
regex = new Regex("REPLACE_APPLICATION_ID");
|
||||
text = regex.Replace(text, buildInfo.bundleName);
|
||||
File.WriteAllText(androidManifestPath, text);
|
||||
// }
|
||||
// 统一替换google-services文件
|
||||
var gsPath = Path.Combine(GoogleServicesProjectPath, Path.Combine(buildInfo.bundleName, "google-services.json"));
|
||||
if (File.Exists(gsPath))
|
||||
{
|
||||
var destFilePath = Path.Combine(dir, "launcher/google-services.json");
|
||||
File.Copy(gsPath, destFilePath, true);
|
||||
|
||||
text = File.ReadAllText(manifestPath);
|
||||
regex = new Regex("REPLACE_BUILD_ID");
|
||||
text = regex.Replace(text, buildIdLine);
|
||||
File.WriteAllText(manifestPath, text);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 合并gp工程
|
||||
/// </summary>
|
||||
static void MergeGPToReleaseProject(BuildInfo buildInfo)
|
||||
{
|
||||
Debug.Log("[bfinfo]正在整合gp渠道sdk...");
|
||||
|
||||
var javaPath = GradleExcuteProjectPath + "/src/main/java";
|
||||
var manifestPath = GradleExcuteProjectPath + "/src/main/AndroidManifest.xml";
|
||||
|
||||
// 获取到unity打出的build-id
|
||||
var reader = new StreamReader(new FileStream(manifestPath, FileMode.Open));
|
||||
string buildIdLine;
|
||||
while ((buildIdLine = reader.ReadLine()) != null)
|
||||
{
|
||||
if (buildIdLine.Contains("unity.build-id"))
|
||||
{
|
||||
Debug.Log("[bfinfo]修正build-id: " + buildIdLine);
|
||||
break;
|
||||
}
|
||||
}
|
||||
reader.Close();
|
||||
reader.Dispose();
|
||||
|
||||
if (Directory.Exists(javaPath))
|
||||
{
|
||||
var di = new DirectoryInfo(javaPath);
|
||||
di.Delete(true);
|
||||
}
|
||||
|
||||
if (buildInfo.IsGPOfficial())
|
||||
{
|
||||
BFEditorUtils.CopyDir(GPOfficialAsProjectPath, GradleExcuteProjectPath);
|
||||
}
|
||||
else
|
||||
{
|
||||
BFEditorUtils.CopyDir(GPAsProjectPath, GradleExcuteProjectPath);
|
||||
}
|
||||
|
||||
var text = File.ReadAllText(manifestPath);
|
||||
var regex = new Regex("REPLACE_BUILD_ID");
|
||||
text = regex.Replace(text, buildIdLine);
|
||||
File.WriteAllText(manifestPath, text);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@ -1,348 +1,348 @@
|
||||
// #if UNITY_EDITOR_OSX
|
||||
// using UnityEngine;
|
||||
// using UnityEditor;
|
||||
// using UnityEditor.Build.Reporting;
|
||||
// using UnityEditor.iOS.Xcode;
|
||||
// using System.IO;
|
||||
// #endif
|
||||
#if UNITY_EDITOR_OSX
|
||||
using UnityEngine;
|
||||
using UnityEditor;
|
||||
using UnityEditor.Build.Reporting;
|
||||
using UnityEditor.iOS.Xcode;
|
||||
using System.IO;
|
||||
#endif
|
||||
|
||||
// namespace BFEditor.Build
|
||||
// {
|
||||
// public static class BuildIOSUtils
|
||||
// {
|
||||
// #if UNITY_EDITOR_OSX
|
||||
// const string IOS_DEFINE_SYMBOLS = "THREAD_SAFE;USE_AB";
|
||||
// const string DEV_XCODE_LOCAL_PATH = "BFVersions/ios/dev";
|
||||
// const string RELEASE_XCODE_LOCAL_PATH = "BFVersions/ios/release";
|
||||
namespace BFEditor.Build
|
||||
{
|
||||
public static class BuildIOSUtils
|
||||
{
|
||||
#if UNITY_EDITOR_OSX
|
||||
const string IOS_DEFINE_SYMBOLS = "THREAD_SAFE;USE_AB";
|
||||
const string DEV_XCODE_LOCAL_PATH = "BFVersions/ios/dev";
|
||||
const string RELEASE_XCODE_LOCAL_PATH = "BFVersions/ios/release";
|
||||
|
||||
// static string devXCodePath = Application.dataPath + "/../" + DEV_XCODE_LOCAL_PATH;
|
||||
// static string releaseXCodePath = Application.dataPath + "/../" + RELEASE_XCODE_LOCAL_PATH;
|
||||
// static string devOptionsPListPath = Application.dataPath + "/../" + "BFVersions/ios/exports/dev/ExportOptions.plist";
|
||||
// static string releaseOptionsPListPath = Application.dataPath + "/../" + "BFVersions/ios/exports/release/ExportOptions.plist";
|
||||
// static string publishOptionsPListPath = Application.dataPath + "/../" + "BFVersions/ios/exports/dis/ExportOptions.plist";
|
||||
static string devXCodePath = Application.dataPath + "/../" + DEV_XCODE_LOCAL_PATH;
|
||||
static string releaseXCodePath = Application.dataPath + "/../" + RELEASE_XCODE_LOCAL_PATH;
|
||||
static string devOptionsPListPath = Application.dataPath + "/../" + "BFVersions/ios/exports/dev/ExportOptions.plist";
|
||||
static string releaseOptionsPListPath = Application.dataPath + "/../" + "BFVersions/ios/exports/release/ExportOptions.plist";
|
||||
static string publishOptionsPListPath = Application.dataPath + "/../" + "BFVersions/ios/exports/dis/ExportOptions.plist";
|
||||
|
||||
// public static bool BuildIOSPlayer(BuildInfo buildInfo)
|
||||
// {
|
||||
// var buildTarget = BuildTarget.iOS;
|
||||
public static bool BuildIOSPlayer(BuildInfo buildInfo)
|
||||
{
|
||||
var buildTarget = BuildTarget.iOS;
|
||||
|
||||
// // 检查平台
|
||||
// if (EditorUserBuildSettings.activeBuildTarget != buildTarget)
|
||||
// {
|
||||
// Debug.LogError("[bferror]当前没有在对应平台");
|
||||
// return false;
|
||||
// }
|
||||
// 检查平台
|
||||
if (EditorUserBuildSettings.activeBuildTarget != buildTarget)
|
||||
{
|
||||
Debug.LogError("[bferror]当前没有在对应平台");
|
||||
return false;
|
||||
}
|
||||
|
||||
// // 重新生成XLua
|
||||
// CompileScriptsUtils.RegenerateXLuaCode(true);
|
||||
// 重新生成XLua
|
||||
CompileScriptsUtils.RegenerateXLuaCode(true);
|
||||
|
||||
// // 打包设置
|
||||
// BuildSettings(buildInfo);
|
||||
// 打包设置
|
||||
BuildSettings(buildInfo);
|
||||
|
||||
// // 开始打包
|
||||
// var bpOptions = GetBuildOptions(buildInfo);
|
||||
// var report = BuildPipeline.BuildPlayer(bpOptions);
|
||||
// if (report.summary.result == BuildResult.Succeeded)
|
||||
// {
|
||||
// return BuildIpaFromXCode(buildInfo);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// Debug.LogError("[bferror]unity打包xcode失败");
|
||||
// return false;
|
||||
// }
|
||||
// }
|
||||
// 开始打包
|
||||
var bpOptions = GetBuildOptions(buildInfo);
|
||||
var report = BuildPipeline.BuildPlayer(bpOptions);
|
||||
if (report.summary.result == BuildResult.Succeeded)
|
||||
{
|
||||
return BuildIpaFromXCode(buildInfo);
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogError("[bferror]unity打包xcode失败");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// /// <summary>
|
||||
// /// 打包设置
|
||||
// /// </summary>
|
||||
// static void BuildSettings(BuildInfo buildInfo)
|
||||
// {
|
||||
// // 设置bundleVersion
|
||||
// PlayerSettings.bundleVersion = buildInfo.version;
|
||||
/// <summary>
|
||||
/// 打包设置
|
||||
/// </summary>
|
||||
static void BuildSettings(BuildInfo buildInfo)
|
||||
{
|
||||
// 设置bundleVersion
|
||||
PlayerSettings.bundleVersion = buildInfo.version;
|
||||
|
||||
// // 设置buildNumber
|
||||
// PlayerSettings.iOS.buildNumber = buildInfo.versionCode.ToString();
|
||||
// 设置buildNumber
|
||||
PlayerSettings.iOS.buildNumber = buildInfo.version_code.ToString();
|
||||
|
||||
// // 设置竖屏
|
||||
// PlayerSettings.defaultInterfaceOrientation = UIOrientation.Portrait;
|
||||
// PlayerSettings.allowedAutorotateToPortrait = false;
|
||||
// PlayerSettings.allowedAutorotateToPortraitUpsideDown = false;
|
||||
// PlayerSettings.allowedAutorotateToLandscapeLeft = false;
|
||||
// PlayerSettings.allowedAutorotateToLandscapeRight = false;
|
||||
// 设置竖屏
|
||||
PlayerSettings.defaultInterfaceOrientation = UIOrientation.Portrait;
|
||||
PlayerSettings.allowedAutorotateToPortrait = false;
|
||||
PlayerSettings.allowedAutorotateToPortraitUpsideDown = false;
|
||||
PlayerSettings.allowedAutorotateToLandscapeLeft = false;
|
||||
PlayerSettings.allowedAutorotateToLandscapeRight = false;
|
||||
|
||||
// // 允许Xcode根据appleDeveloperTeamID自动签署应用程序
|
||||
// PlayerSettings.iOS.appleEnableAutomaticSigning = !buildInfo.IsPublish();
|
||||
// 允许Xcode根据appleDeveloperTeamID自动签署应用程序
|
||||
PlayerSettings.iOS.appleEnableAutomaticSigning = !buildInfo.IsPublish();
|
||||
|
||||
// // 使用手动签名时iOS资源调配配置文件的类型，自动
|
||||
// PlayerSettings.iOS.iOSManualProvisioningProfileType = buildInfo.IsPublish() ? ProvisioningProfileType.Distribution : ProvisioningProfileType.Automatic;
|
||||
// 使用手动签名时iOS资源调配配置文件的类型，自动
|
||||
PlayerSettings.iOS.iOSManualProvisioningProfileType = buildInfo.IsPublish() ? ProvisioningProfileType.Distribution : ProvisioningProfileType.Automatic;
|
||||
|
||||
// // 关闭启动动画
|
||||
// PlayerSettings.SplashScreen.show = false;
|
||||
// 关闭启动动画
|
||||
PlayerSettings.SplashScreen.show = false;
|
||||
|
||||
// // 设置包名
|
||||
// PlayerSettings.SetApplicationIdentifier(BuildTargetGroup.iOS, buildInfo.bundleName);
|
||||
// Debug.Log("[bfinfo]设置包名:" + buildInfo.bundleName);
|
||||
// 设置包名
|
||||
PlayerSettings.SetApplicationIdentifier(BuildTargetGroup.iOS, buildInfo.bundleName);
|
||||
Debug.Log("[bfinfo]设置包名:" + buildInfo.bundleName);
|
||||
|
||||
// // 是否跳过版本控制
|
||||
// var symbols = IOS_DEFINE_SYMBOLS;
|
||||
// if (buildInfo.skipVersion)
|
||||
// {
|
||||
// symbols = symbols + ";SKIP_VERSION;";
|
||||
// }
|
||||
// 是否跳过版本控制
|
||||
var symbols = IOS_DEFINE_SYMBOLS;
|
||||
if (buildInfo.skipVersion)
|
||||
{
|
||||
symbols = symbols + ";SKIP_VERSION;";
|
||||
}
|
||||
|
||||
|
||||
// PlayerSettings.SetScriptingDefineSymbolsForGroup(BuildTargetGroup.iOS, symbols);
|
||||
// Debug.Log("[bfinfo]设置defineSymbols: " + symbols);
|
||||
PlayerSettings.SetScriptingDefineSymbolsForGroup(BuildTargetGroup.iOS, symbols);
|
||||
Debug.Log("[bfinfo]设置defineSymbols: " + symbols);
|
||||
|
||||
// // 是否是dev
|
||||
// var development = buildInfo.IsDevChannel();
|
||||
// EditorUserBuildSettings.development = development;
|
||||
// 是否是dev
|
||||
var development = buildInfo.IsDevChannel();
|
||||
EditorUserBuildSettings.development = development;
|
||||
|
||||
// // 商品名称
|
||||
// if (buildInfo.IsPublish())
|
||||
// {
|
||||
// PlayerSettings.productName = "Heroic Expedition";
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// PlayerSettings.productName = development ? "b6-dev" : "b6-release";
|
||||
// }
|
||||
// 商品名称
|
||||
if (buildInfo.IsPublish())
|
||||
{
|
||||
PlayerSettings.productName = "Heroic Expedition";
|
||||
}
|
||||
else
|
||||
{
|
||||
PlayerSettings.productName = development ? "b6-dev" : "b6-release";
|
||||
}
|
||||
|
||||
// // BuildType设置dev/release
|
||||
// EditorUserBuildSettings.iOSXcodeBuildConfig = development ? XcodeBuildConfig.Debug : XcodeBuildConfig.Release;
|
||||
// BuildType设置dev/release
|
||||
EditorUserBuildSettings.iOSBuildConfigType = development ? iOSBuildType.Debug : iOSBuildType.Release;
|
||||
|
||||
// // 使用IL2CPP
|
||||
// var scriptImp = ScriptingImplementation.IL2CPP;
|
||||
// PlayerSettings.SetScriptingBackend(BuildTargetGroup.iOS, scriptImp);
|
||||
// 使用IL2CPP
|
||||
var scriptImp = ScriptingImplementation.IL2CPP;
|
||||
PlayerSettings.SetScriptingBackend(BuildTargetGroup.iOS, scriptImp);
|
||||
|
||||
// // 目标平台架构，目前支持ARM64
|
||||
// PlayerSettings.SetArchitecture(BuildTargetGroup.iOS, 1);
|
||||
// }
|
||||
// 目标平台架构，目前支持ARM64
|
||||
PlayerSettings.SetArchitecture(BuildTargetGroup.iOS, 1);
|
||||
}
|
||||
|
||||
// /// <summary>
|
||||
// /// 获取打包参数
|
||||
// /// </summary>
|
||||
// static BuildPlayerOptions GetBuildOptions(BuildInfo buildInfo)
|
||||
// {
|
||||
// var bpOptions = new BuildPlayerOptions();
|
||||
// bpOptions.scenes = AssetBundleUtils.GetBuildScenes();
|
||||
// bpOptions.target = BuildTarget.iOS;
|
||||
/// <summary>
|
||||
/// 获取打包参数
|
||||
/// </summary>
|
||||
static BuildPlayerOptions GetBuildOptions(BuildInfo buildInfo)
|
||||
{
|
||||
var bpOptions = new BuildPlayerOptions();
|
||||
bpOptions.scenes = AssetBundleUtils.GetBuildScenes();
|
||||
bpOptions.target = BuildTarget.iOS;
|
||||
|
||||
// var path = buildInfo.IsReleaseChannel() ? RELEASE_XCODE_LOCAL_PATH : DEV_XCODE_LOCAL_PATH;
|
||||
// bpOptions.locationPathName = path;
|
||||
// Debug.Log("[bfinfo]xcode path : " + path);
|
||||
// var absolutePath = buildInfo.IsReleaseChannel() ? releaseXCodePath : devXCodePath;
|
||||
// if (Directory.Exists(absolutePath))
|
||||
// {
|
||||
// Directory.Delete(absolutePath, true);
|
||||
// }
|
||||
var path = buildInfo.IsReleaseChannel() ? RELEASE_XCODE_LOCAL_PATH : DEV_XCODE_LOCAL_PATH;
|
||||
bpOptions.locationPathName = path;
|
||||
Debug.Log("[bfinfo]xcode path : " + path);
|
||||
var absolutePath = buildInfo.IsReleaseChannel() ? releaseXCodePath : devXCodePath;
|
||||
if (Directory.Exists(absolutePath))
|
||||
{
|
||||
Directory.Delete(absolutePath, true);
|
||||
}
|
||||
|
||||
// if (!buildInfo.IsPublish())
|
||||
// {
|
||||
// var options = BuildOptions.Development | BuildOptions.ConnectWithProfiler | BuildOptions.AllowDebugging;
|
||||
// bpOptions.options = options;
|
||||
// }
|
||||
// return bpOptions;
|
||||
// }
|
||||
if (!buildInfo.IsPublish())
|
||||
{
|
||||
var options = BuildOptions.Development | BuildOptions.ConnectWithProfiler | BuildOptions.AllowDebugging;
|
||||
bpOptions.options = options;
|
||||
}
|
||||
return bpOptions;
|
||||
}
|
||||
|
||||
// /// <summary>
|
||||
// /// 打包ipa
|
||||
// /// </summary>
|
||||
// static bool BuildIpaFromXCode(BuildInfo buildInfo)
|
||||
// {
|
||||
// // 修改XCode设置
|
||||
// FixXCodeProject(buildInfo);
|
||||
/// <summary>
|
||||
/// 打包ipa
|
||||
/// </summary>
|
||||
static bool BuildIpaFromXCode(BuildInfo buildInfo)
|
||||
{
|
||||
// 修改XCode设置
|
||||
FixXCodeProject(buildInfo);
|
||||
|
||||
// // 权限
|
||||
// UnlockKeyChain();
|
||||
// 权限
|
||||
UnlockKeyChain();
|
||||
|
||||
// // archive
|
||||
// if (!Archive(buildInfo))
|
||||
// {
|
||||
// return false;
|
||||
// }
|
||||
// archive
|
||||
if (!Archive(buildInfo))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// // 导出ipa
|
||||
// if (!ExportIpa(buildInfo))
|
||||
// {
|
||||
// return false;
|
||||
// }
|
||||
// 导出ipa
|
||||
if (!ExportIpa(buildInfo))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// return true;
|
||||
// }
|
||||
return true;
|
||||
}
|
||||
|
||||
// /// <summary>
|
||||
// /// xCode工程设置
|
||||
// /// </summary>
|
||||
// static void FixXCodeProject(BuildInfo buildInfo)
|
||||
// {
|
||||
// var isDev = buildInfo.IsDevChannel();
|
||||
// var xCodeProjectPath = isDev ? devXCodePath : releaseXCodePath;
|
||||
/// <summary>
|
||||
/// xCode工程设置
|
||||
/// </summary>
|
||||
static void FixXCodeProject(BuildInfo buildInfo)
|
||||
{
|
||||
var isDev = buildInfo.IsDevChannel();
|
||||
var xCodeProjectPath = isDev ? devXCodePath : releaseXCodePath;
|
||||
|
||||
// var path = xCodeProjectPath + "/Unity-iPhone.xcodeproj/project.pbxproj";
|
||||
// var pbxProject = new PBXProject();
|
||||
// pbxProject.ReadFromFile(path);
|
||||
// var targetGuid = pbxProject.TargetGuidByName("Unity-iPhone");
|
||||
// pbxProject.AddBuildProperty(targetGuid, "OTHER_LDFLAGS", "-ObjC");
|
||||
// pbxProject.SetBuildProperty(targetGuid, "ENABLE_BITCODE", "NO");
|
||||
// pbxProject.SetBuildProperty(targetGuid, "ENABLE_BITCODE", "NO");
|
||||
// pbxProject.SetBuildProperty(targetGuid, "DEVELOPMENT_TEAM", "49QQW8856Q");
|
||||
// if (buildInfo.IsPublish())
|
||||
// {
|
||||
// pbxProject.SetBuildProperty(targetGuid, "PROVISIONING_PROFILE_SPECIFIER", "ub_appstore_dis");
|
||||
// }
|
||||
var path = xCodeProjectPath + "/Unity-iPhone.xcodeproj/project.pbxproj";
|
||||
var pbxProject = new PBXProject();
|
||||
pbxProject.ReadFromFile(path);
|
||||
var targetGuid = pbxProject.TargetGuidByName("Unity-iPhone");
|
||||
pbxProject.AddBuildProperty(targetGuid, "OTHER_LDFLAGS", "-ObjC");
|
||||
pbxProject.SetBuildProperty(targetGuid, "ENABLE_BITCODE", "NO");
|
||||
pbxProject.SetBuildProperty(targetGuid, "ENABLE_BITCODE", "NO");
|
||||
pbxProject.SetBuildProperty(targetGuid, "DEVELOPMENT_TEAM", "49QQW8856Q");
|
||||
if (buildInfo.IsPublish())
|
||||
{
|
||||
pbxProject.SetBuildProperty(targetGuid, "PROVISIONING_PROFILE_SPECIFIER", "ub_appstore_dis");
|
||||
}
|
||||
|
||||
// // 添加系统库
|
||||
// AddSystemLibReferenceToProject(pbxProject, targetGuid, "libsqlite3.tbd");
|
||||
// AddSystemLibReferenceToProject(pbxProject, targetGuid, "libz.1.tbd");
|
||||
// AddSystemLibReferenceToProject(pbxProject, targetGuid, "libiconv.2.tbd");
|
||||
// AddSystemLibReferenceToProject(pbxProject, targetGuid, "libresolv.9.tbd");
|
||||
// 添加系统库
|
||||
AddSystemLibReferenceToProject(pbxProject, targetGuid, "libsqlite3.tbd");
|
||||
AddSystemLibReferenceToProject(pbxProject, targetGuid, "libz.1.tbd");
|
||||
AddSystemLibReferenceToProject(pbxProject, targetGuid, "libiconv.2.tbd");
|
||||
AddSystemLibReferenceToProject(pbxProject, targetGuid, "libresolv.9.tbd");
|
||||
|
||||
// var pListPath = Path.Combine(xCodeProjectPath, "Info.plist");
|
||||
// var pList = new PlistDocument();
|
||||
// pList.ReadFromFile(pListPath);
|
||||
var pListPath = Path.Combine(xCodeProjectPath, "Info.plist");
|
||||
var pList = new PlistDocument();
|
||||
pList.ReadFromFile(pListPath);
|
||||
|
||||
// // 版本号
|
||||
// var vKey = "CFBundleShortVersionString";
|
||||
// var vValue = new PlistElementString(buildInfo.version);
|
||||
// var pListRoot = pList.root;
|
||||
// var rootDict = pListRoot.values;
|
||||
// if (!rootDict.ContainsKey(vKey))
|
||||
// {
|
||||
// rootDict.Add(vKey, vValue);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// rootDict[vKey] = vValue;
|
||||
// }
|
||||
// 版本号
|
||||
var vKey = "CFBundleShortVersionString";
|
||||
var vValue = new PlistElementString(buildInfo.version);
|
||||
var pListRoot = pList.root;
|
||||
var rootDict = pListRoot.values;
|
||||
if (!rootDict.ContainsKey(vKey))
|
||||
{
|
||||
rootDict.Add(vKey, vValue);
|
||||
}
|
||||
else
|
||||
{
|
||||
rootDict[vKey] = vValue;
|
||||
}
|
||||
|
||||
// // VersionCode
|
||||
// var vCodeKey = "CFBundleVersion";
|
||||
// var vCodeValue = new PlistElementString(buildInfo.versionCode.ToString());
|
||||
// if (!rootDict.ContainsKey(vCodeKey))
|
||||
// {
|
||||
// rootDict.Add(vCodeKey, vCodeValue);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// rootDict[vCodeKey] = vCodeValue;
|
||||
// }
|
||||
// VersionCode
|
||||
var vCodeKey = "CFBundleVersion";
|
||||
var vCodeValue = new PlistElementString(buildInfo.version_code.ToString());
|
||||
if (!rootDict.ContainsKey(vCodeKey))
|
||||
{
|
||||
rootDict.Add(vCodeKey, vCodeValue);
|
||||
}
|
||||
else
|
||||
{
|
||||
rootDict[vCodeKey] = vCodeValue;
|
||||
}
|
||||
|
||||
// // 数美SDK会使用位置，必须加入这个说明
|
||||
// var localtionKey = "NSLocationWhenInUseUsageDescription";
|
||||
// var localtionValue = new PlistElementString("We use your location to give you a better localization.");
|
||||
// if (!rootDict.ContainsKey(localtionKey))
|
||||
// {
|
||||
// rootDict.Add(localtionKey, localtionValue);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// rootDict[localtionKey] = localtionValue;
|
||||
// }
|
||||
// 数美SDK会使用位置，必须加入这个说明
|
||||
var localtionKey = "NSLocationWhenInUseUsageDescription";
|
||||
var localtionValue = new PlistElementString("We use your location to give you a better localization.");
|
||||
if (!rootDict.ContainsKey(localtionKey))
|
||||
{
|
||||
rootDict.Add(localtionKey, localtionValue);
|
||||
}
|
||||
else
|
||||
{
|
||||
rootDict[localtionKey] = localtionValue;
|
||||
}
|
||||
|
||||
// // 提审提示缺少出口合规证明,这里直接设置为false即可
|
||||
// var encryptionKey = "ITSAppUsesNonExemptEncryption";
|
||||
// var encryptionValue = new PlistElementBoolean(false);
|
||||
// if (!rootDict.ContainsKey(encryptionKey))
|
||||
// {
|
||||
// rootDict.Add(encryptionKey, encryptionValue);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// rootDict[encryptionKey] = encryptionValue;
|
||||
// }
|
||||
// 提审提示缺少出口合规证明,这里直接设置为false即可
|
||||
var encryptionKey = "ITSAppUsesNonExemptEncryption";
|
||||
var encryptionValue = new PlistElementBoolean(false);
|
||||
if (!rootDict.ContainsKey(encryptionKey))
|
||||
{
|
||||
rootDict.Add(encryptionKey, encryptionValue);
|
||||
}
|
||||
else
|
||||
{
|
||||
rootDict[encryptionKey] = encryptionValue;
|
||||
}
|
||||
|
||||
// pList.WriteToFile(pListPath);
|
||||
// pbxProject.WriteToFile(path);
|
||||
// }
|
||||
pList.WriteToFile(pListPath);
|
||||
pbxProject.WriteToFile(path);
|
||||
}
|
||||
|
||||
// //添加系统lib方法
|
||||
// static void AddSystemLibReferenceToProject(PBXProject pbxProject, string targetGuid, string lib)
|
||||
// {
|
||||
// var fileGuid = pbxProject.AddFile("usr/lib/" + lib, "Frameworks/" + lib, PBXSourceTree.Sdk);
|
||||
// pbxProject.AddFileToBuild(targetGuid, fileGuid);
|
||||
// }
|
||||
//添加系统lib方法
|
||||
static void AddSystemLibReferenceToProject(PBXProject pbxProject, string targetGuid, string lib)
|
||||
{
|
||||
var fileGuid = pbxProject.AddFile("usr/lib/" + lib, "Frameworks/" + lib, PBXSourceTree.Sdk);
|
||||
pbxProject.AddFileToBuild(targetGuid, fileGuid);
|
||||
}
|
||||
|
||||
// /// <summary>
|
||||
// /// Archive
|
||||
// /// </summary>
|
||||
// static bool Archive(BuildInfo buildInfo)
|
||||
// {
|
||||
// Debug.Log("[bfinfo]正在archive...");
|
||||
// var result = true;
|
||||
// var xCodeProjectPath = buildInfo.IsDevChannel() ? devXCodePath : releaseXCodePath;
|
||||
// var archivePath = xCodeProjectPath + "/build/archive/Unity-iPhone.xcarchive";
|
||||
// var args = string.Format("archive -scheme Unity-iPhone -configuration Release -archivePath {0}", archivePath);
|
||||
// BFEditorUtils.RunCommond("xcodebuild", args, xCodeProjectPath,
|
||||
// (info) =>
|
||||
// {
|
||||
// Debug.Log(info);
|
||||
// },
|
||||
// (error) =>
|
||||
// {
|
||||
// if (error.Contains("ARCHIVE FAILED")) // 失败标志
|
||||
// {
|
||||
// result = false;
|
||||
// }
|
||||
// Debug.LogError("[bferror] " + error);
|
||||
// }
|
||||
// );
|
||||
/// <summary>
|
||||
/// Archive
|
||||
/// </summary>
|
||||
static bool Archive(BuildInfo buildInfo)
|
||||
{
|
||||
Debug.Log("[bfinfo]正在archive...");
|
||||
var result = true;
|
||||
var xCodeProjectPath = buildInfo.IsDevChannel() ? devXCodePath : releaseXCodePath;
|
||||
var archivePath = xCodeProjectPath + "/build/archive/Unity-iPhone.xcarchive";
|
||||
var args = string.Format("archive -scheme Unity-iPhone -configuration Release -archivePath {0}", archivePath);
|
||||
BFEditorUtils.RunCommond("xcodebuild", args, xCodeProjectPath,
|
||||
(info) =>
|
||||
{
|
||||
Debug.Log(info);
|
||||
},
|
||||
(error) =>
|
||||
{
|
||||
if (error.Contains("ARCHIVE FAILED")) // 失败标志
|
||||
{
|
||||
result = false;
|
||||
}
|
||||
Debug.LogError("[bferror] " + error);
|
||||
}
|
||||
);
|
||||
|
||||
// return result;
|
||||
// }
|
||||
return result;
|
||||
}
|
||||
|
||||
// /// <summary>
|
||||
// /// 导出ipa
|
||||
// /// </summary>
|
||||
// static bool ExportIpa(BuildInfo buildInfo)
|
||||
// {
|
||||
// Debug.Log("[bfinfo]正在导出ipa...");
|
||||
// var result = false;
|
||||
// var xCodeProjectPath = buildInfo.IsDevChannel() ? devXCodePath : releaseXCodePath;
|
||||
// string exportPListPath;
|
||||
// if (buildInfo.IsPublish())
|
||||
// {
|
||||
// exportPListPath = publishOptionsPListPath;
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// exportPListPath = buildInfo.IsDevChannel() ? devOptionsPListPath : releaseOptionsPListPath;
|
||||
// }
|
||||
// var ipaPath = xCodeProjectPath + "/build/ipa";
|
||||
// var archivePath = xCodeProjectPath + "/build/archive/Unity-iPhone.xcarchive";
|
||||
// var args = string.Format("-exportArchive -archivePath {0} -exportPath {1} -exportOptionsPlist {2} -allowProvisioningUpdates", archivePath, ipaPath, exportPListPath);
|
||||
// BFEditorUtils.RunCommond("xcodebuild", args, null,
|
||||
// (info) =>
|
||||
// {
|
||||
// if(info.Contains("EXPORT SUCCEEDED"))
|
||||
// {
|
||||
// result = true;
|
||||
// }
|
||||
// },
|
||||
// (error) =>
|
||||
// {
|
||||
// }
|
||||
// );
|
||||
/// <summary>
|
||||
/// 导出ipa
|
||||
/// </summary>
|
||||
static bool ExportIpa(BuildInfo buildInfo)
|
||||
{
|
||||
Debug.Log("[bfinfo]正在导出ipa...");
|
||||
var result = false;
|
||||
var xCodeProjectPath = buildInfo.IsDevChannel() ? devXCodePath : releaseXCodePath;
|
||||
string exportPListPath;
|
||||
if (buildInfo.IsPublish())
|
||||
{
|
||||
exportPListPath = publishOptionsPListPath;
|
||||
}
|
||||
else
|
||||
{
|
||||
exportPListPath = buildInfo.IsDevChannel() ? devOptionsPListPath : releaseOptionsPListPath;
|
||||
}
|
||||
var ipaPath = xCodeProjectPath + "/build/ipa";
|
||||
var archivePath = xCodeProjectPath + "/build/archive/Unity-iPhone.xcarchive";
|
||||
var args = string.Format("-exportArchive -archivePath {0} -exportPath {1} -exportOptionsPlist {2} -allowProvisioningUpdates", archivePath, ipaPath, exportPListPath);
|
||||
BFEditorUtils.RunCommond("xcodebuild", args, null,
|
||||
(info) =>
|
||||
{
|
||||
if(info.Contains("EXPORT SUCCEEDED"))
|
||||
{
|
||||
result = true;
|
||||
}
|
||||
},
|
||||
(error) =>
|
||||
{
|
||||
}
|
||||
);
|
||||
|
||||
// return result;
|
||||
// }
|
||||
return result;
|
||||
}
|
||||
|
||||
// /// <summary>
|
||||
// /// 远程打包签名ipa时需要钥匙串权限
|
||||
// /// </summary>
|
||||
// static void UnlockKeyChain()
|
||||
// {
|
||||
// BFEditorUtils.RunCommond("security", "-v unlock-keychain -p '123456' /Users/aoddabao/Library/Keychains/login.keychain-db", null,
|
||||
// (msg) =>
|
||||
// {
|
||||
// Debug.Log(msg);
|
||||
// },
|
||||
// (msg) =>
|
||||
// {
|
||||
// Debug.LogError(msg);
|
||||
// }
|
||||
// );
|
||||
// }
|
||||
// #endif
|
||||
// }
|
||||
// }
|
||||
/// <summary>
|
||||
/// 远程打包签名ipa时需要钥匙串权限
|
||||
/// </summary>
|
||||
static void UnlockKeyChain()
|
||||
{
|
||||
BFEditorUtils.RunCommond("security", "-v unlock-keychain -p '123456' /Users/aoddabao/Library/Keychains/login.keychain-db", null,
|
||||
(msg) =>
|
||||
{
|
||||
Debug.Log(msg);
|
||||
},
|
||||
(msg) =>
|
||||
{
|
||||
Debug.LogError(msg);
|
||||
}
|
||||
);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@ -85,9 +85,6 @@ namespace BFEditor
|
||||
{
|
||||
//加载lua配置测试
|
||||
LuaEnv env = new LuaEnv();
|
||||
env.DoString(@"
|
||||
print('当前 Lua 版本: ' .. _VERSION) -- 输出 Lua 5.1
|
||||
");
|
||||
env.AddLoader((ref string scriptPath) =>
|
||||
{
|
||||
var text = LoadGameLuaScriptText(scriptPath, isDeveloper);
|
||||
@ -139,58 +136,58 @@ 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);
|
||||
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);
|
||||
|
||||
|
||||
// 检查monster
|
||||
// string monsterConfigListLua = "{";
|
||||
// foreach (var file in configFileInfos)
|
||||
// {
|
||||
// var fileName = file.Name.ToLower();
|
||||
// if(fileName.Contains("monster_"))
|
||||
// {
|
||||
// monsterConfigListLua += "'" + fileName.Replace(".lua", "").Replace(".bytes", "") + "',";
|
||||
// }
|
||||
// }
|
||||
// monsterConfigListLua += "}";
|
||||
// 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
|
||||
// local data = require('app/config/' .. name).data
|
||||
// for k, v in pairs(data) do
|
||||
// if ids[k] then
|
||||
// table.insert(str, name .. '和' .. ids[k] .. '存在相同的mosnter id:' .. k)
|
||||
// end
|
||||
// ids[k] = name
|
||||
// end
|
||||
// end
|
||||
// end
|
||||
// if #str > 0 then
|
||||
// return table.concat(str, '\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");
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
string monsterConfigListLua = "{";
|
||||
foreach (var file in configFileInfos)
|
||||
{
|
||||
var fileName = file.Name.ToLower();
|
||||
if(fileName.Contains("monster_"))
|
||||
{
|
||||
monsterConfigListLua += "'" + fileName.Replace(".lua", "").Replace(".bytes", "") + "',";
|
||||
}
|
||||
}
|
||||
monsterConfigListLua += "}";
|
||||
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
|
||||
local data = require('app/config/' .. name).data
|
||||
for k, v in pairs(data) do
|
||||
if ids[k] then
|
||||
table.insert(str, name .. '和' .. ids[k] .. '存在相同的mosnter id:' .. k)
|
||||
end
|
||||
ids[k] = name
|
||||
end
|
||||
end
|
||||
end
|
||||
if #str > 0 then
|
||||
return table.concat(str, '\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");
|
||||
}
|
||||
}
|
||||
}
|
||||
// 检查怪物的坐标信息
|
||||
// var luaScriptString2 = @"local MONSTER_POSITION_KEY = { 'monster_1','monster_2','monster_3','monster_4','monster_5','monster_6','monster_7','monster_8','monster_9','monster_10','monster_11','monster_12'}
|
||||
// local list = {'enemy_id_1', 'enemy_id_2', 'enemy_id_3'}
|
||||
|
||||
@ -2,7 +2,7 @@ using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEditor;
|
||||
|
||||
using UnityEditor.Experimental.SceneManagement;
|
||||
|
||||
namespace BFEditor.Resource
|
||||
{
|
||||
@ -19,7 +19,7 @@ namespace BFEditor.Resource
|
||||
|
||||
void OnEnable()
|
||||
{
|
||||
UnityEditor.SceneManagement.PrefabStage currentPrefabStage = UnityEditor.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage();
|
||||
PrefabStage currentPrefabStage = PrefabStageUtility.GetCurrentPrefabStage();
|
||||
Transform tran;
|
||||
if (currentPrefabStage == null)
|
||||
tran = Selection.activeTransform;
|
||||
|
||||
@ -92,7 +92,7 @@ namespace BFEditor
|
||||
}
|
||||
else
|
||||
{
|
||||
var currentPrefabStage = UnityEditor.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage();
|
||||
var currentPrefabStage = UnityEditor.Experimental.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage();
|
||||
if (currentPrefabStage != null) //当前处于prefab编辑模式
|
||||
{
|
||||
var prefabRoot = currentPrefabStage.prefabContentsRoot;
|
||||
|
||||
@ -55,7 +55,7 @@ public class JenkinsAdapter {
|
||||
// 商品名称
|
||||
PlayerSettings.productName = "Knights Combo";
|
||||
// BuildType设置dev/release
|
||||
EditorUserBuildSettings.iOSXcodeBuildConfig = XcodeBuildConfig.Release;
|
||||
EditorUserBuildSettings.iOSBuildConfigType = iOSBuildType.Release;
|
||||
EditorUserBuildSettings.development = false;
|
||||
// 使用IL2CPP
|
||||
var scriptImp = ScriptingImplementation.IL2CPP;
|
||||
|
||||
@ -68,9 +68,8 @@ namespace BFEditor
|
||||
"TMPro.SortingLayerHelper",
|
||||
"UnityEngine.CloudStreaming",
|
||||
"BFEditor.EditorBattleRoleAttackOperate",
|
||||
"UnityEngine.QualitySettings",
|
||||
"IronSourceBannerEvents", "IronSourceEvents", "IronSourceInterstitialEvents", "IronSourceRewardedVideoEvents",
|
||||
"IronSourceAdQualityManifestTools", "TradplusSDK"
|
||||
"IronSourceAdQualityManifestTools"
|
||||
};
|
||||
|
||||
static bool isExcluded(Type type)
|
||||
@ -78,7 +77,7 @@ namespace BFEditor
|
||||
var fullName = type.FullName;
|
||||
for (int i = 0; i < exclude.Count; i++)
|
||||
{
|
||||
if (fullName != null && fullName.Contains(exclude[i]))
|
||||
if (!string.IsNullOrEmpty(fullName) && fullName.Contains(exclude[i]))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
@ -94,13 +93,13 @@ namespace BFEditor
|
||||
List<string> namespaces = new List<string>() // 在这里添加名字空间
|
||||
{
|
||||
"BF",
|
||||
// "UnityEngine",
|
||||
// "UnityEngine.UI",
|
||||
// "UnityEngine.U2D",
|
||||
// "UnityEngine.Rendering.Universal",
|
||||
// "TMPro",
|
||||
// "DG.Tweening",
|
||||
// "DG.Tweening.Core",
|
||||
"UnityEngine",
|
||||
"UnityEngine.UI",
|
||||
"UnityEngine.U2D",
|
||||
"UnityEngine.Rendering.Universal",
|
||||
"TMPro",
|
||||
"DG.Tweening",
|
||||
"DG.Tweening.Core",
|
||||
};
|
||||
var unityTypes = (from assembly in AppDomain.CurrentDomain.GetAssemblies()
|
||||
where !(assembly.ManifestModule is System.Reflection.Emit.ModuleBuilder)
|
||||
@ -114,8 +113,8 @@ namespace BFEditor
|
||||
};
|
||||
var customTypes = (from assembly in customAssemblys.Select(s => Assembly.Load(s))
|
||||
from type in assembly.GetExportedTypes()
|
||||
where type.Namespace == null || !type.Namespace.StartsWith("XLua") && !isExcluded(type)
|
||||
&& type.BaseType != typeof(MulticastDelegate) && !type.IsInterface && !type.IsEnum
|
||||
where type.Namespace == null || !type.Namespace.StartsWith("XLua")
|
||||
&& type.BaseType != typeof(MulticastDelegate) && !type.IsInterface && !type.IsEnum && !isExcluded(type)
|
||||
select type);
|
||||
|
||||
var otherTypes = new List<Type>() {
|
||||
@ -144,31 +143,20 @@ namespace BFEditor
|
||||
typeof(System.Collections.Generic.List<TMPro.TMP_FontAsset>),
|
||||
typeof(System.Collections.Generic.List<UnityEngine.Camera>),
|
||||
typeof(System.Collections.Generic.List<System.Collections.Generic.List<string>>),
|
||||
typeof(System.Collections.Generic.List<BF.BFFinger>),
|
||||
typeof(DG.Tweening.Core.TweenerCore<UnityEngine.Color, UnityEngine.Color, DG.Tweening.Plugins.Options.ColorOptions>),
|
||||
typeof(DG.Tweening.Core.TweenerCore<UnityEngine.Vector2, UnityEngine.Vector2, DG.Tweening.Plugins.Options.VectorOptions>),
|
||||
typeof(System.Action<string>),
|
||||
typeof(System.Action<string, UnityEngine.Object>),
|
||||
typeof(System.Action<string, UnityEngine.GameObject>),
|
||||
|
||||
typeof(UnityEngine.Camera),
|
||||
typeof(UnityEngine.Camera.GateFitMode),
|
||||
typeof(UnityEngine.Camera.GateFitParameters),
|
||||
typeof(UnityEngine.Camera.StereoscopicEye),
|
||||
typeof(UnityEngine.Camera.MonoOrStereoscopicEye),
|
||||
typeof(System.Action<string>),
|
||||
|
||||
typeof(UnityEngine.Camera.FieldOfViewAxis),
|
||||
typeof(UnityEngine.Camera.RenderRequest),
|
||||
typeof(UnityEngine.Camera.RenderRequestMode),
|
||||
typeof(UnityEngine.Camera.RenderRequestOutputSpace),
|
||||
typeof(UnityEngine.Camera.RenderRequest),
|
||||
typeof(UnityEngine.Camera.SceneViewFilterMode),
|
||||
typeof(UnityEngine.TextCore.FaceInfo),
|
||||
typeof(UnityEngine.Rendering.LightShadowResolution),
|
||||
typeof(UnityEngine.RenderTextureFormat),
|
||||
typeof(UnityEngine.RenderTextureReadWrite),
|
||||
typeof(UnityEngine.RigidbodyConstraints),
|
||||
typeof(UnityEngine.TransparencySortMode),
|
||||
typeof(UnityEngine.SystemInfo),
|
||||
typeof(UnityEngine.Object),
|
||||
typeof(UnityEngine.Rect),
|
||||
typeof(UnityEngine.Vector2),
|
||||
@ -275,6 +263,11 @@ namespace BFEditor
|
||||
typeof(UnityEngine.Canvas),
|
||||
typeof(UnityEngine.CanvasGroup),
|
||||
typeof(UnityEngine.CanvasRenderer),
|
||||
typeof(UnityEngine.Camera),
|
||||
typeof(UnityEngine.Camera.GateFitMode),
|
||||
typeof(UnityEngine.Camera.GateFitParameters),
|
||||
typeof(UnityEngine.Camera.StereoscopicEye),
|
||||
typeof(UnityEngine.Camera.MonoOrStereoscopicEye),
|
||||
typeof(UnityEngine.LineRenderer),
|
||||
typeof(UnityEngine.Texture2D),
|
||||
typeof(UnityEngine.Texture2D.EXRFlags),
|
||||
@ -301,13 +294,7 @@ namespace BFEditor
|
||||
typeof(UnityEngine.LightProbes),
|
||||
typeof(UnityEngine.ReflectionProbe),
|
||||
typeof(UnityEngine.BatteryStatus),
|
||||
typeof(UnityEngine.SystemInfo),
|
||||
typeof(UnityEngine.Rigidbody),
|
||||
typeof(UnityEngine.SphereCollider),
|
||||
typeof(UnityEngine.ScriptableObject),
|
||||
typeof(UnityEngine.Physics),
|
||||
typeof(UnityEngine.PhysicMaterial),
|
||||
typeof(UnityEngine.MeshCollider),
|
||||
|
||||
typeof(UnityEngine.UI.CanvasScaler),
|
||||
typeof(UnityEngine.UI.Dropdown),
|
||||
typeof(UnityEngine.UI.Dropdown.OptionData),
|
||||
@ -329,7 +316,6 @@ namespace BFEditor
|
||||
typeof(UnityEngine.UI.InputField),
|
||||
typeof(UnityEngine.UI.InputField.ContentType),
|
||||
typeof(UnityEngine.UI.InputField.InputType),
|
||||
typeof(UnityEngine.UI.InputField.EndEditEvent),
|
||||
typeof(UnityEngine.UI.InputField.CharacterValidation),
|
||||
typeof(UnityEngine.UI.InputField.LineType),
|
||||
typeof(UnityEngine.UI.InputField.SubmitEvent),
|
||||
@ -361,7 +347,7 @@ namespace BFEditor
|
||||
typeof(UnityEngine.UI.GridLayoutGroup.Constraint),
|
||||
typeof(UnityEngine.UI.VerticalLayoutGroup),
|
||||
typeof(UnityEngine.UI.LayoutGroup),
|
||||
typeof(UnityEngine.U2D.SpriteAtlas),
|
||||
typeof(UnityEngine.GUIUtility),
|
||||
|
||||
// spine
|
||||
typeof(Spine.TrackEntry),
|
||||
@ -379,14 +365,12 @@ namespace BFEditor
|
||||
typeof(Spine.Unity.SkeletonAnimation),
|
||||
typeof(Spine.Unity.SkeletonDataAsset),
|
||||
typeof(Spine.Unity.MeshGenerator),
|
||||
typeof(Spine.MeshAttachment),
|
||||
typeof(Spine.Unity.MeshGenerator.Settings),
|
||||
typeof(Spine.Unity.SkeletonRenderer),
|
||||
typeof(Spine.Unity.SkeletonRenderer.SpriteMaskInteractionMaterials),
|
||||
typeof(Spine.Unity.BoneFollower),
|
||||
typeof(Spine.Unity.BoneFollowerGraphic),
|
||||
typeof(Spine.Unity.BoneFollower.AxisOrientation),
|
||||
typeof(Spine.Unity.SkeletonGraphic.LayoutMode),
|
||||
|
||||
// TextMeshPro
|
||||
typeof(TMPro.TextAlignmentOptions),
|
||||
@ -412,14 +396,6 @@ namespace BFEditor
|
||||
typeof(TMP_AnimationCurve),
|
||||
typeof(TMP_Curve),
|
||||
|
||||
// 数数
|
||||
typeof(ThinkingAnalytics.ThinkingAnalyticsAPI),
|
||||
typeof(ThinkingAnalytics.ThinkingAnalyticsAPI.TATimeZone),
|
||||
typeof(ThinkingAnalytics.ThinkingAnalyticsAPI.TAMode),
|
||||
typeof(ThinkingAnalytics.ThinkingAnalyticsAPI.NetworkType),
|
||||
typeof(ThinkingAnalytics.ThinkingAnalyticsAPI.Token),
|
||||
typeof(ThinkingAnalytics.TDPresetProperties),
|
||||
|
||||
//DOTween
|
||||
typeof(DG.Tweening.AutoPlay),
|
||||
typeof(DG.Tweening.AxisConstraint),
|
||||
@ -432,6 +408,7 @@ namespace BFEditor
|
||||
typeof(DG.Tweening.ScrambleMode),
|
||||
typeof(DG.Tweening.TweenType),
|
||||
typeof(DG.Tweening.UpdateType),
|
||||
|
||||
typeof(DG.Tweening.DOTween),
|
||||
typeof(DG.Tweening.Core.DOTweenComponent),
|
||||
typeof(DG.Tweening.Core.TweenerCore<UnityEngine.Vector3, UnityEngine.Vector3[], DG.Tweening.Plugins.Options.Vector3ArrayOptions>),
|
||||
@ -454,11 +431,13 @@ namespace BFEditor
|
||||
typeof(DG.Tweening.ShortcutExtensions),
|
||||
typeof(DG.Tweening.DOTweenModuleUI),
|
||||
|
||||
// BestHTTP
|
||||
// 数数
|
||||
typeof(ThinkingAnalytics.ThinkingAnalyticsAPI.TATimeZone),
|
||||
typeof(ThinkingAnalytics.ThinkingAnalyticsAPI.TAMode),
|
||||
typeof(ThinkingAnalytics.ThinkingAnalyticsAPI.NetworkType),
|
||||
|
||||
typeof(Http.RequestState),
|
||||
typeof(BestHTTP.HTTPRequest),
|
||||
typeof(BestHTTP.HTTPResponse),
|
||||
typeof(BestHTTP.Connections.HTTP2.HTTP2Response),
|
||||
typeof(BestHTTP.Forms.HTTPUrlEncodedForm),
|
||||
typeof(BestHTTP.Forms.HTTPFormBase),
|
||||
|
||||
@ -469,36 +448,13 @@ namespace BFEditor
|
||||
typeof(UnityEngine.Purchasing.ProductType),
|
||||
|
||||
typeof(BF.MonoSingleton<BF.BFMain>),
|
||||
typeof(BF.MonoSingleton<AdManager>),
|
||||
typeof(BF.BFSlider.FillDirection),
|
||||
typeof(BF.ScrollRectBaseOld.MovementType),
|
||||
typeof(BF.ScrollRectBaseOld.ScrollbarVisibility),
|
||||
typeof(BF.NetServiceType),
|
||||
typeof(BF.NetIncomingMessageType),
|
||||
|
||||
// Touch
|
||||
typeof(BF.BFEvent<System.Collections.Generic.List<BF.BFFinger>>),
|
||||
typeof(BF.BFEvent<BF.SelectEventType, BF.BFFinger>),
|
||||
typeof(BF.BFEvent<BF.TouchEventType, BF.BFFinger>),
|
||||
typeof(BF.TouchEventType),
|
||||
typeof(BF.SelectEventType),
|
||||
typeof(BF.NativeCore.ThirdPlatform.FacebookSdk),
|
||||
typeof(BF.NativeCore.ThirdPlatform.AppsFlyerSdk),
|
||||
|
||||
typeof(AdManager),
|
||||
|
||||
// 震动插件
|
||||
// typeof(Lofelt.NiceVibrations.HapticPatterns),
|
||||
// typeof(Lofelt.NiceVibrations.LofeltHaptics),
|
||||
// typeof(Lofelt.NiceVibrations.HapticPatterns.PresetType),
|
||||
|
||||
typeof(UnityEngine.Purchasing.Security.AppleStoreKitTestTangle),
|
||||
typeof(UnityEngine.Purchasing.Security.AppleTangle),
|
||||
typeof(UnityEngine.SignInWithApple.SignInWithApple.CallbackArgs),
|
||||
typeof(UnityEngine.SignInWithApple.SignInWithAppleEvent),
|
||||
typeof(UnityEngine.SignInWithApple.SignInWithApple),
|
||||
typeof(UnityEngine.SignInWithApple.UserInfo),
|
||||
typeof(BF.EnumFlagsAttribute),
|
||||
typeof(BF.BFGridLayout.Corner),
|
||||
typeof(BF.BFGridLayout.Constraint),
|
||||
};
|
||||
return unityTypes.Concat(customTypes).Concat(otherTypes);
|
||||
}
|
||||
@ -609,9 +565,11 @@ namespace BFEditor
|
||||
new List<string>(){"UnityEngine.AudioSource", "SetGamepadSpeakerMixLevelDefault", "System.Int32"},
|
||||
new List<string>(){"UnityEngine.AudioSource", "GamepadSpeakerSupportsOutputType", "UnityEngine.GamepadSpeakerOutputType"},
|
||||
new List<string>(){"UnityEngine.AudioSource", "gamepadSpeakerOutputType",},
|
||||
new List<string>(){"UnityEngine.Handheld", "SetActivityIndicatorStyle", "UnityEngine.AndroidActivityIndicatorStyle"},
|
||||
new List<string>(){"UnityEngine.Handheld", "SetActivityIndicatorStyle", "UnityEngine.iOS.ActivityIndicatorStyle"},
|
||||
new List<string>(){"ThinkingAnalytics.ThinkingAnalyticsAPI", "onPostProcessBuild", "UnityEditor.BuildTarget", "System.String"},
|
||||
new List<string>(){"Spine.Unity.SkeletonRenderer", "EditorUpdateMeshFilterHideFlags"},
|
||||
new List<string>(){"Spine.Unity.SkeletonRenderer", "fixPrefabOverrideViaMeshFilter"},
|
||||
new List<string>(){"Spine.Unity.SkeletonRenderer", "fixPrefabOverrideViaMeshFilterGlobal"},
|
||||
new List<string>(){"Spine.Unity.SkeletonDataAsset", "errorIfSkeletonFileNullGlobal"},
|
||||
new List<string>(){"FBWindowsPhysicalGamepadManager", "state"},
|
||||
new List<string>(){"IronSourceBannerEvents", "onAdLoaded", "System.String"},
|
||||
new List<string>(){"IronSourceBannerEvents", "onAdLoadFailed", "System.String"},
|
||||
@ -680,18 +638,6 @@ namespace BFEditor
|
||||
new List<string>(){"IronSourceRewardedVideoEvents", "onAdUnavailable"},
|
||||
new List<string>(){"IronSourceRewardedVideoEvents", "onAdLoadFailed", "System.String"},
|
||||
new List<string>(){"IronSourceRewardedVideoEvents", "onAdReady", "System.String"},
|
||||
new List<string>(){"UnityEngine.Rendering.Universal.ShaderUtils", "GetShaderGUID", "UnityEngine.Rendering.Universal.ShaderPathID"},
|
||||
new List<string>(){"Spine.Unity.SkeletonRenderer", "EditorUpdateMeshFilterHideFlags"},
|
||||
new List<string>(){"Spine.Unity.SkeletonRenderer", "fixPrefabOverrideViaMeshFilter"},
|
||||
new List<string>(){"Spine.Unity.SkeletonRenderer", "fixPrefabOverrideViaMeshFilterGlobal"},
|
||||
new List<string>(){"Spine.Unity.SkeletonDataAsset", "errorIfSkeletonFileNullGlobal"},
|
||||
new List<string>(){"Spine.Unity.SkeletonGraphic", "ResetRectToReferenceRectSize"},
|
||||
new List<string>(){"Spine.Unity.SkeletonGraphic", "GetReferenceRectSize"},
|
||||
new List<string>(){"Spine.Unity.SpineHandles", "DrawReferenceRect", "Spine.Unity.SkeletonGraphic", "UnityEngine.Color"},
|
||||
new List<string>(){"Spine.Unity.SkeletonGraphic", "EditReferenceRect"},
|
||||
new List<string>(){"Spine.Unity.SkeletonGraphic", "RectTransformSize"},
|
||||
new List<string>(){"Spine.Unity.SkeletonGraphic", "GetPivotOffset"},
|
||||
new List<string>(){"Spine.Unity.SkeletonGraphic", "GetScaledPivotOffset"},
|
||||
};
|
||||
|
||||
static bool hasGenericParameter(Type type)
|
||||
|
||||
@ -14,26 +14,19 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
defaultScale: 0.01
|
||||
defaultMix: 0.2
|
||||
defaultShader: Spine/Skeleton
|
||||
defaultShader: BF/Spine/Skeleton
|
||||
defaultZSpacing: 0
|
||||
defaultInstantiateLoop: 1
|
||||
defaultPhysicsPositionInheritance: {x: 1, y: 1}
|
||||
defaultPhysicsRotationInheritance: 1
|
||||
showHierarchyIcons: 1
|
||||
reloadAfterPlayMode: 1
|
||||
setTextureImporterSettings: 1
|
||||
textureSettingsReference: Assets/ThirdParty/Spine/Editor/spine-unity/Editor/ImporterPresets/PMATexturePreset.preset
|
||||
fixPrefabOverrideViaMeshFilter: 0
|
||||
removePrefabPreviewMeshes: 0
|
||||
blendModeMaterialMultiply: {fileID: 0}
|
||||
blendModeMaterialScreen: {fileID: 0}
|
||||
blendModeMaterialAdditive: {fileID: 0}
|
||||
atlasTxtImportWarning: 1
|
||||
textureImporterWarning: 1
|
||||
componentMaterialWarning: 1
|
||||
skeletonDataAssetNoFileError: 1
|
||||
autoReloadSceneSkeletons: 1
|
||||
handleScale: 1
|
||||
mecanimEventIncludeFolderName: 1
|
||||
timelineDefaultMixDuration: 0
|
||||
timelineUseBlendDuration: 1
|
||||
|
||||
@ -78,7 +78,6 @@ namespace BFEditor
|
||||
psi.RedirectStandardOutput = true; //由调用程序获取输出信息
|
||||
psi.RedirectStandardError = true; //重定向标准错误输出
|
||||
psi.CreateNoWindow = true; //不显示程序窗口
|
||||
psi.StandardOutputEncoding = System.Text.Encoding.UTF8; // 核心：指定UTF-8解码
|
||||
p.StartInfo = psi;
|
||||
p.Start();
|
||||
|
||||
|
||||
@ -70,10 +70,6 @@ namespace BF
|
||||
}
|
||||
}
|
||||
#endif
|
||||
public bool GetIsHashCollision()
|
||||
{
|
||||
return spriteNameList.Count != spriteDict.Count;
|
||||
}
|
||||
|
||||
public Sprite GetSprite(uint spriteName)
|
||||
{
|
||||
@ -90,7 +86,7 @@ namespace BF
|
||||
int count = spriteNameList.Count;
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
spriteDict.TryAdd(spriteNameList[i], spriteList[i]);
|
||||
spriteDict.Add(spriteNameList[i], spriteList[i]);
|
||||
}
|
||||
#if !UNITY_EDITOR
|
||||
spriteNameList.Clear();
|
||||
|
||||
@ -10,8 +10,10 @@ namespace BF
|
||||
public class BFMain : MonoSingleton<BFMain>
|
||||
{
|
||||
List<ManagerBase> managerList;
|
||||
|
||||
// 客户端c#代码版本号，每次发布新包后加1，lua层存在一套代码兼容多版本c#代码
|
||||
public const int CLIENT_VERSION = 4;
|
||||
public const int CLIENT_VERSION = 2;
|
||||
|
||||
// 是否是单机版
|
||||
public static bool IsStandAlone = false;
|
||||
public static bool IsShenhe = false;
|
||||
@ -21,60 +23,6 @@ namespace BF
|
||||
public const string FILE_HEAD_BASE64 = "Zm9yX2ZpbGVfaGVhZ";
|
||||
public static long ServerTime = 0;
|
||||
public static long DifferenceTime = 0;
|
||||
public static string ProjectId
|
||||
{
|
||||
get
|
||||
{
|
||||
#if UNITY_EDITOR
|
||||
return "b13";
|
||||
#else
|
||||
if (BFPlatform.Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RU)
|
||||
{
|
||||
return "b13-ru";
|
||||
}
|
||||
else
|
||||
{
|
||||
return "b13";
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
public static string ProjectEnv
|
||||
{
|
||||
get
|
||||
{
|
||||
#if UNITY_EDITOR
|
||||
// 编辑器
|
||||
return "release";
|
||||
#else
|
||||
// 如果走深度链接启动且有参数,则走深度链接地址
|
||||
if (!string.IsNullOrEmpty(DPEnv))
|
||||
{
|
||||
return DPEnv;
|
||||
}
|
||||
else
|
||||
{
|
||||
return "release";
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
public static bool ForceEnv
|
||||
{
|
||||
get
|
||||
{
|
||||
return DPForceEnv;
|
||||
}
|
||||
}
|
||||
|
||||
// 深度链接参数
|
||||
public static string DPEntrance = string.Empty; // 内外网
|
||||
public static bool DPIsLan = false; // 是否为内网
|
||||
public static string DPEnv = string.Empty; // env
|
||||
public static bool DPSupportGM = false; // 正式环境下是否开启GM
|
||||
public static bool DPSupportLog = false; // 正式环境下是否打印日志
|
||||
public static string DPPackageName = string.Empty; // 模拟包名
|
||||
public static bool DPForceEnv = false; // 是否强制设置env
|
||||
|
||||
protected override void Init()
|
||||
{
|
||||
@ -372,53 +320,6 @@ namespace BF
|
||||
}
|
||||
}
|
||||
|
||||
// BattleManager battleMgr;
|
||||
// public BattleManager BattleMgr
|
||||
// {
|
||||
// get
|
||||
// {
|
||||
// if (battleMgr == null)
|
||||
// {
|
||||
// battleMgr = BattleManager.Create();
|
||||
// battleMgr.SetMono(this);
|
||||
// battleMgr.Init();
|
||||
// managerList.Add(battleMgr);
|
||||
// }
|
||||
// return battleMgr;
|
||||
// }
|
||||
// }
|
||||
|
||||
BFParseClientManager parseClientMgr;
|
||||
public BFParseClientManager ParseClientMgr
|
||||
{
|
||||
get
|
||||
{
|
||||
if (parseClientMgr == null)
|
||||
{
|
||||
parseClientMgr = BFParseClientManager.Create();
|
||||
parseClientMgr.SetMono(this);
|
||||
parseClientMgr.Init();
|
||||
managerList.Add(parseClientMgr);
|
||||
}
|
||||
return parseClientMgr;
|
||||
}
|
||||
}
|
||||
|
||||
URPManager urpMgr;
|
||||
public URPManager URPMgr
|
||||
{
|
||||
get
|
||||
{
|
||||
if (urpMgr == null)
|
||||
{
|
||||
urpMgr = URPManager.Create();
|
||||
urpMgr.Init();
|
||||
managerList.Add(urpMgr);
|
||||
}
|
||||
return urpMgr;
|
||||
}
|
||||
}
|
||||
|
||||
public static void SetServerTime(long serverTime)
|
||||
{
|
||||
ServerTime = serverTime;
|
||||
|
||||
@ -105,16 +105,5 @@ namespace BF
|
||||
httpRequest.RawData = Encoding.UTF8.GetBytes(data);
|
||||
httpRequest.Send();
|
||||
}
|
||||
|
||||
public void SendRequest(string url, string data, Action<HTTPRequest, HTTPResponse> callback)
|
||||
{
|
||||
var httpRequest = new HTTPRequest(new Uri(url), HTTPMethods.Get, (req, httpResponse) =>
|
||||
{
|
||||
callback?.Invoke(req, httpResponse);
|
||||
});
|
||||
httpRequest.SetHeader("Content-Type", "application/x-www-form-urlencoded");
|
||||
httpRequest.RawData = Encoding.UTF8.GetBytes(data);
|
||||
httpRequest.Send();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 150be05a54bb5274885ce7c5a6bdcedc
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,254 +0,0 @@
|
||||
using System.Collections.Generic;
|
||||
using System;
|
||||
using UnityEngine;
|
||||
using Newtonsoft.Json;
|
||||
using System.Linq;
|
||||
|
||||
namespace BF
|
||||
{
|
||||
public class DeepLinkManager : MonoBehaviour
|
||||
{
|
||||
// 深度链接参数
|
||||
public static string ENTRANCE = "entrance"; // Lan/Wan 内外网
|
||||
public const string ENTRANCE_LAN = "lan";
|
||||
public static string ENV = "env"; // 正式环境/白名单等
|
||||
public static string GM = "gm"; // gm
|
||||
public static string LOG = "log"; // 日志
|
||||
public static string PACKAGE = "package"; // 包名
|
||||
public const string TRUE_FLAG = "true";
|
||||
public const string FALSE_FLAG = "false";
|
||||
private const string SIGN_FLAG = "sign"; // 签名
|
||||
|
||||
// 缓存上一次的地址 与 解析后的参数
|
||||
private string DeepLinkURL = string.Empty;
|
||||
private Dictionary<string, string> DeepLinkParams = new Dictionary<string, string>();
|
||||
|
||||
// 因事件触发的callback,冷启动会在login中处理
|
||||
public Action<string, string> luaDeepLinkActiveCallback;
|
||||
private static char[] NOTHING_CHAR_RESULT = new char[32];
|
||||
private static char[] NOTHING_CHAR = new char[32] {
|
||||
(char)('y' ^ (0x37 - 0)),
|
||||
(char)('r' ^ (0x37 - 1)),
|
||||
(char)('u' ^ (0x37 - 2)),
|
||||
(char)('8' ^ (0x37 - 3)),
|
||||
(char)('c' ^ (0x37 - 4)),
|
||||
(char)('z' ^ (0x37 - 5)),
|
||||
(char)('P' ^ (0x37 - 6)),
|
||||
(char)('i' ^ (0x37 - 7)),
|
||||
(char)('s' ^ (0x37 - 8)),
|
||||
(char)('o' ^ (0x37 - 9)),
|
||||
(char)('O' ^ (0x37 - 10)),
|
||||
(char)('0' ^ (0x37 - 11)),
|
||||
(char)('x' ^ (0x37 - 12)),
|
||||
(char)('W' ^ (0x37 - 13)),
|
||||
(char)('L' ^ (0x37 - 14)),
|
||||
(char)('e' ^ (0x37 - 15)),
|
||||
(char)('k' ^ (0x37 - 16)),
|
||||
(char)('B' ^ (0x37 - 17)),
|
||||
(char)('q' ^ (0x37 - 18)),
|
||||
(char)('2' ^ (0x37 - 19)),
|
||||
(char)('H' ^ (0x37 - 20)),
|
||||
(char)('f' ^ (0x37 - 21)),
|
||||
(char)('Y' ^ (0x37 - 22)),
|
||||
(char)('n' ^ (0x37 - 23)),
|
||||
(char)('X' ^ (0x37 - 24)),
|
||||
(char)('4' ^ (0x37 - 25)),
|
||||
(char)('A' ^ (0x37 - 26)),
|
||||
(char)('9' ^ (0x37 - 27)),
|
||||
(char)('N' ^ (0x37 - 28)),
|
||||
(char)('a' ^ (0x37 - 29)),
|
||||
(char)('U' ^ (0x37 - 30)),
|
||||
(char)('G' ^ (0x37 - 31)),
|
||||
};
|
||||
private static bool NothingFlag = false;
|
||||
private static char[] GetNothingChar()
|
||||
{
|
||||
if (!NothingFlag)
|
||||
{
|
||||
NothingFlag = true;
|
||||
for (int i = 0; i < 32; ++i)
|
||||
{
|
||||
NOTHING_CHAR_RESULT[i] = (char)(NOTHING_CHAR[i] ^ (0x37 - i));
|
||||
}
|
||||
}
|
||||
return NOTHING_CHAR_RESULT;
|
||||
}
|
||||
|
||||
void Start()
|
||||
{
|
||||
Init();
|
||||
}
|
||||
|
||||
public void Init()
|
||||
{
|
||||
// 注册监听
|
||||
Application.deepLinkActivated += OnDeepLinkActivated;
|
||||
if (!string.IsNullOrEmpty(Application.absoluteURL))
|
||||
{
|
||||
// 冷启动而且 Application.absoluteURL 不为 null，因此处理深层链接。
|
||||
OnDeepLinkActivated(Application.absoluteURL);
|
||||
}
|
||||
// 初始化 DeepLink Manager 全局变量。
|
||||
else
|
||||
{
|
||||
DeepLinkURL = string.Empty;
|
||||
}
|
||||
}
|
||||
|
||||
private void OnDeepLinkActivated(string url)
|
||||
{
|
||||
DeepLinkURL = url;
|
||||
UpdateMapData(DeepLinkURL);
|
||||
|
||||
// 不考虑中途打开 仅处理冷启动
|
||||
// if (luaDeepLinkActiveCallback != null)
|
||||
// {
|
||||
// // 延迟的回调
|
||||
// luaDeepLinkActiveCallback(DeepLinkURL, GetDeepLinkParamsJson());
|
||||
// }
|
||||
HandleLaunchLinkParams();
|
||||
}
|
||||
|
||||
private void HandleLaunchLinkParams()
|
||||
{
|
||||
if (!DeepLinkParams.ContainsKey(SIGN_FLAG))
|
||||
{
|
||||
return;
|
||||
}
|
||||
string serverSign = DeepLinkParams[SIGN_FLAG];
|
||||
if (string.IsNullOrEmpty(serverSign))
|
||||
{
|
||||
return;
|
||||
}
|
||||
string signStr = string.Empty;
|
||||
foreach (var kvp in DeepLinkParams.OrderBy(kv => kv.Key, StringComparer.Ordinal))
|
||||
{
|
||||
if (!kvp.Key.Equals(SIGN_FLAG))
|
||||
{
|
||||
if (string.IsNullOrEmpty(signStr))
|
||||
{
|
||||
signStr += kvp.Key + "=" + kvp.Value;
|
||||
}
|
||||
else
|
||||
{
|
||||
signStr += "&" + kvp.Key + "=" + kvp.Value;
|
||||
}
|
||||
}
|
||||
}
|
||||
signStr += string.Concat(GetNothingChar());
|
||||
if (!Md5Encrypt.VerifyMd5Hash(signStr, serverSign))
|
||||
{
|
||||
return;
|
||||
}
|
||||
// 冷启动 更新参数
|
||||
if (DeepLinkParams.ContainsKey(ENTRANCE))
|
||||
{
|
||||
if (!string.IsNullOrEmpty(DeepLinkParams[ENTRANCE]))
|
||||
{
|
||||
BFMain.DPEntrance = DeepLinkParams[ENTRANCE];
|
||||
if (BFMain.DPEntrance == ENTRANCE_LAN)
|
||||
{
|
||||
BFMain.DPIsLan = true;
|
||||
}
|
||||
|
||||
Debug.Log("深度链接 更新 ENTRANCE:" + BFMain.DPEntrance + " 内网:" + BFMain.DPIsLan); // 测试日志 TODOJ
|
||||
}
|
||||
}
|
||||
if (DeepLinkParams.ContainsKey(ENV))
|
||||
{
|
||||
if (!string.IsNullOrEmpty(DeepLinkParams[ENV]))
|
||||
{
|
||||
BFMain.DPEnv = DeepLinkParams[ENV];
|
||||
BFMain.DPForceEnv = true;
|
||||
Debug.Log("深度链接 更新 ENV:" + BFMain.DPEnv); // 测试日志 TODOJ
|
||||
}
|
||||
}
|
||||
if (DeepLinkParams.ContainsKey(GM))
|
||||
{
|
||||
var support = DeepLinkParams[GM] == TRUE_FLAG;
|
||||
BFMain.DPSupportGM = support;
|
||||
|
||||
Debug.Log("深度链接 更新 GM:" + BFMain.DPSupportGM); // 测试日志 TODOJ
|
||||
}
|
||||
if (DeepLinkParams.ContainsKey(LOG))
|
||||
{
|
||||
var support = DeepLinkParams[LOG] == TRUE_FLAG;
|
||||
BFMain.DPSupportLog = support;
|
||||
|
||||
Debug.Log("深度链接 更新 LOG:" + BFMain.DPSupportLog); // 测试日志 TODOJ
|
||||
}
|
||||
if (DeepLinkParams.ContainsKey(PACKAGE))
|
||||
{
|
||||
if (!string.IsNullOrEmpty(DeepLinkParams[PACKAGE]))
|
||||
{
|
||||
BFMain.DPPackageName = DeepLinkParams[PACKAGE];
|
||||
|
||||
Debug.Log("深度链接 更新 ENV:" + BFMain.DPPackageName);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void UpdateMapData(string url)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(url))
|
||||
{
|
||||
return;
|
||||
}
|
||||
var splitUrl = url.Split('?', 2);
|
||||
if (splitUrl.Length < 2)
|
||||
{
|
||||
return;
|
||||
}
|
||||
var parsedUrl = splitUrl[1];
|
||||
if (string.IsNullOrWhiteSpace(parsedUrl))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var strs = parsedUrl.Split('&');
|
||||
foreach (var str in strs)
|
||||
{
|
||||
var keyValueStr = str.Split('=', 2);
|
||||
if (keyValueStr.Length == 2)
|
||||
{
|
||||
var key = keyValueStr[0];
|
||||
var value = keyValueStr[1];
|
||||
|
||||
// 更新
|
||||
DeepLinkParams[key] = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 获取缓存的深度链接
|
||||
public string GetDeepLinkURL()
|
||||
{
|
||||
return DeepLinkURL;
|
||||
}
|
||||
|
||||
public Dictionary<string, string> GetDeepLinkParamsDic()
|
||||
{
|
||||
return DeepLinkParams;
|
||||
}
|
||||
|
||||
public string GetDeepLinkParamsJson()
|
||||
{
|
||||
return JsonConvert.SerializeObject(DeepLinkParams);
|
||||
}
|
||||
|
||||
public string GetDeepLinkValueByKey(string key)
|
||||
{
|
||||
if (DeepLinkParams.ContainsKey(key))
|
||||
{
|
||||
return DeepLinkParams[key];
|
||||
}
|
||||
return string.Empty;
|
||||
}
|
||||
|
||||
// 设置回调
|
||||
public void SetLuaDeepLinkActiveCallback(Action<string, string> callback)
|
||||
{
|
||||
luaDeepLinkActiveCallback = callback;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ade1fea119719f145b768283e38c6a43
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -15,7 +15,6 @@ namespace BF
|
||||
public LaunchRequester LaunchRequester { get; private set; }
|
||||
public int LaunchTimes { get; private set; }
|
||||
public bool LoadedFirstAb = false;
|
||||
private bool isShowAtt = false;
|
||||
|
||||
GameLaunchProcessorBase currentProcessor;
|
||||
|
||||
@ -53,23 +52,14 @@ namespace BF
|
||||
{
|
||||
}
|
||||
|
||||
public void ShowIOSATTrack()
|
||||
{
|
||||
#if UNITY_IOS && !UNITY_EDITOR
|
||||
// ATT的回调里面会初始化广告SDK，所以这里处理一下如果多次调用，只会生效一次
|
||||
if (!isShowAtt)
|
||||
{
|
||||
isShowAtt = true;
|
||||
IOS_ATTrack();
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 游戏启动入口
|
||||
/// </summary>
|
||||
public void LaunchGame()
|
||||
{
|
||||
#if UNITY_IOS && !UNITY_EDITOR
|
||||
IOS_ATTrack();
|
||||
#endif
|
||||
LaunchTimes++;
|
||||
#if USE_AB
|
||||
GameLaunchProcessorBase processor = new LaunchSuccProcessor();
|
||||
|
||||
@ -128,13 +128,13 @@ namespace BF
|
||||
}
|
||||
var clientNums1 = int.Parse(clientNums[0]);
|
||||
var latestNums1 = int.Parse(latestNums[0]);
|
||||
if (clientNums1 < latestNums1)
|
||||
if(clientNums1 < latestNums1)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else if (clientNums1 == latestNums1)
|
||||
else if(clientNums1 == latestNums1)
|
||||
{
|
||||
if (int.Parse(clientNums[1]) < int.Parse(latestNums[1]))
|
||||
if(int.Parse(clientNums[1]) < int.Parse(latestNums[1]))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -26,10 +26,6 @@ namespace BF
|
||||
|
||||
public override void Process(LaunchRequester lr)
|
||||
{
|
||||
var clientProcessorOptParams = new Dictionary<string, object>();
|
||||
clientProcessorOptParams.TryAdd("opt_type", "CalculateDiffProcessorStart");
|
||||
BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr.PostThinkingAnalyticsEventProperties("client_processor_opt", clientProcessorOptParams);
|
||||
|
||||
base.Process(lr);
|
||||
this.lr = lr;
|
||||
|
||||
@ -52,10 +48,6 @@ namespace BF
|
||||
}
|
||||
else
|
||||
{
|
||||
var clientProcessorOptParams1 = new Dictionary<string, object>();
|
||||
clientProcessorOptParams1.TryAdd("opt_type", "CalculateDiffProcessorOverWithoutUpdate");
|
||||
BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr.PostThinkingAnalyticsEventProperties("client_processor_opt", clientProcessorOptParams1);
|
||||
|
||||
// 既没有热更新也没有自动修复
|
||||
lr.deleteList = lr.preCheckOverList;
|
||||
lr.curVersionTempDir = Path.Combine(TempUpdateDirPath, lr.persistentAbcc.version);
|
||||
@ -70,10 +62,6 @@ namespace BF
|
||||
EnsureFilesInUpdate();
|
||||
GetDeleteList();
|
||||
|
||||
var clientProcessorOptParams2 = new Dictionary<string, object>();
|
||||
clientProcessorOptParams2.TryAdd("opt_type", "CalculateDiffProcessorOverWithUpdate");
|
||||
BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr.PostThinkingAnalyticsEventProperties("client_processor_opt", clientProcessorOptParams2);
|
||||
|
||||
totalCount = abConfigList.Count;
|
||||
alreadyCount = 0;
|
||||
frameAlreadyCount = 0;
|
||||
|
||||
@ -32,10 +32,6 @@ namespace BF
|
||||
|
||||
public override void Process(LaunchRequester lr)
|
||||
{
|
||||
var clientProcessorOptParams = new Dictionary<string, object>();
|
||||
clientProcessorOptParams.TryAdd("opt_type", "DownloadUpdateProcessorStart");
|
||||
BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr.PostThinkingAnalyticsEventProperties("client_processor_opt", clientProcessorOptParams);
|
||||
|
||||
base.Process(lr);
|
||||
|
||||
this.lr = lr;
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
using UnityEngine;
|
||||
using System.Collections;
|
||||
using System.IO;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace BF
|
||||
{
|
||||
@ -19,10 +18,6 @@ namespace BF
|
||||
|
||||
public override void Process(LaunchRequester lr)
|
||||
{
|
||||
var clientProcessorOptParams = new Dictionary<string, object>();
|
||||
clientProcessorOptParams.TryAdd("opt_type", "FirstABProcessorStart");
|
||||
BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr.PostThinkingAnalyticsEventProperties("client_processor_opt", clientProcessorOptParams);
|
||||
|
||||
base.Process(lr);
|
||||
this.lr = lr;
|
||||
|
||||
|
||||
@ -19,10 +19,6 @@ namespace BF
|
||||
|
||||
public override void Process(LaunchRequester lr)
|
||||
{
|
||||
var clientProcessorOptParams = new Dictionary<string, object>();
|
||||
clientProcessorOptParams.TryAdd("opt_type", "FixUpProcessorStart");
|
||||
BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr.PostThinkingAnalyticsEventProperties("client_processor_opt", clientProcessorOptParams);
|
||||
|
||||
base.Process(lr);
|
||||
|
||||
this.lr = lr;
|
||||
|
||||
@ -18,10 +18,6 @@ namespace BF
|
||||
|
||||
public override void Process(LaunchRequester lr)
|
||||
{
|
||||
var clientProcessorOptParams = new Dictionary<string, object>();
|
||||
clientProcessorOptParams.TryAdd("opt_type", "OnGetVersionProcessorStart");
|
||||
BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr.PostThinkingAnalyticsEventProperties("client_processor_opt", clientProcessorOptParams);
|
||||
|
||||
base.Process(lr);
|
||||
|
||||
this.lr = lr;
|
||||
@ -125,11 +121,6 @@ namespace BF
|
||||
{
|
||||
if(string.IsNullOrEmpty(lr.versionInfo.cdn_url))
|
||||
{
|
||||
var clientProcessorOptParams = new Dictionary<string, object>();
|
||||
clientProcessorOptParams.TryAdd("opt_type", "OnGetVersionProcessorChooseCdnFail");
|
||||
clientProcessorOptParams.TryAdd("err_info", "server return cdn list is empty");
|
||||
BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr.PostThinkingAnalyticsEventProperties("client_processor_opt", clientProcessorOptParams);
|
||||
|
||||
BFLog.LogError("获取不到cdn列表 服务器返回的cdn列表为空");
|
||||
return;
|
||||
}
|
||||
@ -190,10 +181,6 @@ namespace BF
|
||||
/// </summary>
|
||||
void DownloadABConfig()
|
||||
{
|
||||
var clientProcessorOptParams = new Dictionary<string, object>();
|
||||
clientProcessorOptParams.TryAdd("opt_type", "OnGetVersionProcessorDownloadABConfig");
|
||||
BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr.PostThinkingAnalyticsEventProperties("client_processor_opt", clientProcessorOptParams);
|
||||
|
||||
var address = Path.Combine(lr.firstChoiceCDN, lr.versionInfo.version, "ab_config.bytes");
|
||||
var timeout = 60;
|
||||
BFMain.Instance.WebRequestMgr.Get(address, OnDownloadABConfig, timeout);
|
||||
|
||||
@ -22,10 +22,6 @@ namespace BF
|
||||
|
||||
public override void Process(LaunchRequester lr)
|
||||
{
|
||||
var clientProcessorOptParams = new Dictionary<string, object>();
|
||||
clientProcessorOptParams.TryAdd("opt_type", "PreCheckProcessorStart");
|
||||
BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr.PostThinkingAnalyticsEventProperties("client_processor_opt", clientProcessorOptParams);
|
||||
|
||||
base.Process(lr);
|
||||
|
||||
this.lr = lr;
|
||||
@ -113,10 +109,6 @@ namespace BF
|
||||
|
||||
BFMain.Instance.LoomMgr.QueueOnMainThread(() =>
|
||||
{
|
||||
var clientProcessorOptParams = new Dictionary<string, object>();
|
||||
clientProcessorOptParams.TryAdd("opt_type", "PreCheckProcessorCheckMissFile");
|
||||
BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr.PostThinkingAnalyticsEventProperties("client_processor_opt", clientProcessorOptParams);
|
||||
|
||||
checkMissFileEnd = true;
|
||||
PreCheckEnd();
|
||||
});
|
||||
@ -137,10 +129,6 @@ namespace BF
|
||||
|
||||
BFMain.Instance.LoomMgr.QueueOnMainThread(() =>
|
||||
{
|
||||
var clientProcessorOptParams = new Dictionary<string, object>();
|
||||
clientProcessorOptParams.TryAdd("opt_type", "PreCheckProcessorCheckOverFile");
|
||||
BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr.PostThinkingAnalyticsEventProperties("client_processor_opt", clientProcessorOptParams);
|
||||
|
||||
checkOverFileEnd = true;
|
||||
PreCheckEnd();
|
||||
});
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
using UnityEngine;
|
||||
@ -20,25 +19,13 @@ namespace BF
|
||||
base.Process(lr);
|
||||
|
||||
this.lr = lr;
|
||||
|
||||
// 这里延迟一帧处理是因为数数在当前帧未初始化完成会报错，所以这里处理为延迟一帧，等初始化完成
|
||||
BFMain.Instance.OneShotManager.AddOneShot(()=>{
|
||||
PrepareABConfig();
|
||||
});
|
||||
}
|
||||
|
||||
void PrepareABConfig()
|
||||
{
|
||||
var clientProcessorOptParams = new Dictionary<string, object>();
|
||||
clientProcessorOptParams.TryAdd("opt_type", "PrepareProcessorStart");
|
||||
BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr.PostThinkingAnalyticsEventProperties("client_processor_opt", clientProcessorOptParams);
|
||||
|
||||
GetBytesAsync(StreamingAbccPath, (byte[] data) =>
|
||||
{
|
||||
var clientProcessorOptParams = new Dictionary<string, object>();
|
||||
clientProcessorOptParams.TryAdd("opt_type", "PrepareProcessorOver");
|
||||
BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr.PostThinkingAnalyticsEventProperties("client_processor_opt", clientProcessorOptParams);
|
||||
|
||||
var json = AssetBundleConfigCollection.Decompress(data);
|
||||
lr.streamingAbcc = AssetBundleConfigCollection.Create(json);
|
||||
var needCopyABConfig = false;
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
namespace BF
|
||||
@ -14,10 +13,6 @@ namespace BF
|
||||
|
||||
public override void Process(LaunchRequester lr)
|
||||
{
|
||||
var clientProcessorOptParams = new Dictionary<string, object>();
|
||||
clientProcessorOptParams.TryAdd("opt_type", "RequestVersionProcessorStart");
|
||||
BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr.PostThinkingAnalyticsEventProperties("client_processor_opt", clientProcessorOptParams);
|
||||
|
||||
base.Process(lr);
|
||||
|
||||
this.lr = lr;
|
||||
@ -33,10 +28,6 @@ namespace BF
|
||||
|
||||
void OnServerRespond(string json)
|
||||
{
|
||||
var clientProcessorOptParams = new Dictionary<string, object>();
|
||||
clientProcessorOptParams.TryAdd("opt_type", "RequestVersionProcessorOver");
|
||||
BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr.PostThinkingAnalyticsEventProperties("client_processor_opt", clientProcessorOptParams);
|
||||
|
||||
BFLog.LogDebug(BFLog.DEBUG_GAME_LAUNCH, "green", "版本信息: " + json);
|
||||
if (!BFMain.IsStandAlone) // 如果是单机就直接下一步
|
||||
{
|
||||
|
||||
@ -16,8 +16,6 @@ namespace BF
|
||||
|
||||
public const string MAIN_SOCKET_NAME = "0";
|
||||
public const string CHAT_SOCKET_NAME = "1";
|
||||
public const int MAIN_SOCKET_NAME_INT = 0;
|
||||
public const int CHAT_SOCKET_NAME_INT = 1;
|
||||
static NetManager instance;
|
||||
private NetClient netClient;
|
||||
private List<ClientInfo> clients = new List<ClientInfo>();
|
||||
@ -33,11 +31,8 @@ namespace BF
|
||||
public byte [] authReqData = null;
|
||||
public byte [] ChatAuthReqData = null;
|
||||
public string decodePbStr = null;
|
||||
public string decodeChatPbStr = null;
|
||||
public uint rspGroup = 0;
|
||||
public uint rspChatGroup = 0;
|
||||
public bool decodeFinish = false;
|
||||
public bool decodeChatFinish = false;
|
||||
public static NetManager Create()
|
||||
{
|
||||
BFLog.LogAssert(instance == null, "This method only allows BFMain to call once");
|
||||
@ -203,15 +198,8 @@ namespace BF
|
||||
}
|
||||
|
||||
public void HandleDecodePbChange(int clientId, uint group, uint seq, byte[] data)
|
||||
{
|
||||
if (clientId == MAIN_SOCKET_NAME_INT)
|
||||
{
|
||||
decodeFinish = false;
|
||||
}
|
||||
else if (clientId == CHAT_SOCKET_NAME_INT)
|
||||
{
|
||||
decodeChatFinish = false;
|
||||
}
|
||||
OnDecodePbCallback?.Invoke(clientId, group, seq, data);
|
||||
}
|
||||
|
||||
@ -329,7 +317,7 @@ namespace BF
|
||||
public void ConnectWithConfiguration(int clientId, NetConnectConfiguration configuration, string domainName, int port)
|
||||
{
|
||||
ClientInfo clientInfo = new ClientInfo();
|
||||
clientInfo.Name = clientId.ToString();
|
||||
clientInfo.Name = configuration.UniqueIdentifier;
|
||||
clientInfo.LastConnectStatus = NetConnectStatus.InvalidConnect;
|
||||
clients[clientId] = clientInfo;
|
||||
netClient.Connect(configuration, domainName, port);
|
||||
@ -382,31 +370,16 @@ namespace BF
|
||||
return decodeFinish;
|
||||
}
|
||||
|
||||
public bool GetDecodeChatStataus()
|
||||
{
|
||||
return decodeChatFinish;
|
||||
}
|
||||
|
||||
public string GetDecodePbStr()
|
||||
{
|
||||
return decodePbStr;
|
||||
}
|
||||
|
||||
public string GetDecodeChatPbStr()
|
||||
{
|
||||
return decodeChatPbStr;
|
||||
}
|
||||
|
||||
public uint GetDecodeGroup()
|
||||
{
|
||||
return rspGroup;
|
||||
}
|
||||
|
||||
public uint GetDecodeChatGroup()
|
||||
{
|
||||
return rspChatGroup;
|
||||
}
|
||||
|
||||
public void AddLuaOnReceiveMessage(Action<int, uint, uint, byte[]> luaFunc)
|
||||
{
|
||||
OnReceiveMsgLuaCallback = luaFunc;
|
||||
|
||||
@ -104,15 +104,7 @@ namespace BF
|
||||
/// <returns></returns>
|
||||
private bool DeserializeAuthRsp(out long status)
|
||||
{
|
||||
string pbData;
|
||||
if(ownerConnection.UniqueIdentifier.CompareTo(BF.NetManager.MAIN_SOCKET_NAME) == 0)
|
||||
{
|
||||
pbData = BFMain.Instance.NetMgr.GetDecodePbStr();
|
||||
}
|
||||
else
|
||||
{
|
||||
pbData = BFMain.Instance.NetMgr.GetDecodeChatPbStr();
|
||||
}
|
||||
string pbData = BF.BFMain.Instance.NetMgr.GetDecodePbStr();
|
||||
Dictionary<string, object> dict = Json.Deserialize(pbData) as Dictionary<string, object>;
|
||||
|
||||
status = (long)dict["status"];
|
||||
|
||||
@ -214,14 +214,7 @@ namespace BF
|
||||
// ResetOldSessionRc4Key();
|
||||
|
||||
ForceSendHeartBeatImmediately();
|
||||
if(ownerConnection.UniqueIdentifier.CompareTo(BF.NetManager.MAIN_SOCKET_NAME) == 0)
|
||||
{
|
||||
BF.BFMain.Instance.NetMgr.decodeFinish = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
BF.BFMain.Instance.NetMgr.decodeChatFinish = false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
@ -317,16 +310,7 @@ namespace BF
|
||||
private bool DeserializeReconnectRsp(out long status, out long seqCs)
|
||||
{
|
||||
// BFLog.Log("==================================== DeserializeReconnectRsp");
|
||||
string pbData;
|
||||
if(ownerConnection.UniqueIdentifier.CompareTo(BF.NetManager.MAIN_SOCKET_NAME) == 0)
|
||||
|
||||
{
|
||||
pbData = BF.BFMain.Instance.NetMgr.GetDecodePbStr();
|
||||
}
|
||||
else
|
||||
{
|
||||
pbData = BF.BFMain.Instance.NetMgr.GetDecodeChatPbStr();
|
||||
}
|
||||
string pbData = BF.BFMain.Instance.NetMgr.GetDecodePbStr();
|
||||
Dictionary<string, object> dict = Json.Deserialize(pbData) as Dictionary<string, object>;
|
||||
// BFLog.Log("==================================== DeserializeReconnectRsp pbData = " + pbData);
|
||||
// BFLog.Log("==================================== DeserializeReconnectRsp status = " + (long)dict["status"]);
|
||||
|
||||
@ -72,14 +72,12 @@ namespace BF
|
||||
|
||||
// BFLog.Log("visibleStatus = " + visibleStatus);
|
||||
if (visibleStatus == NetConnectStatus.Decoding && !decoding)
|
||||
{
|
||||
if(ownerConnection.UniqueIdentifier.CompareTo(BF.NetManager.MAIN_SOCKET_NAME) == 0)
|
||||
{
|
||||
bool decodeFinish = BF.BFMain.Instance.NetMgr.GetDecodeStataus();
|
||||
if (decodeFinish)
|
||||
{
|
||||
uint group = BF.BFMain.Instance.NetMgr.GetDecodeGroup();
|
||||
if (group == Auth_Rsp_Group)
|
||||
if (group == Auth_Rsp_Group || group == Chat_Auth_Rsp_Group)
|
||||
{
|
||||
decoding = true;
|
||||
FilterAuthIncomingMessage2();
|
||||
@ -87,25 +85,8 @@ namespace BF
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
bool decodeFinish = BF.BFMain.Instance.NetMgr.GetDecodeChatStataus();
|
||||
if (decodeFinish)
|
||||
{
|
||||
uint group = BF.BFMain.Instance.NetMgr.GetDecodeChatGroup();
|
||||
if (group == Chat_Auth_Rsp_Group)
|
||||
{
|
||||
decoding = true;
|
||||
FilterAuthIncomingMessage2();
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// BFLog.Log("visibleStatus = " + visibleStatus + "decoding = " + decoding);
|
||||
if (visibleStatus == NetConnectStatus.Decoding2 && !decoding)
|
||||
{
|
||||
if(ownerConnection.UniqueIdentifier.CompareTo(BF.NetManager.MAIN_SOCKET_NAME) == 0)
|
||||
{
|
||||
bool decodeFinish = BF.BFMain.Instance.NetMgr.GetDecodeStataus();
|
||||
if (decodeFinish)
|
||||
@ -119,21 +100,6 @@ namespace BF
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
bool decodeFinish = BF.BFMain.Instance.NetMgr.GetDecodeChatStataus();
|
||||
if (decodeFinish)
|
||||
{
|
||||
uint group = BF.BFMain.Instance.NetMgr.GetDecodeChatGroup();
|
||||
if (group == Reconnect_Rsp_Group)
|
||||
{
|
||||
decoding = true;
|
||||
FilterReconnectIncomingMessage2();
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
|
||||
@ -26,18 +26,15 @@ public partial class AdManager : BF.MonoSingleton<AdManager>
|
||||
private const string Key = "9uHgeBwag3NXva9MC23ToO3q11Ve59bF1uwg4qGltdGmCQ7OSByFZ_3b1ZF7krMlkHQo5gXzIokVDsvg1rwbr-";
|
||||
string bannerAdUnitId = "YOUR_BANNER_AD_UNIT_ID"; // Retrieve the ID from your account
|
||||
string adInterstitialUnitId = "YOUR_AD_UNIT_ID";
|
||||
#if UNITY_IOS || UNITY_IPHONE
|
||||
string adRewardUnitId = "1043ecded04c561b";
|
||||
#else
|
||||
string adRewardUnitId = "3fdcc8a796773aa2";
|
||||
#endif
|
||||
public Action<string> luaAdRevenuePaidEventCallback;
|
||||
string adRewardUnitId = "e54f27e345da90df";
|
||||
|
||||
// Start is called before the first frame update
|
||||
public void Init(string init = "")
|
||||
{
|
||||
#if UNITY_IOS || UNITY_IPHONE
|
||||
MaxSdkCallbacks.OnSdkInitializedEvent += (MaxSdkBase.SdkConfiguration sdkConfiguration) =>
|
||||
{
|
||||
#if UNITY_IOS || UNITY_IPHONE
|
||||
|
||||
if (MaxSdkUtils.CompareVersions(UnityEngine.iOS.Device.systemVersion, "14.5") != MaxSdkUtils.VersionComparisonResult.Lesser)
|
||||
{
|
||||
// Note that App transparency tracking authorization can be checked via `sdkConfiguration.AppTrackingStatus` for Unity Editor and iOS targets
|
||||
@ -47,7 +44,6 @@ public partial class AdManager : BF.MonoSingleton<AdManager>
|
||||
else
|
||||
AudienceNetwork.AdSettings.SetAdvertiserTrackingEnabled(false);
|
||||
}
|
||||
#endif
|
||||
// Show Mediation Debugger
|
||||
// MaxSdk.ShowMediationDebugger();
|
||||
// MaxSdk.SetVerboseLogging(true);
|
||||
@ -59,7 +55,7 @@ public partial class AdManager : BF.MonoSingleton<AdManager>
|
||||
MaxSdk.SetUserId(SystemInfo.deviceUniqueIdentifier);
|
||||
// MaxSdk.SetVerboseLogging(true);
|
||||
MaxSdk.InitializeSdk();
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
private void LoadAds()
|
||||
@ -69,11 +65,6 @@ public partial class AdManager : BF.MonoSingleton<AdManager>
|
||||
// InitializeInterstitialAds();
|
||||
}
|
||||
|
||||
public void SetAdRevenuePaidEventCallback(Action<string> callback)
|
||||
{
|
||||
luaAdRevenuePaidEventCallback = callback;
|
||||
}
|
||||
|
||||
public bool IsRewardedAdReady()
|
||||
{
|
||||
return MaxSdk.IsRewardedAdReady(adRewardUnitId);
|
||||
@ -101,11 +92,10 @@ public partial class AdManager : BF.MonoSingleton<AdManager>
|
||||
return MaxSdk.IsInterstitialReady(adInterstitialUnitId);
|
||||
}
|
||||
|
||||
public void ShowInterstitial(Action<int> callback = null)
|
||||
public void ShowInterstitial()
|
||||
{
|
||||
if (MaxSdk.IsInterstitialReady(adInterstitialUnitId))
|
||||
{
|
||||
_interstitialAdCallback = callback;
|
||||
MaxSdk.ShowInterstitial(adInterstitialUnitId);
|
||||
}
|
||||
}
|
||||
@ -114,48 +104,10 @@ public partial class AdManager : BF.MonoSingleton<AdManager>
|
||||
public void ShowBanner()
|
||||
{
|
||||
MaxSdk.ShowBanner(bannerAdUnitId);
|
||||
MaxSdk.StartBannerAutoRefresh(bannerAdUnitId);
|
||||
}
|
||||
|
||||
public void HideBanner()
|
||||
{
|
||||
MaxSdk.StopBannerAutoRefresh(bannerAdUnitId);
|
||||
MaxSdk.HideBanner(bannerAdUnitId);
|
||||
}
|
||||
|
||||
public void DestroyBanner()
|
||||
{
|
||||
MaxSdk.DestroyBanner(bannerAdUnitId);
|
||||
}
|
||||
|
||||
public bool IsPrivacyOptionsRequired()
|
||||
{
|
||||
#if UNITY_IOS || UNITY_IPHONE
|
||||
return BF.BFUMPManager.IsPrivacyOptionsRequired();
|
||||
#elif UNITY_ANDROID && !UNITY_EDITOR
|
||||
return BF.BFMain.Instance.SDKMgr.BFNativeSDKMgr.IsPrivacyOptionsRequired();
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
public void ShowPrivacyOptionsForm()
|
||||
{
|
||||
#if UNITY_IOS || UNITY_IPHONE
|
||||
BF.BFUMPManager.ShowPrivacyOptionsForm();
|
||||
#elif UNITY_ANDROID && !UNITY_EDITOR
|
||||
BF.BFMain.Instance.SDKMgr.BFNativeSDKMgr.ShowPrivacyOptionsForm();
|
||||
#endif
|
||||
}
|
||||
|
||||
public bool CheckCanRequestAds()
|
||||
{
|
||||
#if UNITY_IOS || UNITY_IPHONE
|
||||
return BF.BFUMPManager.IsPrivacyOptionsRequired();
|
||||
#elif UNITY_ANDROID && !UNITY_EDITOR
|
||||
return BF.BFMain.Instance.SDKMgr.BFNativeSDKMgr.IsPrivacyOptionsRequired();
|
||||
#else
|
||||
return true;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,13 +1,18 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using System;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
public partial class AdManager
|
||||
{
|
||||
public void InitializeBannerAds()
|
||||
{
|
||||
// Banners are automatically sized to 320×50 on phones and 728×90 on tablets
|
||||
// You may call the utility method MaxSdkUtils.isTablet() to help with view sizing adjustments
|
||||
MaxSdk.CreateBanner(bannerAdUnitId, MaxSdkBase.BannerPosition.BottomCenter);
|
||||
|
||||
// Set background or background color for banners to be fully functional
|
||||
MaxSdk.SetBannerBackgroundColor(bannerAdUnitId, Color.white);
|
||||
|
||||
MaxSdkCallbacks.Banner.OnAdLoadedEvent += OnBannerAdLoadedEvent;
|
||||
MaxSdkCallbacks.Banner.OnAdLoadFailedEvent += OnBannerAdLoadFailedEvent;
|
||||
MaxSdkCallbacks.Banner.OnAdClickedEvent += OnBannerAdClickedEvent;
|
||||
@ -22,34 +27,7 @@ public partial class AdManager
|
||||
|
||||
private void OnBannerAdClickedEvent(string adUnitId, MaxSdkBase.AdInfo adInfo) { }
|
||||
|
||||
private void OnBannerAdRevenuePaidEvent(string adUnitId, MaxSdkBase.AdInfo adInfo)
|
||||
{
|
||||
if (luaAdRevenuePaidEventCallback == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
double revenue = adInfo.Revenue;
|
||||
// Miscellaneous data
|
||||
string countryCode = MaxSdk.GetSdkConfiguration().CountryCode; // "US" for the United States, etc - Note: Do not confuse this with currency code which is "USD" in most cases!
|
||||
string networkName = adInfo.NetworkName; // Display name of the network that showed the ad (e.g. "AdColony")
|
||||
string adUnitIdentifier = adInfo.AdUnitIdentifier; // The MAX Ad Unit ID
|
||||
string placement = adInfo.Placement; // The placement this ad's postbacks are tied to
|
||||
string networkPlacement = adInfo.NetworkPlacement; // The placement ID from the network that showed the ad
|
||||
string adFormat = adInfo.AdFormat;
|
||||
|
||||
var dict = new Dictionary<string, System.Object>();
|
||||
dict.Add("revenue", revenue);
|
||||
dict.Add("country_code", countryCode);
|
||||
dict.Add("network_name", networkName);
|
||||
dict.Add("ad_unit_Id", adUnitId);
|
||||
dict.Add("ad_unit_identifier", adUnitIdentifier);
|
||||
dict.Add("placement", placement);
|
||||
dict.Add("network_placement", networkPlacement);
|
||||
dict.Add("ad_format", adFormat);
|
||||
dict.Add("ad_type", "banner");
|
||||
var result = JsonConvert.SerializeObject(dict);
|
||||
luaAdRevenuePaidEventCallback(result);
|
||||
}
|
||||
private void OnBannerAdRevenuePaidEvent(string adUnitId, MaxSdkBase.AdInfo adInfo) { }
|
||||
|
||||
private void OnBannerAdExpandedEvent(string adUnitId, MaxSdkBase.AdInfo adInfo) { }
|
||||
|
||||
|
||||
@ -1,12 +1,11 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System;
|
||||
using Newtonsoft.Json;
|
||||
using UnityEngine;
|
||||
|
||||
public partial class AdManager
|
||||
{
|
||||
int retryAttemptInterstitial;
|
||||
private Action<int> _interstitialAdCallback;
|
||||
|
||||
public void InitializeInterstitialAds()
|
||||
{
|
||||
@ -15,7 +14,6 @@ public partial class AdManager
|
||||
MaxSdkCallbacks.Interstitial.OnAdLoadFailedEvent += OnInterstitialLoadFailedEvent;
|
||||
MaxSdkCallbacks.Interstitial.OnAdDisplayedEvent += OnInterstitialDisplayedEvent;
|
||||
MaxSdkCallbacks.Interstitial.OnAdClickedEvent += OnInterstitialClickedEvent;
|
||||
MaxSdkCallbacks.Interstitial.OnAdRevenuePaidEvent += OnInterstitialAdRevenuePaidEvent;
|
||||
MaxSdkCallbacks.Interstitial.OnAdHiddenEvent += OnInterstitialHiddenEvent;
|
||||
MaxSdkCallbacks.Interstitial.OnAdDisplayFailedEvent += OnInterstitialAdFailedToDisplayEvent;
|
||||
|
||||
@ -47,16 +45,12 @@ public partial class AdManager
|
||||
Invoke("LoadInterstitial", (float)retryDelay);
|
||||
}
|
||||
|
||||
private void OnInterstitialDisplayedEvent(string adUnitId, MaxSdkBase.AdInfo adInfo)
|
||||
{
|
||||
_interstitialAdCallback?.Invoke(0);
|
||||
}
|
||||
private void OnInterstitialDisplayedEvent(string adUnitId, MaxSdkBase.AdInfo adInfo) { }
|
||||
|
||||
private void OnInterstitialAdFailedToDisplayEvent(string adUnitId, MaxSdkBase.ErrorInfo errorInfo, MaxSdkBase.AdInfo adInfo)
|
||||
{
|
||||
// Interstitial ad failed to display. AppLovin recommends that you load the next ad.
|
||||
LoadInterstitial();
|
||||
_interstitialAdCallback?.Invoke(1);
|
||||
}
|
||||
|
||||
private void OnInterstitialClickedEvent(string adUnitId, MaxSdkBase.AdInfo adInfo) { }
|
||||
@ -65,35 +59,5 @@ public partial class AdManager
|
||||
{
|
||||
// Interstitial ad is hidden. Pre-load the next ad.
|
||||
LoadInterstitial();
|
||||
_interstitialAdCallback?.Invoke(1);
|
||||
}
|
||||
|
||||
private void OnInterstitialAdRevenuePaidEvent(string adUnitId, MaxSdkBase.AdInfo adInfo)
|
||||
{
|
||||
if (luaAdRevenuePaidEventCallback == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
double revenue = adInfo.Revenue;
|
||||
// Miscellaneous data
|
||||
string countryCode = MaxSdk.GetSdkConfiguration().CountryCode; // "US" for the United States, etc - Note: Do not confuse this with currency code which is "USD" in most cases!
|
||||
string networkName = adInfo.NetworkName; // Display name of the network that showed the ad (e.g. "AdColony")
|
||||
string adUnitIdentifier = adInfo.AdUnitIdentifier; // The MAX Ad Unit ID
|
||||
string placement = adInfo.Placement; // The placement this ad's postbacks are tied to
|
||||
string networkPlacement = adInfo.NetworkPlacement; // The placement ID from the network that showed the ad
|
||||
string adFormat = adInfo.AdFormat;
|
||||
|
||||
var dict = new Dictionary<string, System.Object>();
|
||||
dict.Add("revenue", revenue);
|
||||
dict.Add("country_code", countryCode);
|
||||
dict.Add("network_name", networkName);
|
||||
dict.Add("ad_unit_Id", adUnitId);
|
||||
dict.Add("ad_unit_identifier", adUnitIdentifier);
|
||||
dict.Add("placement", placement);
|
||||
dict.Add("network_placement", networkPlacement);
|
||||
dict.Add("ad_format", adFormat);
|
||||
dict.Add("ad_type", "interstitial");
|
||||
var result = JsonConvert.SerializeObject(dict);
|
||||
luaAdRevenuePaidEventCallback(result);
|
||||
}
|
||||
}
|
||||
|
||||
@ -10,6 +10,7 @@ public partial class AdManager
|
||||
|
||||
private Action<int> _rewardCallback;
|
||||
private bool _rewardOK = false;
|
||||
public Action<string> luaAdRevenuePaidEventCallback;
|
||||
|
||||
public void InitializeRewardedAds()
|
||||
{
|
||||
@ -27,6 +28,11 @@ public partial class AdManager
|
||||
LoadRewardedAd();
|
||||
}
|
||||
|
||||
public void SetAdRevenuePaidEventCallback(Action<string> callback)
|
||||
{
|
||||
luaAdRevenuePaidEventCallback = callback;
|
||||
}
|
||||
|
||||
private void LoadRewardedAd()
|
||||
{
|
||||
MaxSdk.LoadRewardedAd(adRewardUnitId);
|
||||
@ -37,7 +43,7 @@ public partial class AdManager
|
||||
// Rewarded ad is ready for you to show. MaxSdk.IsRewardedAdReady(adUnitId) now returns 'true'.
|
||||
|
||||
// Reset retry attempt
|
||||
retryAttemptReward = 0;
|
||||
retryAttemptInterstitial = 0;
|
||||
}
|
||||
|
||||
private void OnRewardedAdLoadFailedEvent(string adUnitId, MaxSdkBase.ErrorInfo errorInfo)
|
||||
@ -45,8 +51,8 @@ public partial class AdManager
|
||||
// Rewarded ad failed to load
|
||||
// AppLovin recommends that you retry with exponentially higher delays, up to a maximum delay (in this case 64 seconds).
|
||||
|
||||
retryAttemptReward++;
|
||||
double retryDelay = Math.Pow(2, Math.Min(6, retryAttemptReward));
|
||||
retryAttemptInterstitial++;
|
||||
double retryDelay = Math.Pow(2, Math.Min(6, retryAttemptInterstitial));
|
||||
|
||||
Invoke("LoadRewardedAd", (float)retryDelay);
|
||||
}
|
||||
@ -57,6 +63,8 @@ public partial class AdManager
|
||||
{
|
||||
// Rewarded ad failed to display. AppLovin recommends that you load the next ad.
|
||||
LoadRewardedAd();
|
||||
|
||||
Debug.Log(Tag + "==================== OnRewardedAdFailedToDisplayEvent");
|
||||
_rewardCallback?.Invoke(1);
|
||||
}
|
||||
|
||||
@ -75,11 +83,17 @@ public partial class AdManager
|
||||
}
|
||||
_rewardOK = false;
|
||||
_rewardCallback = null;
|
||||
Debug.Log(Tag + "==================== OnRewardedAdHiddenEvent");
|
||||
}
|
||||
|
||||
private void OnRewardedAdReceivedRewardEvent(string adUnitId, MaxSdk.Reward reward, MaxSdkBase.AdInfo adInfo)
|
||||
{
|
||||
// The rewarded ad displayed and the user should receive the reward.
|
||||
|
||||
Debug.Log(Tag + "Rewarded user: " + reward.Amount + " " + reward.Label);
|
||||
_rewardOK = true;
|
||||
// _rewardCallback?.Invoke(0);
|
||||
// _rewardCallback = null;
|
||||
}
|
||||
|
||||
private void OnRewardedAdRevenuePaidEvent(string adUnitId, MaxSdkBase.AdInfo adInfo)
|
||||
@ -106,7 +120,6 @@ public partial class AdManager
|
||||
dict.Add("placement", placement);
|
||||
dict.Add("network_placement", networkPlacement);
|
||||
dict.Add("ad_format", adFormat);
|
||||
dict.Add("ad_type", "reward");
|
||||
var result = JsonConvert.SerializeObject(dict);
|
||||
luaAdRevenuePaidEventCallback(result);
|
||||
}
|
||||
|
||||
@ -1,87 +0,0 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
namespace BF
|
||||
{
|
||||
public class BFHWAdSDKManager : MonoBehaviour
|
||||
{
|
||||
public Action<int> luaShowCallback;
|
||||
public Action<int> luaLoadedCallback;
|
||||
public Action<int, string> luaEarnedRewardCallback;
|
||||
public bool AdLoaded = false;
|
||||
public bool AdInitialized = false;
|
||||
|
||||
void Start()
|
||||
{
|
||||
Init();
|
||||
}
|
||||
|
||||
public void Init()
|
||||
{
|
||||
// google
|
||||
BFMain.Instance.SDKMgr.BFNativeSDKMgr.InitHWAdRewardedVideo();
|
||||
}
|
||||
|
||||
public void ShowFullScreenAds()
|
||||
{
|
||||
BFMain.Instance.SDKMgr.BFNativeSDKMgr.ShowHWFullScreenAds();
|
||||
}
|
||||
|
||||
public void TryLoadRewardedAd()
|
||||
{
|
||||
BFMain.Instance.SDKMgr.BFNativeSDKMgr.TryLoadHWRewardedAd();
|
||||
}
|
||||
|
||||
// public void SetAdPlacement(string placement)
|
||||
// {
|
||||
// BFMain.Instance.SDKMgr.BFNativeSDKMgr.SetAdPlacement(placement);
|
||||
// }
|
||||
|
||||
public void SetAdShowCallback(Action<int> callback)
|
||||
{
|
||||
luaShowCallback = callback;
|
||||
}
|
||||
|
||||
// 设置广告加载回调
|
||||
public void SetAdLoadedCallback(Action<int> callback)
|
||||
{
|
||||
luaLoadedCallback = callback;
|
||||
}
|
||||
|
||||
// 设置广告看完回调
|
||||
public void SetAdEarnedRewardCallback(Action<int, string> callback)
|
||||
{
|
||||
luaEarnedRewardCallback = callback;
|
||||
}
|
||||
public void ShowFullScreenAdFinish(int code)
|
||||
{
|
||||
if (luaShowCallback != null)
|
||||
{
|
||||
luaShowCallback(code);
|
||||
// luaShowCallback = null;
|
||||
}
|
||||
}
|
||||
public void AdLoadedFinish(int code)
|
||||
{
|
||||
if (code == 0)
|
||||
{
|
||||
AdLoaded = true;
|
||||
}
|
||||
|
||||
if (luaLoadedCallback != null)
|
||||
{
|
||||
luaLoadedCallback(code);
|
||||
}
|
||||
}
|
||||
public void EarnedRewardFinish(int code, string result)
|
||||
{
|
||||
if (luaEarnedRewardCallback != null)
|
||||
{
|
||||
luaEarnedRewardCallback(code, result);
|
||||
// luaEarnedRewardCallback = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 51a8bc27467e6434d847a1a53555d90b
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,123 +0,0 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
namespace BF
|
||||
{
|
||||
public class BFHWPaySDKManager : MonoBehaviour
|
||||
{
|
||||
public Action<int, string> luaPayCallback;
|
||||
public Action<int, string> luaQueryProductCallback;
|
||||
public Action<int, string> luaQueryUncompleteOrderCallback;
|
||||
public Action<int> luaConsumeCallback;
|
||||
public bool StoreValid { get; private set; }
|
||||
private string ProductJson;
|
||||
|
||||
void Start()
|
||||
{
|
||||
// 俄罗斯华为渠道专用支付
|
||||
if (!BFPlatform.IsSupportHWPay())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Init();
|
||||
CheckStoreValid();
|
||||
}
|
||||
|
||||
// 初始化
|
||||
public void Init()
|
||||
{
|
||||
// BFMain.Instance.SDKMgr.BFNativeSDKMgr.RuInit();
|
||||
}
|
||||
|
||||
// 检测支付可用性
|
||||
public void CheckStoreValid()
|
||||
{
|
||||
BFMain.Instance.SDKMgr.BFNativeSDKMgr.HWCheckValid();
|
||||
}
|
||||
|
||||
public void CheckStoreValidComplete(bool success)
|
||||
{
|
||||
StoreValid = success;
|
||||
}
|
||||
|
||||
// 请求全部商品信息
|
||||
public void QueryProductInfo(string productJson, Action<int, string> callback)
|
||||
{
|
||||
luaQueryProductCallback = callback;
|
||||
BFMain.Instance.SDKMgr.BFNativeSDKMgr.HWGetProducts(productJson, callback);
|
||||
}
|
||||
|
||||
public void QueryProductComplete(bool succ, string result)
|
||||
{
|
||||
Debug.Log("C# call QueryProductComplete");
|
||||
int code = succ?0:1;
|
||||
if(luaQueryProductCallback != null)
|
||||
{
|
||||
Debug.Log("C# call QueryProductComplete result = " + result + " code = " + code);
|
||||
Action<int, string> tempLuaQueryProductCallback = luaQueryProductCallback;
|
||||
luaQueryProductCallback = null;
|
||||
tempLuaQueryProductCallback(code, result);
|
||||
ProductJson = string.Empty;
|
||||
}
|
||||
}
|
||||
|
||||
// 支付
|
||||
public void Pay(string payType, string productId, string customMsg, Action<int, string> callback)
|
||||
{
|
||||
luaPayCallback = callback;
|
||||
BFMain.Instance.SDKMgr.BFNativeSDKMgr.HWPurchase(productId, customMsg);
|
||||
}
|
||||
|
||||
public void PayComplete(int code, string result)
|
||||
{
|
||||
Debug.Log("C# call PayComplete");
|
||||
// 优先当前支付的回调
|
||||
if(luaPayCallback != null)
|
||||
{
|
||||
Debug.Log("C# call PayComplete result = " + result + " code = " + code);
|
||||
luaPayCallback(code, result);
|
||||
luaPayCallback = null;
|
||||
}
|
||||
}
|
||||
|
||||
// 消耗
|
||||
public void ConsumePurchase(string token, Action<int> callback)
|
||||
{
|
||||
luaConsumeCallback = callback;
|
||||
BFMain.Instance.SDKMgr.BFNativeSDKMgr.HWConsume(token);
|
||||
}
|
||||
|
||||
public void ConsumeComplete(int code)
|
||||
{
|
||||
Debug.Log("C# call ConsumeComplete");
|
||||
if (luaConsumeCallback != null)
|
||||
{
|
||||
Debug.Log("C# call ConsumeComplete code = " + code);
|
||||
luaConsumeCallback(code);
|
||||
luaConsumeCallback = null;
|
||||
}
|
||||
}
|
||||
|
||||
// 查询未完成订单
|
||||
public void QueryUncompleteOrder(Action<int, string> callback)
|
||||
{
|
||||
luaQueryUncompleteOrderCallback = callback;
|
||||
BFMain.Instance.SDKMgr.BFNativeSDKMgr.HWGetPurchase();
|
||||
}
|
||||
|
||||
public void QueryUncompleteOrderFinish(string result)
|
||||
{
|
||||
Debug.Log("C# call QueryUncompleteOrderFinish");
|
||||
if(luaQueryUncompleteOrderCallback != null)
|
||||
{
|
||||
Debug.Log("C# call QueryUncompleteOrderFinish result = " + result);
|
||||
Action<int, string> tempLuaQueryUncompleteOrderCallback = luaQueryUncompleteOrderCallback;
|
||||
luaQueryUncompleteOrderCallback = null;
|
||||
tempLuaQueryUncompleteOrderCallback(0, result);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 23ba21f8bd9926047b7b057e98ddf72f
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
318
Assets/Scripts/Common/SDK/BFIronSourceSDKManager.cs
Normal file
318
Assets/Scripts/Common/SDK/BFIronSourceSDKManager.cs
Normal file
@ -0,0 +1,318 @@
|
||||
using UnityEngine;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System;
|
||||
using com.adjust.sdk;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace BF
|
||||
{
|
||||
// Example for IronSource Unity.
|
||||
public class BFIronSourceSDKManager : MonoBehaviour
|
||||
{
|
||||
public Action<int> luaShowCallback;
|
||||
public Action<int> luaLoadedCallback;
|
||||
public Action<int, string> luaEarnedRewardCallback;
|
||||
public Action<string> luaAdRevenuePaidEventCallback;
|
||||
public bool AdLoaded = false;
|
||||
public bool AdInitialized = false;
|
||||
|
||||
public void Start()
|
||||
{
|
||||
|
||||
#if UNITY_ANDROID
|
||||
// string appKey = "85460dcd";
|
||||
string appKey = "1a6aacc25";
|
||||
|
||||
BFLog.Log("unity-script: IronSource.Agent.validateIntegration");
|
||||
IronSource.Agent.validateIntegration();
|
||||
|
||||
BFLog.Log("unity-script: unity version" + IronSource.unityVersion());
|
||||
|
||||
// SDK init
|
||||
BFLog.Log("unity-script: IronSource.Agent.init");
|
||||
// IronSource.Agent.setMetaData("is_test_suite", "enable");
|
||||
IronSource.Agent.init(appKey);
|
||||
IronSource.Agent.setManualLoadRewardedVideo(true);
|
||||
|
||||
// 初始化之前先设置一下用户id
|
||||
// ISAdQualityConfig adQualityConfig = new ISAdQualityConfig();
|
||||
// adQualityConfig.UserId = SystemInfo.deviceUniqueIdentifier;
|
||||
// // adQualityConfig.TestMode = true;
|
||||
// // adQualityConfig.LogLevel = ISAdQualityLogLevel.INFO;
|
||||
// IronSourceAdQuality.Initialize(appKey, adQualityConfig);
|
||||
#elif UNITY_IPHONE
|
||||
// string appKey = "8545d445";
|
||||
// 初始化之前先设置一下用户id
|
||||
// ISAdQualityConfig adQualityConfig = new ISAdQualityConfig();
|
||||
// adQualityConfig.UserId = SystemInfo.deviceUniqueIdentifier;
|
||||
// IronSourceAdQuality.Initialize(appKey, adQualityConfig);
|
||||
#else
|
||||
// string appKey = "unexpected_platform";
|
||||
#endif
|
||||
// BFLog.Log("unity-script: IronSource.Agent.validateIntegration");
|
||||
// IronSource.Agent.validateIntegration();
|
||||
|
||||
// BFLog.Log("unity-script: unity version" + IronSource.unityVersion());
|
||||
|
||||
// // SDK init
|
||||
// BFLog.Log("unity-script: IronSource.Agent.init");
|
||||
// IronSource.Agent.init(appKey);
|
||||
// IronSource.Agent.setManualLoadRewardedVideo(true);
|
||||
}
|
||||
|
||||
void OnEnable()
|
||||
{
|
||||
|
||||
//Add Init Event
|
||||
IronSourceEvents.onSdkInitializationCompletedEvent += SdkInitializationCompletedEvent;
|
||||
|
||||
//Add Rewarded Video Events
|
||||
// IronSourceEvents.onRewardedVideoAdOpenedEvent += RewardedVideoAdOpenedEvent;
|
||||
// IronSourceEvents.onRewardedVideoAdClosedEvent += RewardedVideoAdClosedEvent;
|
||||
// IronSourceEvents.onRewardedVideoAvailabilityChangedEvent += RewardedVideoAvailabilityChangedEvent;
|
||||
// IronSourceEvents.onRewardedVideoAdStartedEvent += RewardedVideoAdStartedEvent;
|
||||
// IronSourceEvents.onRewardedVideoAdEndedEvent += RewardedVideoAdEndedEvent;
|
||||
// IronSourceEvents.onRewardedVideoAdRewardedEvent += RewardedVideoAdRewardedEvent;
|
||||
// IronSourceEvents.onRewardedVideoAdShowFailedEvent += RewardedVideoAdShowFailedEvent;
|
||||
// IronSourceEvents.onRewardedVideoAdClickedEvent += RewardedVideoAdClickedEvent;
|
||||
|
||||
//Add ImpressionSuccess Event
|
||||
IronSourceEvents.onImpressionSuccessEvent += ImpressionSuccessEvent;
|
||||
IronSourceEvents.onImpressionDataReadyEvent += ImpressionDataReadyEvent;
|
||||
|
||||
|
||||
//Add AdInfo Rewarded Video Events
|
||||
IronSourceRewardedVideoEvents.onAdOpenedEvent += ReardedVideoOnAdOpenedEvent;
|
||||
IronSourceRewardedVideoEvents.onAdClosedEvent += ReardedVideoOnAdClosedEvent;
|
||||
IronSourceRewardedVideoEvents.onAdAvailableEvent += ReardedVideoOnAdAvailable;
|
||||
IronSourceRewardedVideoEvents.onAdUnavailableEvent += ReardedVideoOnAdUnavailable;
|
||||
IronSourceRewardedVideoEvents.onAdShowFailedEvent += ReardedVideoOnAdShowFailedEvent;
|
||||
IronSourceRewardedVideoEvents.onAdRewardedEvent += ReardedVideoOnAdRewardedEvent;
|
||||
IronSourceRewardedVideoEvents.onAdClickedEvent += ReardedVideoOnAdClickedEvent;
|
||||
}
|
||||
|
||||
public void SetAdRevenuePaidEventCallback(Action<string> callback)
|
||||
{
|
||||
luaAdRevenuePaidEventCallback = callback;
|
||||
}
|
||||
|
||||
void OnApplicationPause(bool isPaused)
|
||||
{
|
||||
#if UNITY_ANDROID
|
||||
BFLog.Log("unity-script: OnApplicationPause = " + isPaused);
|
||||
IronSource.Agent.onApplicationPause(isPaused);
|
||||
#endif
|
||||
}
|
||||
|
||||
public void ShowFullScreenAds()
|
||||
{
|
||||
if(IronSource.Agent.isRewardedVideoAvailable())
|
||||
{
|
||||
IronSource.Agent.showRewardedVideo();
|
||||
}
|
||||
else
|
||||
{
|
||||
// TryLoadRewardedAd();
|
||||
BFLog.Log("unity-script: IronSource.Agent.isRewardedVideoAvailable - False");
|
||||
}
|
||||
}
|
||||
|
||||
public void TryLoadRewardedAd()
|
||||
{
|
||||
IronSource.Agent.loadRewardedVideo();
|
||||
}
|
||||
|
||||
public void SetAdPlacement(string placement)
|
||||
{
|
||||
// BFMain.Instance.SDKMgr.BFNativeSDKMgr.SetAdPlacement(placement);
|
||||
}
|
||||
|
||||
public void SetAdShowCallback(Action<int> callback)
|
||||
{
|
||||
luaShowCallback = callback;
|
||||
}
|
||||
|
||||
// 设置广告加载回调
|
||||
public void SetAdLoadedCallback(Action<int> callback)
|
||||
{
|
||||
luaLoadedCallback = callback;
|
||||
}
|
||||
|
||||
// 设置广告看完回调
|
||||
public void SetAdEarnedRewardCallback(Action<int, string> callback)
|
||||
{
|
||||
luaEarnedRewardCallback = callback;
|
||||
}
|
||||
public void ShowFullScreenAdFinish(int code)
|
||||
{
|
||||
if (luaShowCallback != null)
|
||||
{
|
||||
luaShowCallback(code);
|
||||
}
|
||||
}
|
||||
#region Init callback handlers
|
||||
|
||||
void SdkInitializationCompletedEvent()
|
||||
{
|
||||
BFLog.Log("unity-script: I got SdkInitializationCompletedEvent");
|
||||
//Launch test suite
|
||||
// IronSource.Agent.launchTestSuite();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region AdInfo Rewarded Video
|
||||
void ReardedVideoOnAdOpenedEvent(IronSourceAdInfo adInfo) {
|
||||
BFLog.Log("unity-script: I got ReardedVideoOnAdOpenedEvent With AdInfo " + adInfo.ToString());
|
||||
ShowFullScreenAdFinish(0);
|
||||
}
|
||||
void ReardedVideoOnAdClosedEvent(IronSourceAdInfo adInfo)
|
||||
{
|
||||
BFLog.Log("unity-script: I got ReardedVideoOnAdClosedEvent With AdInfo " + adInfo.ToString());
|
||||
}
|
||||
void ReardedVideoOnAdAvailable(IronSourceAdInfo adInfo)
|
||||
{
|
||||
BFLog.Log("unity-script: I got ReardedVideoOnAdAvailable With AdInfo " + adInfo.ToString());
|
||||
AdLoaded = true;
|
||||
|
||||
if (luaLoadedCallback != null)
|
||||
{
|
||||
luaLoadedCallback(0);
|
||||
}
|
||||
}
|
||||
void ReardedVideoOnAdUnavailable()
|
||||
{
|
||||
BFLog.Log("unity-script: I got ReardedVideoOnAdUnavailable");
|
||||
AdLoaded = false;
|
||||
|
||||
if (luaLoadedCallback != null)
|
||||
{
|
||||
luaLoadedCallback(1);
|
||||
}
|
||||
}
|
||||
void ReardedVideoOnAdShowFailedEvent(IronSourceError ironSourceError,IronSourceAdInfo adInfo)
|
||||
{
|
||||
BFLog.Log("unity-script: I got RewardedVideoAdOpenedEvent With Error"+ironSourceError.ToString() + "And AdInfo " + adInfo.ToString());
|
||||
ShowFullScreenAdFinish(1);
|
||||
}
|
||||
void ReardedVideoOnAdRewardedEvent(IronSourcePlacement ironSourcePlacement,IronSourceAdInfo adInfo)
|
||||
{
|
||||
BFLog.Log("unity-script: I got ReardedVideoOnAdRewardedEvent With Placement" + ironSourcePlacement.ToString()+ "And AdInfo " + adInfo.ToString());
|
||||
if (luaEarnedRewardCallback != null)
|
||||
{
|
||||
luaEarnedRewardCallback(0, "");
|
||||
}
|
||||
}
|
||||
void ReardedVideoOnAdClickedEvent(IronSourcePlacement ironSourcePlacement, IronSourceAdInfo adInfo)
|
||||
{
|
||||
BFLog.Log("unity-script: I got ReardedVideoOnAdClickedEvent With Placement" + ironSourcePlacement.ToString() + "And AdInfo " + adInfo.ToString());
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
// #region RewardedAd callback handlers
|
||||
|
||||
// void RewardedVideoAvailabilityChangedEvent(bool canShowAd)
|
||||
// {
|
||||
// BFLog.Log("unity-script: I got RewardedVideoAvailabilityChangedEvent, value = " + canShowAd);
|
||||
// }
|
||||
|
||||
// void RewardedVideoAdOpenedEvent()
|
||||
// {
|
||||
// BFLog.Log("unity-script: I got RewardedVideoAdOpenedEvent");
|
||||
// }
|
||||
|
||||
// void RewardedVideoAdRewardedEvent(IronSourcePlacement ssp)
|
||||
// {
|
||||
// BFLog.Log("unity-script: I got RewardedVideoAdRewardedEvent, amount = " + ssp.getRewardAmount() + " name = " + ssp.getRewardName());
|
||||
// }
|
||||
|
||||
// void RewardedVideoAdClosedEvent()
|
||||
// {
|
||||
// BFLog.Log("unity-script: I got RewardedVideoAdClosedEvent");
|
||||
// }
|
||||
|
||||
// void RewardedVideoAdStartedEvent()
|
||||
// {
|
||||
// BFLog.Log("unity-script: I got RewardedVideoAdStartedEvent");
|
||||
// }
|
||||
|
||||
// void RewardedVideoAdEndedEvent()
|
||||
// {
|
||||
// BFLog.Log("unity-script: I got RewardedVideoAdEndedEvent");
|
||||
// }
|
||||
|
||||
// void RewardedVideoAdShowFailedEvent(IronSourceError error)
|
||||
// {
|
||||
// BFLog.Log("unity-script: I got RewardedVideoAdShowFailedEvent, code : " + error.getCode() + ", description : " + error.getDescription());
|
||||
// }
|
||||
|
||||
// void RewardedVideoAdClickedEvent(IronSourcePlacement ssp)
|
||||
// {
|
||||
// BFLog.Log("unity-script: I got RewardedVideoAdClickedEvent, name = " + ssp.getRewardName());
|
||||
// }
|
||||
// #endregion
|
||||
|
||||
#region ImpressionSuccess callback handler
|
||||
|
||||
void ImpressionSuccessEvent(IronSourceImpressionData impressionData)
|
||||
{
|
||||
// BFLog.Log("unity - script: I got ImpressionSuccessEvent ToString(): " + impressionData.ToString());
|
||||
// BFLog.Log("unity - script: I got ImpressionSuccessEvent allData: " + impressionData.allData);
|
||||
}
|
||||
|
||||
void ImpressionDataReadyEvent(IronSourceImpressionData impressionData)
|
||||
{
|
||||
if (impressionData == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
if (ReferenceEquals(impressionData.revenue, null))
|
||||
{
|
||||
return;
|
||||
}
|
||||
double revenue = (double)impressionData.revenue;
|
||||
AdjustAdRevenue adjustAdRevenue = new AdjustAdRevenue(AdjustConfig.AdjustAdRevenueSourceIronSource);
|
||||
adjustAdRevenue.setRevenue(revenue, "USD");
|
||||
// optional fields
|
||||
adjustAdRevenue.setAdRevenueNetwork(impressionData.adNetwork);
|
||||
adjustAdRevenue.setAdRevenueUnit(impressionData.adUnit);
|
||||
adjustAdRevenue.setAdRevenuePlacement(impressionData.placement);
|
||||
// track Adjust ad revenue
|
||||
Adjust.trackAdRevenue(adjustAdRevenue);
|
||||
|
||||
if (luaAdRevenuePaidEventCallback == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
var dict = new Dictionary<string, System.Object>();
|
||||
dict.Add("revenue", revenue);
|
||||
dict.Add("auction_id", impressionData.auctionId);
|
||||
dict.Add("country_code", impressionData.country);
|
||||
dict.Add("network_name", impressionData.adNetwork);
|
||||
dict.Add("ad_unit_Id", impressionData.adUnit);
|
||||
dict.Add("placement", impressionData.placement);
|
||||
dict.Add("ad_format_name", impressionData.instanceName);
|
||||
dict.Add("ad_format_id", impressionData.instanceId);
|
||||
if (!string.IsNullOrEmpty(impressionData.segmentName))
|
||||
{
|
||||
dict.Add("segment_name", impressionData.segmentName);
|
||||
}
|
||||
if (!ReferenceEquals(impressionData.lifetimeRevenue, null))
|
||||
{
|
||||
dict.Add("lifetime_revenue", impressionData.lifetimeRevenue);
|
||||
}
|
||||
if (!string.IsNullOrEmpty(impressionData.encryptedCPM))
|
||||
{
|
||||
dict.Add("encrypted_cpm", impressionData.encryptedCPM);
|
||||
}
|
||||
dict.Add("currency", "USD");
|
||||
dict.Add("precision", impressionData.precision);
|
||||
var result = JsonConvert.SerializeObject(dict);
|
||||
luaAdRevenuePaidEventCallback(result);
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
11
Assets/Scripts/Common/SDK/BFIronSourceSDKManager.cs.meta
Normal file
11
Assets/Scripts/Common/SDK/BFIronSourceSDKManager.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 88d315c7e2aba4d4d89a104b0c746e3f
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -65,31 +65,20 @@ namespace BF
|
||||
void Awake()
|
||||
{
|
||||
// facebook
|
||||
if (BFPlatform.IsSupportFB())
|
||||
{
|
||||
BFLog.Log("FBSdk.Init");
|
||||
FBSdk.Init();
|
||||
FBSdk.SetULoginListener(this);
|
||||
}
|
||||
|
||||
// appid 登陆
|
||||
#if UNITY_IOS
|
||||
signInWithApple = gameObject.AddComponent<SignInWithApple>();
|
||||
#endif
|
||||
|
||||
if (BFPlatform.IsSupportVK())
|
||||
{
|
||||
BFMain.Instance.SDKMgr.BFNativeSDKMgr.VKIDInit("52913931");
|
||||
}
|
||||
}
|
||||
|
||||
void OnApplicationPause(bool pauseStatus)
|
||||
{
|
||||
if (BFPlatform.IsSupportFB())
|
||||
{
|
||||
FBSdk.OnApplicationPause(pauseStatus);
|
||||
}
|
||||
}
|
||||
|
||||
void Start()
|
||||
{
|
||||
@ -163,10 +152,6 @@ namespace BF
|
||||
}
|
||||
#endif
|
||||
}
|
||||
else if(type == LoginType.VKID)
|
||||
{
|
||||
BFMain.Instance.SDKMgr.BFNativeSDKMgr.VKIDLogin();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@ -182,10 +167,6 @@ namespace BF
|
||||
{
|
||||
BFMain.Instance.SDKMgr.BFNativeSDKMgr.GoogleLogout();
|
||||
}
|
||||
else if(type == LoginType.VKID)
|
||||
{
|
||||
BFMain.Instance.SDKMgr.BFNativeSDKMgr.VKIDLogout();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@ -285,7 +266,6 @@ namespace BF
|
||||
|
||||
BFLog.Log(string.Format("json = {0}", json));
|
||||
luaLoginCallback((int)result, json);
|
||||
luaLoginCallback = null;
|
||||
}
|
||||
}
|
||||
|
||||
@ -509,28 +489,5 @@ namespace BF
|
||||
}
|
||||
}
|
||||
#endif
|
||||
public void VKIDLoginComplete(bool succ, string msg)
|
||||
{
|
||||
if (succ)
|
||||
{
|
||||
LoginComplete(LoginType.VKID, ULoginResult.Success, msg);
|
||||
}
|
||||
else
|
||||
{
|
||||
LoginComplete(LoginType.VKID, ULoginResult.Failed, msg);
|
||||
}
|
||||
}
|
||||
|
||||
public void VKIDLogoutComplete(bool succ)
|
||||
{
|
||||
if(succ)
|
||||
{
|
||||
LogoutComplete(LoginType.VKID, ULoginResult.Success, "");
|
||||
}
|
||||
else
|
||||
{
|
||||
LogoutComplete(LoginType.VKID, ULoginResult.Failed, "");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -41,51 +41,6 @@ namespace BF
|
||||
public const int ADMOB_LOADED_FAILED = 21;
|
||||
public const int ADMOB_EARNED_REWARD = 22;
|
||||
public const int ADMOB_INITIALIZED = 23;
|
||||
|
||||
public const int UMP_REQUEST_CONSENT_ERROR = 30;
|
||||
public const int UMP_LOAD_AND_PRESENT_ERROR = 31;
|
||||
public const int UMP_SUCCESS_CALLBACK = 32;
|
||||
public const int UMP_PARALLEL_CALLBACK = 33;
|
||||
|
||||
// 俄罗斯支付
|
||||
public const int RU_CHECK_VALID_SUCCESS = 40;
|
||||
public const int RU_CHECK_VALID_FAILED = 41;
|
||||
public const int RU_GET_PRODUCTS_SUCCESS = 42;
|
||||
public const int RU_GET_PRODUCTS_FAILED = 43;
|
||||
public const int RU_GET_PURCHASE_SUCCESS = 44;
|
||||
public const int RU_GET_PURCHASE_FAILED = 45;
|
||||
public const int RU_PURCHASE_SUCCESS = 46;
|
||||
public const int RU_PURCHASE_FAILED = 47;
|
||||
public const int RU_PURCHASE_CANCEL = 48;
|
||||
public const int RU_CONSUME_SUCCESS = 49;
|
||||
public const int RU_CONSUME_FAILED = 50;
|
||||
// 俄罗斯商店好评
|
||||
public const int RU_STORE_REVIEW_REQUEST_SUCCESS = 51;
|
||||
public const int RU_STORE_REVIEW_REQUEST_FAILED = 52;
|
||||
public const int RU_STORE_REVIEW_LAUNCH_SUCCESS = 53;
|
||||
public const int RU_STORE_REVIEW_LAUNCH_FAILED = 54;
|
||||
public const int RU_VKID_LOGIN_SUCCESS = 55;
|
||||
public const int RU_VKID_LOGIN_FAILED = 56;
|
||||
public const int RU_VKID_LOGOUT_SUCCESS = 57;
|
||||
public const int RU_VKID_LOGOUT_FAILED = 58;
|
||||
// 华为支付
|
||||
public const int HW_CHECK_VALID_SUCCESS = 59;
|
||||
public const int HW_CHECK_VALID_FAILED = 60;
|
||||
public const int HW_GET_PRODUCTS_SUCCESS = 61;
|
||||
public const int HW_GET_PRODUCTS_FAILED = 62;
|
||||
public const int HW_GET_PURCHASE_SUCCESS = 63;
|
||||
public const int HW_GET_PURCHASE_FAILED = 64;
|
||||
public const int HW_PURCHASE_SUCCESS = 65;
|
||||
public const int HW_PURCHASE_FAILED = 66;
|
||||
public const int HW_PURCHASE_CANCEL = 67;
|
||||
public const int HW_CONSUME_SUCCESS = 68;
|
||||
public const int HW_CONSUME_FAILED = 69;
|
||||
// 华为广告
|
||||
public const int HW_SHOWED_FULLSCREEN = 70;
|
||||
public const int HW_FAILEDTO_SHOW_FULLSCREEN = 71;
|
||||
public const int HW_LOADED = 72;
|
||||
public const int HW_LOADED_FAILED = 73;
|
||||
public const int HW_EARNED_REWARD = 74;
|
||||
}
|
||||
|
||||
public class BFNativeSDKManager : MonoBehaviour
|
||||
@ -102,17 +57,7 @@ namespace BF
|
||||
|
||||
[DllImport("__Internal")]
|
||||
private static extern void FIRGetToken(IntPtr callback);
|
||||
|
||||
[DllImport ("__Internal")]
|
||||
private static extern void _OpenURL(string url);
|
||||
|
||||
// [DllImport("__Internal")]
|
||||
// private static extern void VKInit(string appId);
|
||||
|
||||
// [DllImport("__Internal")]
|
||||
// private static extern void VKLogin();
|
||||
#endif
|
||||
|
||||
[Serializable]
|
||||
public class NativeResultMsg
|
||||
{
|
||||
@ -141,13 +86,6 @@ namespace BF
|
||||
#endif
|
||||
}
|
||||
|
||||
public void InitGDPR()
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("initGDPR");
|
||||
#endif
|
||||
}
|
||||
|
||||
public void GooglePay(string payType, string productId, string customMsg)
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
@ -276,314 +214,12 @@ namespace BF
|
||||
#endif
|
||||
}
|
||||
|
||||
public bool IsPrivacyOptionsRequired()
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
return androidJavaClass.CallStatic<bool>("isPrivacyOptionsRequired");
|
||||
#endif
|
||||
return false;
|
||||
}
|
||||
|
||||
public void ShowPrivacyOptionsForm()
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("showPrivacyOptionsForm");
|
||||
#endif
|
||||
}
|
||||
|
||||
public void ResetGDPR()
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("resetGDPR");
|
||||
#endif
|
||||
}
|
||||
|
||||
public void OnUMPFinish(string stateStr)
|
||||
{
|
||||
int state = 0;
|
||||
int.TryParse(stateStr, out state);
|
||||
// 审核模式下,只有正常返回 触发ATT
|
||||
if (BFMain.IsShenhe)
|
||||
{
|
||||
if (state == BFNativeSDKMessage.UMP_REQUEST_CONSENT_ERROR || state == BFNativeSDKMessage.UMP_LOAD_AND_PRESENT_ERROR || state == BFNativeSDKMessage.UMP_SUCCESS_CALLBACK)
|
||||
{
|
||||
BFMain.Instance.GameLaunchMgr.ShowIOSATTrack();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
BFMain.Instance.GameLaunchMgr.ShowIOSATTrack();
|
||||
}
|
||||
BFUMPManager.OnUMPFinish(state);
|
||||
}
|
||||
|
||||
public string GetAppSignMD5()
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
return androidJavaClass.CallStatic<string>("getSign", "MD5");
|
||||
#endif
|
||||
return string.Empty;
|
||||
}
|
||||
|
||||
public string GetAppSignSHA1()
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
return androidJavaClass.CallStatic<string>("getSign", "SHA1");
|
||||
#endif
|
||||
return string.Empty;
|
||||
}
|
||||
|
||||
public string GetAppSignSHA256()
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
return androidJavaClass.CallStatic<string>("getSign", "SHA256");
|
||||
#endif
|
||||
return string.Empty;
|
||||
}
|
||||
|
||||
public void RequestStoreReview()
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("requestStoreReview");
|
||||
#endif
|
||||
|
||||
#if UNITY_IOS && !UNITY_EDITOR
|
||||
UnityEngine.iOS.Device.RequestStoreReview();
|
||||
#endif
|
||||
}
|
||||
|
||||
#region 俄罗斯支付
|
||||
public void RuInit()
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("ruInit");
|
||||
#endif
|
||||
|
||||
Debug.Log("C# call RUInit");
|
||||
}
|
||||
|
||||
public void RuCheckValid()
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("ruCheckValid");
|
||||
#endif
|
||||
|
||||
Debug.Log("C# call RuCheckValid");
|
||||
}
|
||||
|
||||
public void RuGetProducts(string productJson, Action<int, string> callback)
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("ruGetProducts", productJson);
|
||||
#endif
|
||||
|
||||
Debug.Log("C# call RUGetProducts");
|
||||
}
|
||||
|
||||
public void RuGetPurchase()
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("ruGetPurchase");
|
||||
#endif
|
||||
|
||||
Debug.Log("C# call RUGetPurchase");
|
||||
}
|
||||
|
||||
public void RuPurchase(string productId, string customMsg)
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("ruPurchase", productId, customMsg);
|
||||
#endif
|
||||
|
||||
Debug.Log("C# call RUPurchase:" + productId);
|
||||
}
|
||||
|
||||
public void RuConsume(string purchaseId)
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("ruConsume", purchaseId);
|
||||
#endif
|
||||
|
||||
Debug.Log("C# call RUConsume:" + purchaseId);
|
||||
}
|
||||
|
||||
public void RuDelete(string purchaseId)
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("ruDelete", purchaseId);
|
||||
#endif
|
||||
|
||||
Debug.Log("C# call RUDelete:" + purchaseId);
|
||||
}
|
||||
#endregion
|
||||
|
||||
public bool IsAndroidPkgInstalled(string pkgName)
|
||||
{
|
||||
bool isInstalled = false;
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
isInstalled = androidJavaClass.CallStatic<bool>("checkInstalled", pkgName);
|
||||
#endif
|
||||
return isInstalled;
|
||||
|
||||
Debug.Log("C# call RUDelete:" + pkgName + " isInstalled:" + isInstalled);
|
||||
}
|
||||
|
||||
#region 俄罗斯商店好评
|
||||
public void RuRequestStoreReview()
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("requestAndLaunchStoreReviewFlow");
|
||||
#endif
|
||||
|
||||
Debug.Log("C# call RuRequestStoreReview");
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region vk登录登出
|
||||
public void VKIDInit(string id)
|
||||
{
|
||||
if (BFPlatform.IsSupportVK())
|
||||
{
|
||||
#if UNITY_IOS && !UNITY_EDITOR
|
||||
// VKInit(id);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
public void VKIDLogout()
|
||||
{
|
||||
if (BFPlatform.IsSupportVK())
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("vkidLogout");
|
||||
#endif
|
||||
|
||||
#if UNITY_IOS && !UNITY_EDITOR
|
||||
BFMain.Instance.SDKMgr.BFLoginSDKMgr.VKIDLogoutComplete(true);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
public void VKIDLogin()
|
||||
{
|
||||
if (BFPlatform.IsSupportVK())
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("vkidLogin");
|
||||
#endif
|
||||
|
||||
#if UNITY_IOS && !UNITY_EDITOR
|
||||
// VKLogin();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
public void IOSVKLoginCallBack(string code)
|
||||
{
|
||||
if (code.Equals("1"))
|
||||
{
|
||||
BFMain.Instance.SDKMgr.BFLoginSDKMgr.VKIDLoginComplete(false, code);
|
||||
}
|
||||
else
|
||||
{
|
||||
BFMain.Instance.SDKMgr.BFLoginSDKMgr.VKIDLoginComplete(true, code);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
public void PayDukPay(string url)
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("payDukPay", url);
|
||||
#endif
|
||||
}
|
||||
|
||||
#region 华为支付
|
||||
public void HWCheckValid()
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("hwCheckValid");
|
||||
#endif
|
||||
|
||||
Debug.Log("C# call hwCheckValid");
|
||||
}
|
||||
|
||||
public void HWGetProducts(string productJson, Action<int, string> callback)
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("hwGetProducts", productJson);
|
||||
#endif
|
||||
|
||||
Debug.Log("C# call HWGetProducts");
|
||||
}
|
||||
|
||||
public void HWGetPurchase()
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("hwGetPurchase");
|
||||
#endif
|
||||
|
||||
Debug.Log("C# call HWGetPurchase");
|
||||
}
|
||||
|
||||
public void HWPurchase(string productId, string customMsg)
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("hwPurchase", productId, customMsg);
|
||||
#endif
|
||||
|
||||
Debug.Log("C# call HWPurchase:" + productId);
|
||||
}
|
||||
|
||||
public void HWConsume(string productJson)
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("hwConsume", productJson);
|
||||
#endif
|
||||
|
||||
Debug.Log("C# call HWConsume:" + productJson);
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 华为广告
|
||||
public void InitHWAdRewardedVideo()
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("initHWAdRewardedVideo");
|
||||
#endif
|
||||
}
|
||||
|
||||
public void ShowHWFullScreenAds()
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("showHWFullScreenAds");
|
||||
#endif
|
||||
}
|
||||
|
||||
public void TryLoadHWRewardedAd()
|
||||
{
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
androidJavaClass.CallStatic("tryLoadHWRewardedAd");
|
||||
#endif
|
||||
}
|
||||
|
||||
public void OpenUrl(string url)
|
||||
{
|
||||
#if UNITY_IOS && !UNITY_EDITOR
|
||||
_OpenURL(url);
|
||||
#else
|
||||
Application.OpenURL(url);
|
||||
#endif
|
||||
}
|
||||
|
||||
#endregion
|
||||
public void MsgFromAndroidOrIOS(string content)
|
||||
{
|
||||
var msgResult = JsonUtility.FromJson<NativeResultMsg>(content);
|
||||
BFLog.Log(msgResult.body);
|
||||
int head = msgResult.head;
|
||||
switch (head)
|
||||
{
|
||||
switch (head){
|
||||
case BFNativeSDKMessage.GOOGLE_LOGIN_SUCCESS:
|
||||
BFMain.Instance.SDKMgr.BFLoginSDKMgr.GoogleLoginComplete(true, msgResult.body);
|
||||
break;
|
||||
@ -653,137 +289,6 @@ namespace BF
|
||||
case BFNativeSDKMessage.ADMOB_INITIALIZED:
|
||||
// BFMain.Instance.SDKMgr.BFAdmobSDKMgr.AdInitialized = true;
|
||||
break;
|
||||
|
||||
// 俄罗斯支付
|
||||
case BFNativeSDKMessage.RU_CHECK_VALID_SUCCESS:
|
||||
// Debug.Log(msgResult.body);
|
||||
BFMain.Instance.SDKMgr.BFRuPaySDKMgr.CheckStoreValidComplete(true);
|
||||
break;
|
||||
case BFNativeSDKMessage.RU_CHECK_VALID_FAILED:
|
||||
// Debug.Log(msgResult.body);
|
||||
BFMain.Instance.SDKMgr.BFRuPaySDKMgr.CheckStoreValidComplete(false);
|
||||
break;
|
||||
case BFNativeSDKMessage.RU_GET_PRODUCTS_SUCCESS:
|
||||
// Debug.Log(msgResult.body);
|
||||
BFMain.Instance.SDKMgr.BFRuPaySDKMgr.QueryProductComplete(true, msgResult.body);
|
||||
break;
|
||||
case BFNativeSDKMessage.RU_GET_PRODUCTS_FAILED:
|
||||
// Debug.Log(msgResult.body);
|
||||
BFMain.Instance.SDKMgr.BFRuPaySDKMgr.QueryProductComplete(false, msgResult.body);
|
||||
break;
|
||||
case BFNativeSDKMessage.RU_GET_PURCHASE_SUCCESS:
|
||||
// Debug.Log(msgResult.body);
|
||||
BFMain.Instance.SDKMgr.BFRuPaySDKMgr.QueryUncompleteOrderFinish(msgResult.body);
|
||||
break;
|
||||
case BFNativeSDKMessage.RU_GET_PURCHASE_FAILED:
|
||||
// Debug.Log(msgResult.body);
|
||||
BFMain.Instance.SDKMgr.BFRuPaySDKMgr.QueryUncompleteOrderFinish(msgResult.body);
|
||||
break;
|
||||
case BFNativeSDKMessage.RU_PURCHASE_SUCCESS:
|
||||
// Debug.Log(msgResult.body);
|
||||
BFMain.Instance.SDKMgr.BFRuPaySDKMgr.PayComplete(0, msgResult.body);
|
||||
break;
|
||||
case BFNativeSDKMessage.RU_PURCHASE_FAILED:
|
||||
// Debug.Log(msgResult.body);
|
||||
BFMain.Instance.SDKMgr.BFRuPaySDKMgr.PayComplete(1, msgResult.body);
|
||||
break;
|
||||
case BFNativeSDKMessage.RU_PURCHASE_CANCEL:
|
||||
// Debug.Log(msgResult.body);
|
||||
BFMain.Instance.SDKMgr.BFRuPaySDKMgr.PayComplete(2, msgResult.body);
|
||||
break;
|
||||
case BFNativeSDKMessage.RU_CONSUME_SUCCESS:
|
||||
// Debug.Log(msgResult.body);
|
||||
BFMain.Instance.SDKMgr.BFRuPaySDKMgr.ConsumeComplete(0);
|
||||
break;
|
||||
case BFNativeSDKMessage.RU_CONSUME_FAILED:
|
||||
// Debug.Log(msgResult.body);
|
||||
BFMain.Instance.SDKMgr.BFRuPaySDKMgr.ConsumeComplete(1);
|
||||
break;
|
||||
case BFNativeSDKMessage.RU_STORE_REVIEW_REQUEST_SUCCESS:
|
||||
// Debug.Log(msgResult.body);
|
||||
break;
|
||||
case BFNativeSDKMessage.RU_STORE_REVIEW_REQUEST_FAILED:
|
||||
// Debug.Log(msgResult.body);
|
||||
break;
|
||||
case BFNativeSDKMessage.RU_STORE_REVIEW_LAUNCH_SUCCESS:
|
||||
// Debug.Log(msgResult.body);
|
||||
break;
|
||||
case BFNativeSDKMessage.RU_STORE_REVIEW_LAUNCH_FAILED:
|
||||
// Debug.Log(msgResult.body);
|
||||
break;
|
||||
case BFNativeSDKMessage.RU_VKID_LOGIN_SUCCESS:
|
||||
BFMain.Instance.SDKMgr.BFLoginSDKMgr.VKIDLoginComplete(true, msgResult.body);
|
||||
break;
|
||||
case BFNativeSDKMessage.RU_VKID_LOGIN_FAILED:
|
||||
BFMain.Instance.SDKMgr.BFLoginSDKMgr.VKIDLoginComplete(false, msgResult.body);
|
||||
break;
|
||||
case BFNativeSDKMessage.RU_VKID_LOGOUT_SUCCESS:
|
||||
BFMain.Instance.SDKMgr.BFLoginSDKMgr.VKIDLogoutComplete(true);
|
||||
break;
|
||||
case BFNativeSDKMessage.RU_VKID_LOGOUT_FAILED:
|
||||
BFMain.Instance.SDKMgr.BFLoginSDKMgr.VKIDLogoutComplete(false);
|
||||
break;
|
||||
// 华为支付
|
||||
case BFNativeSDKMessage.HW_CHECK_VALID_SUCCESS:
|
||||
// Debug.Log(msgResult.body);
|
||||
BFMain.Instance.SDKMgr.BFHWPaySDKMgr.CheckStoreValidComplete(true);
|
||||
break;
|
||||
case BFNativeSDKMessage.HW_CHECK_VALID_FAILED:
|
||||
// Debug.Log(msgResult.body);
|
||||
BFMain.Instance.SDKMgr.BFHWPaySDKMgr.CheckStoreValidComplete(false);
|
||||
break;
|
||||
case BFNativeSDKMessage.HW_GET_PRODUCTS_SUCCESS:
|
||||
// Debug.Log(msgResult.body);
|
||||
BFMain.Instance.SDKMgr.BFHWPaySDKMgr.QueryProductComplete(true, msgResult.body);
|
||||
break;
|
||||
case BFNativeSDKMessage.HW_GET_PRODUCTS_FAILED:
|
||||
// Debug.Log(msgResult.body);
|
||||
BFMain.Instance.SDKMgr.BFHWPaySDKMgr.QueryProductComplete(false, msgResult.body);
|
||||
break;
|
||||
case BFNativeSDKMessage.HW_GET_PURCHASE_SUCCESS:
|
||||
// Debug.Log(msgResult.body);
|
||||
BFMain.Instance.SDKMgr.BFHWPaySDKMgr.QueryUncompleteOrderFinish(msgResult.body);
|
||||
break;
|
||||
case BFNativeSDKMessage.HW_GET_PURCHASE_FAILED:
|
||||
// Debug.Log(msgResult.body);
|
||||
BFMain.Instance.SDKMgr.BFHWPaySDKMgr.QueryUncompleteOrderFinish(msgResult.body);
|
||||
break;
|
||||
case BFNativeSDKMessage.HW_PURCHASE_SUCCESS:
|
||||
// Debug.Log(msgResult.body);
|
||||
BFMain.Instance.SDKMgr.BFHWPaySDKMgr.PayComplete(0, msgResult.body);
|
||||
break;
|
||||
case BFNativeSDKMessage.HW_PURCHASE_FAILED:
|
||||
// Debug.Log(msgResult.body);
|
||||
BFMain.Instance.SDKMgr.BFHWPaySDKMgr.PayComplete(1, msgResult.body);
|
||||
break;
|
||||
case BFNativeSDKMessage.HW_PURCHASE_CANCEL:
|
||||
// Debug.Log(msgResult.body);
|
||||
BFMain.Instance.SDKMgr.BFHWPaySDKMgr.PayComplete(2, msgResult.body);
|
||||
break;
|
||||
case BFNativeSDKMessage.HW_CONSUME_SUCCESS:
|
||||
// Debug.Log(msgResult.body);
|
||||
BFMain.Instance.SDKMgr.BFHWPaySDKMgr.ConsumeComplete(0);
|
||||
break;
|
||||
case BFNativeSDKMessage.HW_CONSUME_FAILED:
|
||||
// Debug.Log(msgResult.body);
|
||||
BFMain.Instance.SDKMgr.BFHWPaySDKMgr.ConsumeComplete(1);
|
||||
break;
|
||||
// 华为广告
|
||||
case BFNativeSDKMessage.HW_SHOWED_FULLSCREEN:
|
||||
// BFMain.Instance.SDKMgr.BFHWAdSDKMgr.ShowFullScreenAdFinish(0);
|
||||
break;
|
||||
case BFNativeSDKMessage.HW_FAILEDTO_SHOW_FULLSCREEN:
|
||||
// BFMain.Instance.SDKMgr.BFHWAdSDKMgr.ShowFullScreenAdFinish(1);
|
||||
break;
|
||||
case BFNativeSDKMessage.HW_LOADED:
|
||||
// BFMain.Instance.SDKMgr.BFHWAdSDKMgr.AdLoadedFinish(0);
|
||||
break;
|
||||
case BFNativeSDKMessage.HW_LOADED_FAILED:
|
||||
// BFMain.Instance.SDKMgr.BFHWAdSDKMgr.AdLoadedFinish(1);
|
||||
break;
|
||||
case BFNativeSDKMessage.HW_EARNED_REWARD:
|
||||
// BFMain.Instance.SDKMgr.BFHWAdSDKMgr.EarnedRewardFinish(0, msgResult.body);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
@ -20,12 +20,6 @@ namespace BF
|
||||
|
||||
void Start()
|
||||
{
|
||||
// 俄罗斯渠道不使用google
|
||||
if (BFPlatform.IsSupportRuPay())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Init();
|
||||
}
|
||||
|
||||
|
||||
@ -1,121 +0,0 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
namespace BF
|
||||
{
|
||||
public class BFRuPaySDKManager : MonoBehaviour
|
||||
{
|
||||
public Action<int, string> luaPayCallback;
|
||||
public Action<int, string> luaQueryProductCallback;
|
||||
public Action<int, string> luaQueryUncompleteOrderCallback;
|
||||
public Action<int> luaConsumeCallback;
|
||||
public bool StoreValid { get; private set; }
|
||||
private string ProductJson;
|
||||
|
||||
void Start()
|
||||
{
|
||||
// 俄罗斯渠道专用支付
|
||||
if (!BFPlatform.IsSupportRuPay())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// 临时屏蔽俄罗斯支付
|
||||
if (BFPlatform.Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RU)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Init();
|
||||
CheckStoreValid();
|
||||
}
|
||||
|
||||
// 初始化
|
||||
public void Init()
|
||||
{
|
||||
BFMain.Instance.SDKMgr.BFNativeSDKMgr.RuInit();
|
||||
}
|
||||
|
||||
// 检测支付可用性
|
||||
public void CheckStoreValid()
|
||||
{
|
||||
BFMain.Instance.SDKMgr.BFNativeSDKMgr.RuCheckValid();
|
||||
}
|
||||
|
||||
public void CheckStoreValidComplete(bool success)
|
||||
{
|
||||
StoreValid = success;
|
||||
}
|
||||
|
||||
// 请求全部商品信息
|
||||
public void QueryProductInfo(string productJson, Action<int, string> callback)
|
||||
{
|
||||
luaQueryProductCallback = callback;
|
||||
BFMain.Instance.SDKMgr.BFNativeSDKMgr.RuGetProducts(productJson, callback);
|
||||
}
|
||||
|
||||
public void QueryProductComplete(bool succ, string result)
|
||||
{
|
||||
int code = succ?0:1;
|
||||
if(luaQueryProductCallback != null)
|
||||
{
|
||||
Action<int, string> tempLuaQueryProductCallback = luaQueryProductCallback;
|
||||
luaQueryProductCallback = null;
|
||||
tempLuaQueryProductCallback(code, result);
|
||||
ProductJson = string.Empty;
|
||||
}
|
||||
}
|
||||
|
||||
// 支付
|
||||
public void Pay(string payType, string productId, string customMsg, Action<int, string> callback)
|
||||
{
|
||||
luaPayCallback = callback;
|
||||
BFMain.Instance.SDKMgr.BFNativeSDKMgr.RuPurchase(productId, customMsg);
|
||||
}
|
||||
|
||||
public void PayComplete(int code, string result)
|
||||
{
|
||||
// 优先当前支付的回调
|
||||
if(luaPayCallback != null)
|
||||
{
|
||||
luaPayCallback(code, result);
|
||||
luaPayCallback = null;
|
||||
}
|
||||
}
|
||||
|
||||
// 消耗
|
||||
public void ConsumePurchase(string token, Action<int> callback)
|
||||
{
|
||||
luaConsumeCallback = callback;
|
||||
BFMain.Instance.SDKMgr.BFNativeSDKMgr.RuConsume(token);
|
||||
}
|
||||
|
||||
public void ConsumeComplete(int code)
|
||||
{
|
||||
if (luaConsumeCallback != null)
|
||||
{
|
||||
luaConsumeCallback(code);
|
||||
luaConsumeCallback = null;
|
||||
}
|
||||
}
|
||||
|
||||
// 查询未完成订单
|
||||
public void QueryUncompleteOrder(Action<int, string> callback)
|
||||
{
|
||||
luaQueryUncompleteOrderCallback = callback;
|
||||
BFMain.Instance.SDKMgr.BFNativeSDKMgr.RuGetPurchase();
|
||||
}
|
||||
|
||||
public void QueryUncompleteOrderFinish(string result)
|
||||
{
|
||||
if(luaQueryUncompleteOrderCallback != null)
|
||||
{
|
||||
Action<int, string> tempLuaQueryUncompleteOrderCallback = luaQueryUncompleteOrderCallback;
|
||||
luaQueryUncompleteOrderCallback = null;
|
||||
tempLuaQueryUncompleteOrderCallback(0, result);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a060c3107f223a84ba065e7134d0aff8
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -2,6 +2,7 @@
|
||||
using UnityEngine;
|
||||
using BF.NativeCore.ThirdPlatform;
|
||||
using Newtonsoft.Json;
|
||||
using com.adjust.sdk;
|
||||
using AppsFlyerSDK;
|
||||
|
||||
namespace BF
|
||||
@ -10,6 +11,8 @@ namespace BF
|
||||
{
|
||||
private ThinkingAnalyticsSdk TASdk = new ThinkingAnalyticsSdk();
|
||||
private AppsFlyerSdk AFSdk = new AppsFlyerSdk();
|
||||
private bool isInitAFAdRevenue = false;
|
||||
|
||||
void Start()
|
||||
{
|
||||
Init();
|
||||
@ -29,9 +32,14 @@ namespace BF
|
||||
AFSdk.SetTaAccountId(id);
|
||||
}
|
||||
|
||||
public void CalibrateTime(long timestamp)
|
||||
public void InitAppsFlyerAdRevenue()
|
||||
{
|
||||
TASdk.CalibrateTime(timestamp);
|
||||
if (isInitAFAdRevenue)
|
||||
{
|
||||
return;
|
||||
}
|
||||
isInitAFAdRevenue = true;
|
||||
AppsFlyerAdRevenue.start();
|
||||
}
|
||||
|
||||
// 清除账户id
|
||||
@ -40,41 +48,6 @@ namespace BF
|
||||
TASdk.ClearAccountId();
|
||||
}
|
||||
|
||||
public string GetAFConversionData()
|
||||
{
|
||||
return AppsFlyerObjectScript.AFConversionData;
|
||||
}
|
||||
|
||||
public bool IsGetConversionDataOver()
|
||||
{
|
||||
return AppsFlyerObjectScript.IsGetConversionDataOver;
|
||||
}
|
||||
|
||||
public string GetAFAttributionData()
|
||||
{
|
||||
return AppsFlyerObjectScript.AFAttributionData;
|
||||
}
|
||||
|
||||
public bool IsGetAppOpenAttributionOver()
|
||||
{
|
||||
return AppsFlyerObjectScript.IsGetAppOpenAttributionOver;
|
||||
}
|
||||
|
||||
public bool IsGetAFOnRequestResponse()
|
||||
{
|
||||
return AppsFlyerObjectScript.IsGetAFOnRequestResponse;
|
||||
}
|
||||
|
||||
public int GetAFOnRequestResponseStatusCode()
|
||||
{
|
||||
return AppsFlyerObjectScript.AFOnRequestResponseStatusCode;
|
||||
}
|
||||
|
||||
public string GetAFOnRequestResponseErrorDescription()
|
||||
{
|
||||
return AppsFlyerObjectScript.AFOnRequestResponseErrorDescription;
|
||||
}
|
||||
|
||||
// 数数科技上报
|
||||
// lua端使用
|
||||
public void PostThinkingAnalyticsEvent(string eventName, string data = "")
|
||||
@ -129,12 +102,66 @@ namespace BF
|
||||
}
|
||||
}
|
||||
|
||||
// 设置账户id
|
||||
public void PostAdjustSimpleTrackEvent(string key)
|
||||
{
|
||||
AdjustEvent adjustEvent = new AdjustEvent(key);
|
||||
// BFLog.Log("PostAdjustSimpleTrackEvent");
|
||||
Adjust.trackEvent(adjustEvent);
|
||||
}
|
||||
|
||||
public void PostAdjustRevenueTrackEvent(string key, double currency, string currencyCode)
|
||||
{
|
||||
AdjustEvent adjustEvent = new AdjustEvent(key);
|
||||
adjustEvent.setRevenue(currency, currencyCode);
|
||||
// BFLog.Log("PostAdjustRevenueTrackEvent");
|
||||
Adjust.trackEvent(adjustEvent);
|
||||
}
|
||||
|
||||
public void PostAdjustCallbackTrackEvent(string key, string data = "")
|
||||
{
|
||||
var properties = JsonConvert.DeserializeObject<Dictionary<string, string>>(data);
|
||||
AdjustEvent adjustEvent = new AdjustEvent(key);
|
||||
foreach (var item in properties)
|
||||
{
|
||||
adjustEvent.addCallbackParameter(item.Key, item.Value);
|
||||
}
|
||||
// BFLog.Log("PostAdjustCallbackTrackEvent");
|
||||
Adjust.trackEvent(adjustEvent);
|
||||
}
|
||||
|
||||
public void PostAdjustPartnerTrackEvent(string key, string data = "")
|
||||
{
|
||||
var properties = JsonConvert.DeserializeObject<Dictionary<string, string>>(data);
|
||||
AdjustEvent adjustEvent = new AdjustEvent(key);
|
||||
foreach (var item in properties)
|
||||
{
|
||||
adjustEvent.addPartnerParameter(item.Key, item.Value);
|
||||
}
|
||||
// BFLog.Log("PostAdjustPartnerTrackEvent");
|
||||
Adjust.trackEvent(adjustEvent);
|
||||
}
|
||||
|
||||
public void PostAdjustAdRevenueAppLovinMAX(double revenue, string networkName, string adUnitIdentifier, string placement)
|
||||
{
|
||||
var adRevenue = new AdjustAdRevenue(AdjustConfig.AdjustAdRevenueSourceAppLovinMAX);
|
||||
adRevenue.setRevenue(revenue, "USD");
|
||||
adRevenue.setAdRevenueNetwork(networkName);
|
||||
adRevenue.setAdRevenueUnit(adUnitIdentifier);
|
||||
adRevenue.setAdRevenuePlacement(placement);
|
||||
Adjust.trackAdRevenue(adRevenue);
|
||||
}
|
||||
|
||||
public void AdjustSetDeviceToken(string token)
|
||||
{
|
||||
Adjust.setDeviceToken(token);
|
||||
}
|
||||
|
||||
public void LogAppsFlyerAdRevenue(int mediationNetwork, string monetizationNetwork, double eventRevenue, string data)
|
||||
{
|
||||
var properties = JsonConvert.DeserializeObject<Dictionary<string, string>>(data);
|
||||
var mediationNetworkType = (AppsFlyerSDK.MediationNetwork)mediationNetwork;
|
||||
var adRevenueData = new AFAdRevenueData(monetizationNetwork, mediationNetworkType, "USD", eventRevenue);
|
||||
AFSdk.LogAdRevenue(adRevenueData, properties);
|
||||
var mediationNetworkType = (AppsFlyerAdRevenueMediationNetworkType)mediationNetwork;
|
||||
AppsFlyerAdRevenue.logAdRevenue(monetizationNetwork, mediationNetworkType, eventRevenue, "USD", properties);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,83 +0,0 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using System.Runtime.InteropServices;
|
||||
namespace BF
|
||||
{
|
||||
public class BFUMPManager
|
||||
{
|
||||
#if UNITY_IOS
|
||||
#region GDPR
|
||||
[DllImport("__Internal")]
|
||||
private static extern void _MaxInitGDPR();
|
||||
|
||||
public static void InitGDPR()
|
||||
{
|
||||
_MaxInitGDPR();
|
||||
}
|
||||
|
||||
[DllImport("__Internal")]
|
||||
private static extern bool _MaxCheckIsGDPR();
|
||||
|
||||
public static bool IsPrivacyOptionsRequired()
|
||||
{
|
||||
return _MaxCheckIsGDPR();
|
||||
}
|
||||
|
||||
[DllImport("__Internal")]
|
||||
private static extern void _MaxShowGDRP();
|
||||
|
||||
public static void ShowPrivacyOptionsForm()
|
||||
{
|
||||
_MaxShowGDRP();
|
||||
}
|
||||
|
||||
[DllImport("__Internal")]
|
||||
private static extern bool _MaxCheckCanRequestAds();
|
||||
|
||||
public static bool CheckCanRequestAds()
|
||||
{
|
||||
return _MaxCheckCanRequestAds();
|
||||
}
|
||||
#endregion
|
||||
#endif
|
||||
public static Action luaCallback;
|
||||
public static bool IsUMPFinish = false;
|
||||
public static int UMPState = 0;
|
||||
public static void OnUMPFinish(int state)
|
||||
{
|
||||
UMPState = state;
|
||||
// 审核模式下,只有正常返回,lua 回调
|
||||
if (BFMain.IsShenhe)
|
||||
{
|
||||
if (state == BFNativeSDKMessage.UMP_REQUEST_CONSENT_ERROR || state == BFNativeSDKMessage.UMP_LOAD_AND_PRESENT_ERROR || state == BFNativeSDKMessage.UMP_SUCCESS_CALLBACK)
|
||||
{
|
||||
IsUMPFinish = true;
|
||||
if (luaCallback != null)
|
||||
{
|
||||
luaCallback();
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
IsUMPFinish = true;
|
||||
if (luaCallback != null)
|
||||
{
|
||||
luaCallback();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void AddLuaCallback(Action callback)
|
||||
{
|
||||
luaCallback = callback;
|
||||
}
|
||||
|
||||
public static void RemoveLuaCallback()
|
||||
{
|
||||
luaCallback = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: dcd13bfb23f7be948a1b084f3581e493
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 69c854ae7d148be429e876656d170acd
|
||||
guid: ced1766fcb78b314db1ae240a0e27a9f
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
@ -99,7 +99,6 @@ public class IAPManager : /* MonoBehaviour, */ IDetailedStoreListener {
|
||||
IAPDebug($"ID:{productId}.Not found or is not available for purchase");
|
||||
return false;
|
||||
}
|
||||
|
||||
_storeC.InitiatePurchase(productId, payload);
|
||||
return true;
|
||||
}
|
||||
@ -118,17 +117,17 @@ public class IAPManager : /* MonoBehaviour, */ IDetailedStoreListener {
|
||||
|
||||
//购买成功
|
||||
public PurchaseProcessingResult ProcessPurchase(PurchaseEventArgs e) {
|
||||
// #if UNITY_EDITOR
|
||||
// bool isValid = true;
|
||||
// #else
|
||||
// _localChecking (e.purchasedProduct, out bool isValid);
|
||||
// #endif
|
||||
// if (!isValid) buyCallback?.Invoke(false, e.purchasedProduct, "本地验证失败");
|
||||
// else {
|
||||
// _appsFlyerChecking(e.purchasedProduct);
|
||||
#if UNITY_EDITOR
|
||||
bool isValid = true;
|
||||
#else
|
||||
_localChecking (e.purchasedProduct, out bool isValid);
|
||||
#endif
|
||||
if (!isValid) buyCallback?.Invoke(false, e.purchasedProduct, "本地验证失败");
|
||||
else {
|
||||
_appsFlyerChecking(e.purchasedProduct);
|
||||
IAPDebug($"ID:{e.purchasedProduct.definition.id}. purchase success");
|
||||
buyCallback?.Invoke(true, e.purchasedProduct, string.Empty);
|
||||
// }
|
||||
}
|
||||
return PurchaseProcessingResult.Pending;
|
||||
}
|
||||
|
||||
@ -207,7 +206,6 @@ public class IAPManager : /* MonoBehaviour, */ IDetailedStoreListener {
|
||||
private void _appsFlyerChecking(Product product) {
|
||||
|
||||
IAPDebug($"CURRENCY:{product.metadata.isoCurrencyCode} REVENUE:{product.metadata.localizedPrice.ToString()} CONTENT_TYPE:{product.transactionID} CONTENT_ID:{product.definition.id}");
|
||||
|
||||
// Dictionary<string, string> da = new Dictionary<string, string> {
|
||||
// { AFInAppEventParameterName.CURRENCY, product.metadata.isoCurrencyCode },
|
||||
// { AFInAppEventParameterName.REVENUE, product.metadata.localizedPrice.ToString() },
|
||||
@ -221,7 +219,6 @@ public class IAPManager : /* MonoBehaviour, */ IDetailedStoreListener {
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region ================================================== 订阅 ==================================================
|
||||
|
||||
/// <summary>
|
||||
@ -324,20 +321,6 @@ public class IAPManager : /* MonoBehaviour, */ IDetailedStoreListener {
|
||||
// return "";
|
||||
}
|
||||
|
||||
//IOS专用 传入uuid类型的透传参数 用于校验订单
|
||||
public void SetApplicationUsername(string applicationUsername)
|
||||
{
|
||||
#if UNITY_IOS
|
||||
if (!IsInitialized()) {
|
||||
IAPDebug("SetApplicationUsername FAIL. Not init.");
|
||||
return;
|
||||
}
|
||||
|
||||
IAppleExtensions apple = _storeE.GetExtension<IAppleExtensions>();
|
||||
apple.SetApplicationUsername(applicationUsername);
|
||||
#endif
|
||||
}
|
||||
|
||||
#region ================================================== 原价 ==================================================
|
||||
|
||||
/// <summary>
|
||||
@ -396,29 +379,6 @@ public class IAPManager : /* MonoBehaviour, */ IDetailedStoreListener {
|
||||
return product.metadata.localizedPriceString;
|
||||
}
|
||||
|
||||
public string GetLocalizedIsoCurrencyCode(string productId)
|
||||
{
|
||||
if (!IsInitialized()) {
|
||||
IAPDebug($"ID:{productId}. Not init.");
|
||||
return "USD";
|
||||
};
|
||||
Product product = _storeC.products.WithID (productId);
|
||||
return product.metadata.isoCurrencyCode;
|
||||
}
|
||||
|
||||
public double GetLocalizedPriceAmount(string productId)
|
||||
{
|
||||
if (!IsInitialized())
|
||||
{
|
||||
IAPDebug($"ID:{productId}. Not init.");
|
||||
return 0.0;
|
||||
}
|
||||
;
|
||||
Product product = _storeC.products.WithID(productId);
|
||||
double price = Decimal.ToDouble(product.metadata.localizedPrice);
|
||||
return price;
|
||||
}
|
||||
|
||||
private void IAPDebug(string mes) {
|
||||
UnityEngine.Debug.Log($"IAPManager {mes}");
|
||||
}
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
using UnityEngine;
|
||||
#if UNITY_IOS && !UNITY_EDITOR
|
||||
using System;
|
||||
using System.Runtime.InteropServices;
|
||||
#endif
|
||||
|
||||
@ -107,15 +106,9 @@ namespace BF
|
||||
};
|
||||
}
|
||||
|
||||
[DllImport("__Internal")]
|
||||
private static extern IntPtr GetAllPossibleTimeZoneIdentifiers();
|
||||
|
||||
public static string GetTimeZone()
|
||||
{
|
||||
// return "Asia/Shanghai";
|
||||
IntPtr ptr = GetAllPossibleTimeZoneIdentifiers();
|
||||
string msg = Marshal.PtrToStringUTF8(ptr);
|
||||
return msg;
|
||||
return "Asia/Shanghai";
|
||||
}
|
||||
|
||||
[DllImport("__Internal")]
|
||||
|
||||
@ -21,11 +21,6 @@ namespace BF.NativeCore.ThirdPlatform
|
||||
AppsFlyer.sendEvent(eventName, properties);
|
||||
}
|
||||
|
||||
public void LogAdRevenue(AFAdRevenueData adRevenueData, Dictionary<string, string> additionalParameters)
|
||||
{
|
||||
AppsFlyer.logAdRevenue(adRevenueData, additionalParameters);
|
||||
}
|
||||
|
||||
public void SetTaAccountId(string accountId)
|
||||
{
|
||||
var customData = new Dictionary<string, string>();
|
||||
|
||||
@ -45,10 +45,5 @@ namespace BF.NativeCore.ThirdPlatform
|
||||
{
|
||||
return ThinkingAnalyticsAPI.GetDistinctId();
|
||||
}
|
||||
|
||||
public void CalibrateTime(long timestamp)
|
||||
{
|
||||
ThinkingAnalyticsAPI.CalibrateTime(timestamp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -11,6 +11,5 @@ namespace BF.NativeCore
|
||||
// QQ,
|
||||
// WeChat,
|
||||
Apple,
|
||||
VKID,
|
||||
}
|
||||
}
|
||||
@ -1,168 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
#if UNITY_ANDROID
|
||||
using Unity.Notifications.Android;
|
||||
#elif UNITY_IOS
|
||||
using Unity.Notifications.iOS;
|
||||
#endif
|
||||
|
||||
namespace BF
|
||||
{
|
||||
public class NotificationInfo
|
||||
{
|
||||
public string title;
|
||||
public string text;
|
||||
public int day;
|
||||
public int hour;
|
||||
public int minute;
|
||||
public int second;
|
||||
public bool repeat;
|
||||
}
|
||||
|
||||
public class NotificationSDKManager : MonoBehaviour
|
||||
{
|
||||
private int NotificationId = 1;
|
||||
private string NotificationTitle = "Daily surprise";
|
||||
private string NotificationContent = "Let your fingers dance with the music";
|
||||
private bool isOpenAppFromNotification = false;
|
||||
void Start()
|
||||
{
|
||||
Init();
|
||||
}
|
||||
|
||||
public void Init()
|
||||
{
|
||||
// 检查一下app是从推送点开还是正常打开的
|
||||
#if UNITY_ANDROID
|
||||
var notificationIntentData = AndroidNotificationCenter.GetLastNotificationIntent();
|
||||
if (notificationIntentData != null)
|
||||
{
|
||||
isOpenAppFromNotification = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
isOpenAppFromNotification = false;
|
||||
}
|
||||
#elif UNITY_IOS
|
||||
var notification = iOSNotificationCenter.GetLastRespondedNotification();
|
||||
if (notification != null)
|
||||
{
|
||||
isOpenAppFromNotification = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
isOpenAppFromNotification = false;
|
||||
}
|
||||
#else
|
||||
isOpenAppFromNotification = false;
|
||||
#endif
|
||||
}
|
||||
|
||||
public void InitPuchContent(string title, string content)
|
||||
{
|
||||
NotificationTitle = title;
|
||||
NotificationContent = content;
|
||||
}
|
||||
|
||||
//重置推送
|
||||
public void ResetNotificationChannel()
|
||||
{
|
||||
#if UNITY_ANDROID
|
||||
NotificationId = 1;
|
||||
AndroidNotificationCenter.CancelAllNotifications();//清除上次注册的通知
|
||||
var channel = new AndroidNotificationChannel()
|
||||
{
|
||||
Id = "channel_id",
|
||||
Name = "Default Channel",
|
||||
Importance = Importance.High,
|
||||
Description = "Generic notifications",
|
||||
CanShowBadge = false,
|
||||
EnableLights = true,
|
||||
LockScreenVisibility = LockScreenVisibility.Public
|
||||
};
|
||||
|
||||
AndroidNotificationCenter.RegisterNotificationChannel(channel);
|
||||
#elif UNITY_IOS
|
||||
NotificationId = 1;
|
||||
iOSNotificationCenter.ApplicationBadge = 0;
|
||||
iOSNotificationCenter.RemoveAllDeliveredNotifications();
|
||||
iOSNotificationCenter.RemoveAllScheduledNotifications();
|
||||
#endif
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 注册通知
|
||||
/// </summary>
|
||||
public void RegisterAndSendNotification(string title, string text, int day, int hour, int minute, int second, bool repeat)
|
||||
{
|
||||
var notificationInfo = new NotificationInfo()
|
||||
{
|
||||
title = title,
|
||||
text = text,
|
||||
day = day,
|
||||
hour = hour,
|
||||
minute = minute,
|
||||
second = second,
|
||||
repeat = repeat
|
||||
};
|
||||
SendNotification(notificationInfo);
|
||||
}
|
||||
|
||||
private void SendNotification(NotificationInfo notificationInfo)
|
||||
{
|
||||
#if UNITY_ANDROID
|
||||
var time = GetNotificationTime(notificationInfo);
|
||||
var notification = new AndroidNotification()
|
||||
{
|
||||
Title = notificationInfo.title,
|
||||
Text = notificationInfo.text,
|
||||
FireTime = time,
|
||||
};
|
||||
AndroidNotificationCenter.SendNotification(notification, "channel_id");
|
||||
#elif UNITY_IOS
|
||||
var time = GetNotificationTime(notificationInfo);
|
||||
var daySpan = new TimeSpan(notificationInfo.day, notificationInfo.hour, notificationInfo.minute, notificationInfo.second);
|
||||
var timeTrigger = new iOSNotificationTimeIntervalTrigger()
|
||||
{
|
||||
TimeInterval = daySpan,
|
||||
Repeats = notificationInfo.repeat
|
||||
};
|
||||
|
||||
var notification = new iOSNotification()
|
||||
{
|
||||
Identifier = "_notification_"+ NotificationId,
|
||||
Title = notificationInfo.title,
|
||||
Body = notificationInfo.text,
|
||||
Badge = 0,
|
||||
ShowInForeground = true,
|
||||
ForegroundPresentationOption = (PresentationOption.Alert | PresentationOption.Sound),
|
||||
CategoryIdentifier = "category_a",
|
||||
ThreadIdentifier = "thread1",
|
||||
Trigger = timeTrigger,
|
||||
};
|
||||
NotificationId++;
|
||||
iOSNotificationCenter.ScheduleNotification(notification);
|
||||
#endif
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 得到注册通知的时间
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public DateTime GetNotificationTime(NotificationInfo notificationInfo)
|
||||
{
|
||||
var daySpan = new TimeSpan(notificationInfo.day, notificationInfo.hour, notificationInfo.minute, notificationInfo.second);
|
||||
var dateTime = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second);
|
||||
dateTime += daySpan;
|
||||
// Debug.Log("GetNotificationTime 发出通知时间 : " + dateTime);
|
||||
return dateTime;
|
||||
}
|
||||
|
||||
public bool GetIsOpenAppFromNotification()
|
||||
{
|
||||
return isOpenAppFromNotification;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7fc2af03d1d06764db81724e32bcb026
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -33,24 +33,22 @@ namespace BF
|
||||
HttpManager.Instance.SetServerUrl("http://game.juzugame.com:1337/parse/");
|
||||
HttpManager.Instance.SetParseRevocableSession("1");
|
||||
HttpManager.Instance.SetParseApplicationId("1");
|
||||
HttpManager.Instance.SetParseClientKey("iQ8NRClxjSAVOc4p");
|
||||
HttpManager.Instance.SetParseClientKey("1kYT4UrExyQ0gaFh");
|
||||
#else
|
||||
HttpManager.Instance.SetServerUrl("https://b9.bigfoot-studio.link/parse/");
|
||||
HttpManager.Instance.SetParseRevocableSession("1");
|
||||
HttpManager.Instance.SetParseApplicationId("1");
|
||||
HttpManager.Instance.SetParseClientKey("iQ8NRClxjSAVOc4p");
|
||||
// HttpManager.Instance.SetServerUrl("https://b9.bigfoot-studio.link/parse/");
|
||||
// HttpManager.Instance.SetServerUrl("http://34.233.204.253:1337/parse/");
|
||||
// HttpManager.Instance.SetParseRevocableSession("1");
|
||||
// HttpManager.Instance.SetParseApplicationId("101");
|
||||
// HttpManager.Instance.SetParseClientKey("Xxl3j5TBIn4ArY1m");
|
||||
// HttpManager.Instance.SetParseApplicationId("1");
|
||||
// HttpManager.Instance.SetParseClientKey("1kYT4UrExyQ0gaFh");
|
||||
HttpManager.Instance.SetServerUrl("https://b2.bigfoot-studio.link/parse/");
|
||||
HttpManager.Instance.SetParseRevocableSession("1");
|
||||
HttpManager.Instance.SetParseApplicationId("101");
|
||||
HttpManager.Instance.SetParseClientKey("Xxl3j5TBIn4ArY1m");
|
||||
#endif
|
||||
}
|
||||
|
||||
public void SetServerUrl(string url, string parseClientPlatform, string parseClientVersion, string psarseRevocableSession = "1", string parseApplicationId = "1", string parseClientKey = "iQ8NRClxjSAVOc4p")
|
||||
public void SetServerUrl(string url, string psarseRevocableSession = "1", string parseApplicationId = "1", string parseClientKey = "1kYT4UrExyQ0gaFh")
|
||||
{
|
||||
HttpManager.Instance.SetServerUrl(url);
|
||||
HttpManager.Instance.SetParseClientPlatform(parseClientPlatform);
|
||||
HttpManager.Instance.SetParseClientVersion(parseClientVersion);
|
||||
HttpManager.Instance.SetParseRevocableSession(psarseRevocableSession);
|
||||
HttpManager.Instance.SetParseApplicationId(parseApplicationId);
|
||||
HttpManager.Instance.SetParseClientKey(parseClientKey);
|
||||
|
||||
@ -33,8 +33,6 @@ namespace Http
|
||||
internal string _parseRevocableSession = string.Empty;
|
||||
private string _parseApplicationId = string.Empty;
|
||||
private string _parseClientKey = string.Empty;
|
||||
private string _parseClientPlatform = string.Empty;
|
||||
private string _parseClientVersion = string.Empty;
|
||||
|
||||
#region set get
|
||||
|
||||
@ -43,8 +41,6 @@ namespace Http
|
||||
public void SetParseRevocableSession(string key) => _parseRevocableSession = key;
|
||||
public void SetParseApplicationId(string appId) => _parseApplicationId = appId;
|
||||
public void SetParseClientKey(string key) => _parseClientKey = key;
|
||||
public void SetParseClientPlatform(string key) => _parseClientPlatform = key;
|
||||
public void SetParseClientVersion(string key) => _parseClientVersion = key;
|
||||
|
||||
public SingleHttp Get(string id) => !_requests.TryGetValue(id, out var httpInfo) ? null : httpInfo.Http;
|
||||
|
||||
@ -61,10 +57,8 @@ namespace Http
|
||||
Complete = complete,
|
||||
});
|
||||
|
||||
http.AddHeader("X-Parse-Application-id", _parseApplicationId)
|
||||
.AddHeader("X-Parse-Client-Key", _parseClientKey)
|
||||
.AddHeader("platform", _parseClientPlatform)
|
||||
.AddHeader("version", _parseClientVersion);
|
||||
http.AddHeader("X-Parse-Application-Id", _parseApplicationId)
|
||||
.AddHeader("X-Parse-Client-Key", _parseClientKey);
|
||||
return http;
|
||||
}
|
||||
|
||||
@ -129,11 +123,8 @@ namespace Http
|
||||
}
|
||||
|
||||
public static void AddRevocableSession(this SingleHttp self)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(HttpManager.Instance._parseRevocableSession))
|
||||
{
|
||||
self.AddHeader("X-Parse-Revocable-Session", HttpManager.Instance._parseRevocableSession);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -9,7 +9,9 @@ namespace Http
|
||||
{
|
||||
Success,
|
||||
Aborted,
|
||||
Fail
|
||||
Fail,
|
||||
ConnectionTimedOut,
|
||||
TimedOut
|
||||
}
|
||||
|
||||
public class ResultInfo
|
||||
@ -46,7 +48,7 @@ namespace Http
|
||||
Type = HTTPMethods.Get;
|
||||
CustomTimeout = 100f;
|
||||
|
||||
_isKeepAlive = false;
|
||||
_isKeepAlive = true;
|
||||
_disableCache = true;
|
||||
_timeout = 60d;
|
||||
_connectTimeout = 20d;
|
||||
@ -204,10 +206,12 @@ namespace Http
|
||||
break;
|
||||
// 连接到服务器超时
|
||||
case HTTPRequestStates.ConnectionTimedOut:
|
||||
state = RequestState.ConnectionTimedOut;
|
||||
HttpDebug.LogError("Connection Timed Out!");
|
||||
break;
|
||||
// 请求没有在给定时间内完成
|
||||
case HTTPRequestStates.TimedOut:
|
||||
state = RequestState.TimedOut;
|
||||
HttpDebug.LogError("Processing the request Timed Out!");
|
||||
break;
|
||||
default:
|
||||
|
||||
@ -60,16 +60,11 @@ namespace BF
|
||||
//新版本登陆,支付,第三方辅助SDK
|
||||
public BFLoginSDKManager BFLoginSDKMgr { get; private set; }
|
||||
public BFPaySDKManager BFPaySDKMgr { get; private set; }
|
||||
public BFRuPaySDKManager BFRuPaySDKMgr { get; private set; }
|
||||
public BFHWPaySDKManager BFHWPaySDKMgr { get; private set; }
|
||||
public IAPManager IosPaySDKMgr { get; private set; }
|
||||
// public BFAdmobSDKManager BFAdmobSDKMgr { get; private set; }
|
||||
// public BFIronSourceSDKManager BFIronSourceSDKMgr { get; private set; }
|
||||
// public BFHWAdSDKManager BFHWAdSDKMgr { get; private set; }
|
||||
public BFIronSourceSDKManager BFIronSourceSDKMgr { get; private set; }
|
||||
public BFNativeSDKManager BFNativeSDKMgr { get; private set; }
|
||||
public BFThirdReportSDKManager BFThirdReportSDKMgr { get; private set; }
|
||||
public NotificationSDKManager NotificationSDKMgr { get; private set; }
|
||||
public DeepLinkManager DeepLinkMgr { get; private set; }
|
||||
|
||||
static SDKManager instance;
|
||||
public static SDKManager Create()
|
||||
@ -90,46 +85,20 @@ namespace BF
|
||||
{
|
||||
sdkGo = new GameObject("SDKManager");
|
||||
}
|
||||
// Deeplink
|
||||
DeepLinkMgr = sdkGo.AddComponent<DeepLinkManager>();
|
||||
// native交互管理,需要最先初始化，其他地方可能要调用此类里面的方法
|
||||
BFNativeSDKMgr = sdkGo.AddComponent<BFNativeSDKManager>();
|
||||
// 登陆
|
||||
BFLoginSDKMgr = sdkGo.AddComponent<BFLoginSDKManager>();
|
||||
// 支付
|
||||
BFPaySDKMgr = sdkGo.AddComponent<BFPaySDKManager>();
|
||||
BFRuPaySDKMgr = sdkGo.AddComponent<BFRuPaySDKManager>();
|
||||
BFHWPaySDKMgr = sdkGo.AddComponent<BFHWPaySDKManager>();
|
||||
// 广告
|
||||
// BFAdmobSDKMgr = sdkGo.AddComponent<BFAdmobSDKManager>();
|
||||
// BFIronSourceSDKMgr = sdkGo.AddComponent<BFIronSourceSDKManager>();
|
||||
BFIronSourceSDKMgr = sdkGo.AddComponent<BFIronSourceSDKManager>();
|
||||
// 三方上报
|
||||
BFThirdReportSDKMgr = sdkGo.AddComponent<BFThirdReportSDKManager>();
|
||||
// native交互管理
|
||||
BFNativeSDKMgr = sdkGo.AddComponent<BFNativeSDKManager>();
|
||||
IosPaySDKMgr = IAPManager.Instance;
|
||||
// MAX SDK安卓在这里主动初始化，IOS版会在ATT弹窗后初始化
|
||||
#if UNITY_ANDROID && !UNITY_EDITOR
|
||||
AdManager.Instance.Init();
|
||||
#endif
|
||||
// 华为广告
|
||||
// BFHWAdSDKMgr = sdkGo.AddComponent<BFHWAdSDKManager>();
|
||||
// 本地推送
|
||||
// NotificationSDKMgr = sdkGo.AddComponent<NotificationSDKManager>();
|
||||
|
||||
GameObject.DontDestroyOnLoad(sdkGo);
|
||||
|
||||
#if UNITY_IOS || UNITY_IPHONE
|
||||
// BFUMPManager.InitGDPR();
|
||||
// 这里不显示GDPR就直接显示ATT，如果GDPR要显示，则这里不要同时显示ATT，ATT会在GDPR显示后处理
|
||||
// 这里延迟一帧处理是因为启动后会同时显示多个权限弹窗，包括，网络，推送，还有ATT，这种情况下ATT可能会不显示，到下一次启动才显示,这种情况下也可能会导致苹果拒审
|
||||
BFMain.Instance.OneShotManager.AddOneShot(()=>{
|
||||
BFMain.Instance.GameLaunchMgr.ShowIOSATTrack();
|
||||
});
|
||||
#elif UNITY_ANDROID && !UNITY_EDITOR
|
||||
// if (BFPlatform.IsSupportGDPR())
|
||||
// {
|
||||
// BFMain.Instance.SDKMgr.BFNativeSDKMgr.InitGDPR();
|
||||
// }
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
public override void Destroy()
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a6f25d3b88a875d46b7f988da3389135
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,49 +0,0 @@
|
||||
using UnityEngine;
|
||||
using UnityEngine.Rendering.Universal;
|
||||
|
||||
namespace BF
|
||||
{
|
||||
public class URPManager : ManagerBase
|
||||
{
|
||||
static URPManager instance;
|
||||
public static URPManager Create()
|
||||
{
|
||||
BFLog.LogAssert(instance == null, "This method only allows BFMain to call once");
|
||||
instance = new URPManager();
|
||||
return instance;
|
||||
}
|
||||
URPManager() { }
|
||||
|
||||
public override void Init()
|
||||
{
|
||||
base.Init();
|
||||
}
|
||||
|
||||
public override void Destroy()
|
||||
{
|
||||
base.Destroy();
|
||||
instance = null;
|
||||
}
|
||||
|
||||
// URP新增叠加相机
|
||||
public void URPAddAdditionalCamera(Camera mainCamera, Camera additionalCamera)
|
||||
{
|
||||
var cameraData = mainCamera.GetUniversalAdditionalCameraData();
|
||||
cameraData.cameraStack.Add(additionalCamera);
|
||||
}
|
||||
|
||||
// URP移除叠加相机
|
||||
public void URPRemoveAdditionalCamera(Camera mainCamera, Camera additionalCamera)
|
||||
{
|
||||
var cameraData = mainCamera.GetUniversalAdditionalCameraData();
|
||||
cameraData.cameraStack.Remove(additionalCamera);
|
||||
}
|
||||
|
||||
// URP清空叠加相机
|
||||
public void URPClearAdditionalCamera(Camera mainCamera)
|
||||
{
|
||||
var cameraData = mainCamera.GetUniversalAdditionalCameraData();
|
||||
cameraData.cameraStack.Clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d61530ea6b2712f48b8130c89cee839b
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,53 +0,0 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
namespace BF
|
||||
{
|
||||
public class BattleControlBg : MonoBehaviour
|
||||
{
|
||||
public float speed = 0.0f;
|
||||
public float endX = 0.0f;
|
||||
public float resetX = 0.0f;
|
||||
public int type = 0;
|
||||
public bool canMove = true;
|
||||
|
||||
public void SetPositionByTime(float time)
|
||||
{
|
||||
var transformRect = GetComponent<RectTransform>();
|
||||
transformRect.anchoredPosition = new Vector2(transformRect.anchoredPosition.x + speed * time, transformRect.anchoredPosition.y);
|
||||
}
|
||||
|
||||
void FixedUpdate()
|
||||
{
|
||||
if (!canMove) return;
|
||||
var transformRect = GetComponent<RectTransform>();
|
||||
if (transformRect.anchoredPosition.x <= endX)
|
||||
{
|
||||
transformRect.anchoredPosition = new Vector2(resetX, transformRect.anchoredPosition.y);
|
||||
}
|
||||
// if (type == 1)
|
||||
// {
|
||||
// speed = BF.BFMain.Instance.BattleMgr.SceneSpeedC;
|
||||
// }
|
||||
// else if (type == 2)
|
||||
// {
|
||||
// speed = BF.BFMain.Instance.BattleMgr.SceneSpeedM;
|
||||
// }
|
||||
// else if (type == 3)
|
||||
// {
|
||||
// speed = BF.BFMain.Instance.BattleMgr.SceneSpeedF;
|
||||
// }
|
||||
// else if (type == 4)
|
||||
// {
|
||||
// speed = BF.BFMain.Instance.BattleMgr.SceneSpeedCould;
|
||||
// }
|
||||
// else if (type == 5)
|
||||
// {
|
||||
// speed = BF.BFMain.Instance.BattleMgr.SceneSpeedBg;
|
||||
// }
|
||||
// transform.Translate(speed * Time.fixedDeltaTime, 0.0f, 0.0f);
|
||||
transformRect.anchoredPosition = new Vector2(transformRect.anchoredPosition.x + speed * Time.fixedDeltaTime, transformRect.anchoredPosition.y);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1025633752bc248dc9665067e756f919
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,113 +0,0 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
namespace BF
|
||||
{
|
||||
public class DrawBezierLine : MonoBehaviour
|
||||
{
|
||||
public LineRenderer lineRender;
|
||||
private Vector3 _startPoint = Vector3.zero;
|
||||
private Vector3 _endPoint = Vector3.zero;
|
||||
private Vector3 _controlPoint1 = Vector3.zero;
|
||||
private Vector3 _controlPoint2 = Vector3.zero;
|
||||
// 曲线上的路径点数量，值越大，取得的路径点越多，曲线越平滑
|
||||
private int drawPointCount = 30;
|
||||
private bool isDraw = false;
|
||||
private bool useCubicBezier = true;
|
||||
public void SetStartPoint(float x, float y, float z)
|
||||
{
|
||||
_startPoint = new Vector3(x, y, z);
|
||||
}
|
||||
|
||||
public void SetEndPoint(float x, float y, float z)
|
||||
{
|
||||
_endPoint = new Vector3(x, y, z);
|
||||
}
|
||||
|
||||
public void SetControlPoint1(float x, float y, float z)
|
||||
{
|
||||
_controlPoint1 = new Vector3(x, y, z);
|
||||
}
|
||||
|
||||
public void SetControlPoint2(float x, float y, float z)
|
||||
{
|
||||
_controlPoint2 = new Vector3(x, y, z);
|
||||
}
|
||||
|
||||
public void SetDrawPointCount(int count)
|
||||
{
|
||||
drawPointCount = count;
|
||||
}
|
||||
|
||||
public void DrawLine()
|
||||
{
|
||||
isDraw = true;
|
||||
}
|
||||
|
||||
public void ClearLine()
|
||||
{
|
||||
isDraw = false;
|
||||
lineRender.positionCount = 0;
|
||||
}
|
||||
|
||||
public Vector3[] GetPathList()
|
||||
{
|
||||
Vector3[] positions = new Vector3[lineRender.positionCount];
|
||||
lineRender.GetPositions(positions);
|
||||
return positions;
|
||||
}
|
||||
|
||||
public void SetUseCubicBezier(bool use)
|
||||
{
|
||||
useCubicBezier = use;
|
||||
}
|
||||
|
||||
void Update()
|
||||
{
|
||||
if (!isDraw)
|
||||
{
|
||||
return;
|
||||
}
|
||||
isDraw = false;
|
||||
if (drawPointCount <= 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
lineRender.positionCount = drawPointCount;
|
||||
lineRender.SetPosition(0, _startPoint);
|
||||
for (int i = 1; i < drawPointCount; i++)
|
||||
{
|
||||
var t = (i + 1) / (float)drawPointCount;
|
||||
if (useCubicBezier)
|
||||
{
|
||||
var pathPoint = GetPointInCubicBezierCurve(t, _startPoint, _controlPoint1, _controlPoint2, _endPoint);//使用贝塞尔曲线的公式取得t时的路径点
|
||||
lineRender.SetPosition(i, pathPoint);
|
||||
}
|
||||
else
|
||||
{
|
||||
var pathPoint = GetBezierPoint(t, _startPoint, _controlPoint1, _endPoint);//使用贝塞尔曲线的公式取得t时的路径点
|
||||
lineRender.SetPosition(i, pathPoint);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <param name="t">0到1的值，0获取曲线的起点，1获得曲线的终点</param>
|
||||
/// <param name="start">曲线的起始位置</param>
|
||||
/// <param name="center">决定曲线形状的控制点</param>
|
||||
/// <param name="end">曲线的终点</param>
|
||||
public static Vector3 GetBezierPoint(float t, Vector3 start, Vector3 controlPoint, Vector3 end)
|
||||
{
|
||||
return (1 - t) * (1 - t) * start + 2 * t * (1 - t) * controlPoint + t * t * end;
|
||||
}
|
||||
|
||||
public Vector3 GetPointInCubicBezierCurve(float t, Vector3 startPoint, Vector3 controlPoint1, Vector3 controlPoint2, Vector3 endPoint)
|
||||
{
|
||||
var A = startPoint * (Mathf.Pow(-t, 3) + 3 * Mathf.Pow(t, 2) - 3 * t + 1);
|
||||
var B = controlPoint1 * (3 * Mathf.Pow(t, 3) - 6 * Mathf.Pow(t, 2) + 3 * t);
|
||||
var C = controlPoint2 * (-3 * Mathf.Pow(t, 3) + 3 * Mathf.Pow(t, 2));
|
||||
var D = endPoint * (Mathf.Pow(t, 3));
|
||||
return A + B + C + D;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9f27b020f0d68e14788bcde278e4add4
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,82 +0,0 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using System;
|
||||
|
||||
namespace BF
|
||||
{
|
||||
public class DreamlandInstancingHelper : MonoBehaviour
|
||||
{
|
||||
Action luaUpdateAction;
|
||||
MaterialPropertyBlock block;
|
||||
MeshFilter meshFilter;
|
||||
List<Matrix4x4> materixList = new List<Matrix4x4>();
|
||||
List<Vector4> lightmapOffsetList = new List<Vector4>();
|
||||
|
||||
void Awake()
|
||||
{
|
||||
block = new MaterialPropertyBlock();
|
||||
}
|
||||
|
||||
public void SetLuaUpdateAction(Action updateAction)
|
||||
{
|
||||
luaUpdateAction = updateAction;
|
||||
}
|
||||
|
||||
public void ClearLuaUpdateAction()
|
||||
{
|
||||
luaUpdateAction = null;
|
||||
}
|
||||
|
||||
public MaterialPropertyBlock GetMaterialPorpertyBlock()
|
||||
{
|
||||
return block;
|
||||
}
|
||||
|
||||
public MeshFilter GetMeshFilter()
|
||||
{
|
||||
meshFilter = GetComponentInChildren<MeshFilter>();
|
||||
return meshFilter;
|
||||
}
|
||||
|
||||
public Vector4[] CollectLightmapOffsetArray()
|
||||
{
|
||||
lightmapOffsetList.Clear();
|
||||
var meshRenderers = GetComponentsInChildren<MeshRenderer>();
|
||||
foreach (var mr in meshRenderers)
|
||||
{
|
||||
lightmapOffsetList.Add(mr.lightmapScaleOffset);
|
||||
}
|
||||
return lightmapOffsetList.ToArray();
|
||||
}
|
||||
|
||||
public List<Matrix4x4> CollectMaterixList()
|
||||
{
|
||||
materixList.Clear();
|
||||
var meshRenderers = GetComponentsInChildren<MeshRenderer>();
|
||||
foreach (var mr in meshRenderers)
|
||||
{
|
||||
materixList.Add(mr.localToWorldMatrix);
|
||||
}
|
||||
return materixList;
|
||||
}
|
||||
|
||||
public void HideChild()
|
||||
{
|
||||
for (var i = 0; i < transform.childCount; i++)
|
||||
{
|
||||
transform.GetChild(i).gameObject.SetActive(false);
|
||||
}
|
||||
}
|
||||
|
||||
void Update()
|
||||
{
|
||||
luaUpdateAction?.Invoke();
|
||||
}
|
||||
|
||||
public static bool GetSupportInstancing()
|
||||
{
|
||||
return SystemInfo.supportsInstancing;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 95f27acf2ce774f32b4d9c7ca29c2b70
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,46 +0,0 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using TMPro;
|
||||
|
||||
namespace BF
|
||||
{
|
||||
[System.Serializable]
|
||||
public struct GlobalInfo
|
||||
{
|
||||
public TextMeshProUGUI tx;
|
||||
public string key;
|
||||
}
|
||||
[ExecuteInEditMode]
|
||||
[DisallowMultipleComponent]
|
||||
public class GlobalHelper : MonoBehaviour
|
||||
{
|
||||
public List<GlobalInfo> globalInfoList = new List<GlobalInfo>();
|
||||
public int GetListCount()
|
||||
{
|
||||
return globalInfoList.Count;
|
||||
}
|
||||
public string GetGlobalByIndex(int index)
|
||||
{
|
||||
if (index >= 0 && index < globalInfoList.Count)
|
||||
{
|
||||
return globalInfoList[index].key;
|
||||
}
|
||||
return "";
|
||||
}
|
||||
public void SetText(int index, string v)
|
||||
{
|
||||
if (index >= 0 && index < globalInfoList.Count)
|
||||
{
|
||||
globalInfoList[index].tx.text = v;
|
||||
}
|
||||
}
|
||||
|
||||
void OnDestroy()
|
||||
{
|
||||
globalInfoList.Clear();
|
||||
globalInfoList = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a9961f2693c0ea344aa81949924f05b7
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -103,45 +103,6 @@ namespace BF
|
||||
}
|
||||
}
|
||||
|
||||
public void SetPositionX(int index, float x)
|
||||
{
|
||||
if (index >= 0 && index < prefabList.Count)
|
||||
{
|
||||
var childTransform = prefabList[index].gameObject.transform;
|
||||
childTransform.position = new Vector3(x, childTransform.position.y, childTransform.position.z);
|
||||
}
|
||||
else if (index < 0)
|
||||
{
|
||||
this.transform.position = new Vector3(x, this.transform.position.y, this.transform.position.z);
|
||||
}
|
||||
}
|
||||
|
||||
public void SetPositionY(int index, float y)
|
||||
{
|
||||
if (index >= 0 && index < prefabList.Count)
|
||||
{
|
||||
var childTransform = prefabList[index].gameObject.transform;
|
||||
childTransform.position = new Vector3(childTransform.position.x, y, childTransform.position.z);
|
||||
}
|
||||
else if (index < 0)
|
||||
{
|
||||
this.transform.position = new Vector3(this.transform.position.x, y, this.transform.position.z);
|
||||
}
|
||||
}
|
||||
|
||||
public void SetPositionZ(int index, float z)
|
||||
{
|
||||
if (index >= 0 && index < prefabList.Count)
|
||||
{
|
||||
var childTransform = prefabList[index].gameObject.transform;
|
||||
childTransform.position = new Vector3(childTransform.position.x, childTransform.position.y, z);
|
||||
}
|
||||
else if (index < 0)
|
||||
{
|
||||
this.transform.position = new Vector3(this.transform.position.x, this.transform.position.y, z);
|
||||
}
|
||||
}
|
||||
|
||||
public void CacheLocalEulerAngles(int index)
|
||||
{
|
||||
if (index >= 0 && index < prefabList.Count)
|
||||
@ -171,33 +132,6 @@ namespace BF
|
||||
}
|
||||
}
|
||||
|
||||
public float GetLocalEulerAnglesZ(int index)
|
||||
{
|
||||
if (index >= 0 && index < prefabList.Count)
|
||||
{
|
||||
var localEulerAngles = prefabList[index].gameObject.transform.localEulerAngles;
|
||||
return localEulerAngles.z;
|
||||
}
|
||||
else if (index < 0)
|
||||
{
|
||||
return this.transform.localEulerAngles.z;
|
||||
}
|
||||
return 0.0f;
|
||||
}
|
||||
|
||||
public void SetLocalEulerAnglesZ(int index, float z)
|
||||
{
|
||||
if (index >= 0 && index < prefabList.Count)
|
||||
{
|
||||
var localEulerAngles = prefabList[index].gameObject.transform.localEulerAngles;
|
||||
prefabList[index].gameObject.transform.localEulerAngles = new Vector3(localEulerAngles.x, localEulerAngles.y, z);
|
||||
}
|
||||
else if (index < 0)
|
||||
{
|
||||
this.transform.localEulerAngles = new Vector3(this.transform.localEulerAngles.x, this.transform.localEulerAngles.y, z);
|
||||
}
|
||||
}
|
||||
|
||||
public void SetLocalScale(int index, float x, float y, float z)
|
||||
{
|
||||
if (index >= 0 && index < prefabList.Count)
|
||||
|
||||
@ -28,8 +28,6 @@ namespace BF
|
||||
[DisallowMultipleComponent]
|
||||
public class PrefabHelper : MonoBehaviour
|
||||
{
|
||||
[SerializeField]
|
||||
public List<UnityEngine.GameObject> lis_AddObject = new List<UnityEngine.GameObject>();
|
||||
public List<GameObjectInfo> prefabList = new List<GameObjectInfo>();
|
||||
public float PositionX { get; private set; }
|
||||
public float PositionY { get; private set; }
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: cbd97f50181e3ba4aa76780bbbce0d79
|
||||
guid: d9473cad853ffbc4284abb0e064c52d6
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
@ -1,176 +0,0 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
namespace BF
|
||||
{
|
||||
[ExecuteInEditMode]
|
||||
[DisallowMultipleComponent]
|
||||
public class WeaponHelper : MonoBehaviour
|
||||
{
|
||||
public GameObject modelObject;
|
||||
public List<CharacterObjectInfo> objectList = new List<CharacterObjectInfo>();
|
||||
public List<CharacterAnimationInfo> animationList = new List<CharacterAnimationInfo>();
|
||||
|
||||
public float PositionX { get; private set; }
|
||||
public float PositionY { get; private set; }
|
||||
public float PositionZ { get; private set; }
|
||||
|
||||
public GameObject GetModelObject()
|
||||
{
|
||||
return modelObject;
|
||||
}
|
||||
|
||||
public int GetModelHashCode()
|
||||
{
|
||||
return gameObject.GetHashCode();
|
||||
}
|
||||
|
||||
public int GetListCount()
|
||||
{
|
||||
return objectList.Count;
|
||||
}
|
||||
|
||||
public GameObject GetGameObjectByIndex(int index)
|
||||
{
|
||||
if (index >= 0 && index < objectList.Count)
|
||||
{
|
||||
return objectList[index].gameObject;
|
||||
}
|
||||
else if (index < 0)
|
||||
{
|
||||
return this.gameObject;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public uint GetHashNameByIndex(int index)
|
||||
{
|
||||
if (index >= 0 && index < objectList.Count)
|
||||
{
|
||||
return objectList[index].hashName;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Lua层可以使用PositionX，PositionY，PositionZ，减少直接传递localPosition的开销
|
||||
public void CacheLocalPosition(int index)
|
||||
{
|
||||
if (index >= 0 && index < objectList.Count)
|
||||
{
|
||||
var localPosition = objectList[index].gameObject.transform.localPosition;
|
||||
PositionX = localPosition.x;
|
||||
PositionY = localPosition.y;
|
||||
PositionZ = localPosition.z;
|
||||
}
|
||||
else if (index < 0)
|
||||
{
|
||||
PositionX = this.transform.localPosition.x;
|
||||
PositionY = this.transform.localPosition.y;
|
||||
PositionZ = this.transform.localPosition.z;
|
||||
}
|
||||
}
|
||||
|
||||
public void SetLocalPosition(int index, float x, float y, float z)
|
||||
{
|
||||
if (index >= 0 && index < objectList.Count)
|
||||
{
|
||||
objectList[index].gameObject.transform.localPosition = new Vector3(x, y, z);
|
||||
}
|
||||
else if (index < 0)
|
||||
{
|
||||
this.transform.localPosition = new Vector3(x, y, z);
|
||||
}
|
||||
}
|
||||
// Lua层可以使用PositionX，PositionY，PositionZ，减少直接传递position的开销
|
||||
public void CachePosition(int index)
|
||||
{
|
||||
if (index >= 0 && index < objectList.Count)
|
||||
{
|
||||
var position = objectList[index].gameObject.transform.position;
|
||||
PositionX = position.x;
|
||||
PositionY = position.y;
|
||||
PositionZ = position.z;
|
||||
}
|
||||
else if (index < 0)
|
||||
{
|
||||
PositionX = this.transform.position.x;
|
||||
PositionY = this.transform.position.y;
|
||||
PositionZ = this.transform.position.z;
|
||||
}
|
||||
}
|
||||
|
||||
public void SetPosition(int index, float x, float y, float z)
|
||||
{
|
||||
if (index >= 0 && index < objectList.Count)
|
||||
{
|
||||
objectList[index].gameObject.transform.position = new Vector3(x, y, z);
|
||||
}
|
||||
else if (index < 0)
|
||||
{
|
||||
this.transform.position = new Vector3(x, y, z);
|
||||
}
|
||||
}
|
||||
|
||||
public void SetLocalEulerAngles(int index, float x, float y, float z)
|
||||
{
|
||||
if (index >= 0 && index < objectList.Count)
|
||||
{
|
||||
objectList[index].gameObject.transform.localEulerAngles = new Vector3(x, y, z);
|
||||
}
|
||||
else if (index < 0)
|
||||
{
|
||||
this.transform.localEulerAngles = new Vector3(x, y, z);
|
||||
}
|
||||
}
|
||||
|
||||
public void SetLocalScale(int index, float x, float y, float z)
|
||||
{
|
||||
if (index >= 0 && index < objectList.Count)
|
||||
{
|
||||
objectList[index].gameObject.transform.localScale = new Vector3(x, y, z);
|
||||
}
|
||||
else if (index < 0)
|
||||
{
|
||||
this.transform.localScale = new Vector3(x, y, z);
|
||||
}
|
||||
}
|
||||
|
||||
public void SetMainModelLocalPosition(float x, float y, float z)
|
||||
{
|
||||
modelObject.transform.localPosition = new Vector3(x, y, z);
|
||||
}
|
||||
|
||||
public float GetStateTime(uint index)
|
||||
{
|
||||
int count = animationList.Count;
|
||||
for(int i = 0; i < count; i++)
|
||||
{
|
||||
if(animationList[i].hashName == index)
|
||||
{
|
||||
return animationList[i].animationTime;
|
||||
}
|
||||
}
|
||||
return 0.0f;
|
||||
}
|
||||
|
||||
public uint GetStateKeyFrame(uint hashName, int index)
|
||||
{
|
||||
int count = animationList.Count;
|
||||
CharacterAnimationInfo characterAnimationInfo;
|
||||
for(int i = 0; i < count; i++)
|
||||
{
|
||||
characterAnimationInfo = animationList[i];
|
||||
if(characterAnimationInfo.hashName == hashName)
|
||||
{
|
||||
if(characterAnimationInfo.keyFrame != null && characterAnimationInfo.keyFrame.Count > index)
|
||||
{
|
||||
return characterAnimationInfo.keyFrame[index];
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 20f2cf41ce575154699359cdd2465af7
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -138,7 +138,7 @@ namespace BF
|
||||
{
|
||||
if (size > 0)
|
||||
{
|
||||
rect.anchoredPosition = new Vector2(rect.anchoredPosition.x, - pos - size / 2 * rect.localScale.y);
|
||||
rect.anchoredPosition = new Vector2(rect.anchoredPosition.x, - pos - size / 2);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -12,7 +12,6 @@ namespace BF
|
||||
public int downRecoveryOffset;
|
||||
public BFUIDirection direction;
|
||||
public bool reverse = false;
|
||||
public bool centerWhenNotFull = false; // 新增参数，控制是否在不满一行时居中
|
||||
|
||||
Stack<BFCell> cellPool = new Stack<BFCell>();
|
||||
List<BFCell> activeCells = new List<BFCell>();
|
||||
@ -130,6 +129,7 @@ namespace BF
|
||||
float maxHeight = Mathf.Max(UnityScrollRect.viewport.rect.height, maxLine*cellHeight + topRecoveryOffset + downRecoveryOffset);
|
||||
ContentTrans.sizeDelta = new Vector2(ContentTrans.sizeDelta.x, maxHeight);
|
||||
// cellWidth = (int)UnityScrollRect.viewport.rect.width;
|
||||
|
||||
if (reverse)
|
||||
{
|
||||
float posY = UnityScrollRect.content.anchoredPosition.y;
|
||||
@ -179,7 +179,6 @@ namespace BF
|
||||
// maxIdx = Mathf.Min(this.totalCount, maxIdx);
|
||||
// BFLog.LogDebug(BFLog.DEBUG_GAME_LAUNCH, "red", " ContentTrans.sizeDelta.x = " + ContentTrans.sizeDelta.x);
|
||||
// BFLog.LogDebug(BFLog.DEBUG_GAME_LAUNCH, "red", " ContentTrans.sizeDelta.y = " + ContentTrans.sizeDelta.y);
|
||||
UpdateAllCellPosition();
|
||||
}
|
||||
|
||||
public override void RefreshAll()
|
||||
@ -389,29 +388,20 @@ namespace BF
|
||||
{
|
||||
float posX = 0.0f;
|
||||
if (direction == BFUIDirection.Vertical)
|
||||
{
|
||||
if (centerWhenNotFull && totalCount < perLineNum)
|
||||
{
|
||||
float totalWidth = totalCount * cellWidth;
|
||||
float startPos = (UnityScrollRect.viewport.rect.width - totalWidth) / 2;
|
||||
float idx = (index - 1.0f) % perLineNum + 1.0f;
|
||||
posX = startPos + (idx - 0.5f) * cellWidth;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (reverse)
|
||||
{
|
||||
float cellWidth1 = UnityScrollRect.viewport.rect.width / perLineNum;
|
||||
float idx = (index - 1.0f) % perLineNum + 1.0f;
|
||||
float cellWidth1 = UnityScrollRect.viewport.rect.width/perLineNum;
|
||||
float idx = (index - 1.0f)%perLineNum + 1.0f;
|
||||
posX = (idx - 0.5f) * cellWidth1;
|
||||
}
|
||||
else
|
||||
{
|
||||
float cellWidth1 = UnityScrollRect.viewport.rect.width / perLineNum;
|
||||
float idx = (index - 1.0f) % perLineNum + 1.0f;
|
||||
float cellWidth1 = UnityScrollRect.viewport.rect.width/perLineNum;
|
||||
float idx = (index - 1.0f)%perLineNum + 1.0f;
|
||||
posX = (idx - 0.5f) * cellWidth1;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -447,54 +437,20 @@ namespace BF
|
||||
}
|
||||
else
|
||||
{
|
||||
if (centerWhenNotFull && totalCount < perLineNum)
|
||||
{
|
||||
// 在ContentTrans高度范围内居中
|
||||
float totalHeight = totalCount * cellHeight;
|
||||
float contentOffset = (ContentTrans.rect.height - totalHeight) / 2;
|
||||
|
||||
// 元素在ContentTrans内垂直居中
|
||||
float idx = (index - 1.0f) % perLineNum + 1.0f;
|
||||
if (reverse)
|
||||
{
|
||||
posY = -(contentOffset + (idx - 0.5f) * cellHeight);
|
||||
}
|
||||
else
|
||||
{
|
||||
posY = contentOffset + (idx - 0.5f) * cellHeight;
|
||||
}
|
||||
|
||||
// 如果ContentTrans比viewport矮，调整全局居中
|
||||
if (ContentTrans.rect.height < UnityScrollRect.viewport.rect.height)
|
||||
{
|
||||
float viewportOffset = (UnityScrollRect.viewport.rect.height - ContentTrans.rect.height) / 2;
|
||||
if (reverse)
|
||||
{
|
||||
posY -= viewportOffset; // 抵消视口偏移
|
||||
}
|
||||
else
|
||||
{
|
||||
posY += viewportOffset; // 抵消视口偏移
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (reverse)
|
||||
{
|
||||
float cellHeight1 = UnityScrollRect.viewport.rect.height / perLineNum;
|
||||
float offset = UnityScrollRect.viewport.rect.height / perLineNum / 2.0f;
|
||||
float idx = (index - 1.0f) % perLineNum + 1.0f;
|
||||
posY = -(offset + (idx - 1.0f) * cellHeight1);
|
||||
float cellHeight1 = UnityScrollRect.viewport.rect.height/perLineNum;
|
||||
float offset = UnityScrollRect.viewport.rect.height/perLineNum/2.0f;
|
||||
float idx = (index - 1.0f)%perLineNum + 1.0f;
|
||||
posY = -(offset + (idx - 1.0f)*cellHeight1);
|
||||
// BFLog.LogDebug(BFLog.DEBUG_GAME_LAUNCH, "red", "index = " + index + " posY = " + posY + " offset = " + offset);
|
||||
}
|
||||
else
|
||||
{
|
||||
float cellHeight1 = UnityScrollRect.viewport.rect.height / perLineNum;
|
||||
float offset = UnityScrollRect.viewport.rect.height - UnityScrollRect.viewport.rect.height / perLineNum / 2.0f;
|
||||
float idx = (index - 1.0f) % perLineNum + 1.0f;
|
||||
posY = offset - (idx - 1.0f) * cellHeight1;
|
||||
}
|
||||
float cellHeight1 = UnityScrollRect.viewport.rect.height/perLineNum;
|
||||
float offset = UnityScrollRect.viewport.rect.height - UnityScrollRect.viewport.rect.height/perLineNum/2.0f;
|
||||
float idx = (index - 1.0f)%perLineNum + 1.0f;
|
||||
posY = offset - (idx - 1.0f)*cellHeight1;
|
||||
}
|
||||
}
|
||||
|
||||
@ -643,7 +599,7 @@ namespace BF
|
||||
{
|
||||
UnityScrollRect.StopMovement();
|
||||
}
|
||||
[ContextMenu("UpdateAllCellPosition")]
|
||||
|
||||
public void UpdateAllCellPosition()
|
||||
{
|
||||
for (int i = 0; i < activeCells.Count; i++)
|
||||
|
||||
@ -10,7 +10,7 @@ using XLua.Cast;
|
||||
public class UIOutlineEffect : BaseMeshEffect
|
||||
{
|
||||
[SerializeField]
|
||||
private Color outlineColor = Color.black;
|
||||
private Color outlineColor = Color.white;
|
||||
|
||||
public Color OutlineColor
|
||||
{
|
||||
@ -27,6 +27,11 @@ public class UIOutlineEffect : BaseMeshEffect
|
||||
base.Awake();
|
||||
if (base.graphic)
|
||||
{
|
||||
if (base.graphic.material == null || base.graphic.material.shader.name != "BF/UI/TEXT_OUTLINE")
|
||||
{
|
||||
BF.BFLog.Log("uitext没有设置对应描边材质");
|
||||
}
|
||||
|
||||
if (base.graphic.canvas)
|
||||
{
|
||||
var shaderChannelOrigin = base.graphic.canvas.additionalShaderChannels;
|
||||
@ -62,6 +67,18 @@ public class UIOutlineEffect : BaseMeshEffect
|
||||
base.graphic.SetVerticesDirty();
|
||||
}
|
||||
}
|
||||
#if UNITY_EDITOR
|
||||
protected override void OnValidate()
|
||||
{
|
||||
base.OnValidate();
|
||||
if (base.graphic.material.shader.name != "BF/UI/TEXT_OUTLINE")
|
||||
{
|
||||
base.graphic.material =
|
||||
AssetDatabase.LoadAssetAtPath<Material>("assets/arts/materials/ui/ui_text_outline.mat");
|
||||
}
|
||||
base.graphic.SetVerticesDirty();
|
||||
}
|
||||
#endif
|
||||
|
||||
public override void ModifyMesh(VertexHelper vh)
|
||||
{
|
||||
@ -112,6 +129,7 @@ public class UIOutlineEffect : BaseMeshEffect
|
||||
//uv框
|
||||
var uvOriginMin = Min(v1.uv0, v2.uv0, v3.uv0);
|
||||
var uvOriginMax = Max(v1.uv0, v2.uv0, v3.uv0);
|
||||
|
||||
var color_rg = new Vector2(outlineColor.r, outlineColor.g);
|
||||
var color_ba = new Vector4(0 ,0 , outlineColor.b, outlineColor.a);
|
||||
var normal = new Vector3(0, 0, OutlineWidth);
|
||||
@ -180,4 +198,5 @@ public class UIOutlineEffect : BaseMeshEffect
|
||||
{
|
||||
return new Vector2(Max(a.x, b.x, c.x), Max(a.y, b.y, c.y));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
namespace BF
|
||||
{
|
||||
public partial class BFPlatform
|
||||
{
|
||||
public const string ANDROID_GP_PACKAGE_NAME = "com.gearpaw.defenders.td.game";
|
||||
public const string ANDROID_GP_PACKAGE_NAME_GLOBAL = "com.fortune.td.game.global";
|
||||
public const string ANDROID_GP_PACKAGE_NAME_RU = "com.gearpaw.defenders.td.game.ru";
|
||||
public const string ANDROID_GP_PACKAGE_NAME_RUSTORE = "com.fortune.td.game.rustore";
|
||||
public const string ANDROID_GP_PACKAGE_NAME_RU_HW = "com.fortune.td.game.ru.hw";
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 94aec8a10f4fce041a3f1a94ab8079db
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -64,9 +64,22 @@ namespace BF
|
||||
|
||||
public partial class BFPlatform
|
||||
{
|
||||
const String LoginCenterURLDev = "https://entrance.wdd817.link";
|
||||
const String LoginCenterURL = "https://entrance.wdd817.link";
|
||||
const String LoginCenterURLRU = "https://entrance.wdd817.link";
|
||||
const String LoginCenterURL = "https://entrance.bigfoot-studio.link";
|
||||
static Dictionary<string, string> BFLoginCenterURLDict = new Dictionary<string, string>()
|
||||
{
|
||||
// dev
|
||||
{"com.juzu.b6.dev", "http://game.juzugame.com:3000"},
|
||||
{"com.juzu.b6.dev.android", "http://game.juzugame.com:3000"},
|
||||
{"com.juzu.b6.dev.ios", "http://game.juzugame.com:3000"},
|
||||
|
||||
// release
|
||||
{"com.juzu.b6.release.android", "http://game.juzugame.com:3000"},
|
||||
{"com.juzu.b6.release.ios", "http://game.juzugame.com:3000"},
|
||||
|
||||
// gp
|
||||
{"com.combo.heroes.puzzle.rpg", "https://entrance.bigfoot-studio.link"},
|
||||
};
|
||||
|
||||
//combine url解析的数据
|
||||
static ClusterType clusterType;
|
||||
|
||||
@ -99,6 +112,109 @@ namespace BF
|
||||
//登陆中心返回的信息齐全且格式正常
|
||||
static bool isLoginCenterConfigValid;//请求的域名信息是否正确
|
||||
|
||||
/// <summary>
|
||||
/// 解析json数据 获取cluter,gate,chat,vsn,pay的地址
|
||||
/// </summary>
|
||||
/// <param name="json"></param>
|
||||
public static void InitUrlsFromLoginCenter(string json)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(json))
|
||||
{
|
||||
CombineURL urls = JsonUtility.FromJson<CombineURL>(json);
|
||||
|
||||
BFLog.Log("C#解析后的urls:" + urls.ToString());
|
||||
|
||||
clusterType = (ClusterType)urls.cluster_type;
|
||||
string tmpGateUrl = urls.ugate_addr;
|
||||
string tmpChatUrl = urls.uchat_addr;
|
||||
string tmpVsnUrl = urls.vsn_addr;
|
||||
string tmpPayUrl = urls.upay_addr;
|
||||
string tmpCommunityWebUrl = urls.community_web_addr;
|
||||
string tmpCommunitySrvUrl = urls.community_srv_addr;
|
||||
string tmpAicsHttpUrl = urls.aics_http_addr;
|
||||
string tmpAicsWebSocketUrl = urls.aics_ws_addr;
|
||||
|
||||
bool clusterValid = clusterType != ClusterType.None;
|
||||
bool gateValid = !string.IsNullOrEmpty(tmpGateUrl);
|
||||
bool chatValid = !string.IsNullOrEmpty(tmpChatUrl);
|
||||
bool vsnValid = !string.IsNullOrEmpty(tmpVsnUrl);
|
||||
bool payValid = !string.IsNullOrEmpty(tmpPayUrl);
|
||||
bool communityWebValid = !string.IsNullOrEmpty(tmpCommunityWebUrl);
|
||||
bool communitySrvValid = !string.IsNullOrEmpty(tmpCommunitySrvUrl);
|
||||
bool aicsHttpValid = !string.IsNullOrEmpty(tmpAicsHttpUrl);
|
||||
bool aicsWebSocketValid = !string.IsNullOrEmpty(tmpAicsWebSocketUrl);
|
||||
|
||||
BFLog.Log(string.Format("check valid clusterValid:{0} gateValid:{1} chatValid:{2} vsnValid:{3} payValid:{4} communityWebValid:{5} communitySrvValid:{6} aicsHttpValid:{7} aicsWebSocketValid:{8}", clusterValid, gateValid, chatValid, vsnValid, payValid, communityWebValid, communitySrvValid, aicsHttpValid, aicsWebSocketValid));
|
||||
|
||||
//判断参数是否正常
|
||||
if (clusterValid && gateValid && chatValid && vsnValid && payValid)
|
||||
{
|
||||
if (IsPublishChannel()) // 正式渠道不验证社区与客服地址
|
||||
{
|
||||
SetLoginCenterConfigValid(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (communityWebValid && communitySrvValid && aicsHttpValid && aicsWebSocketValid)
|
||||
{
|
||||
SetLoginCenterConfigValid(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
SetLoginCenterConfigValid(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
SetLoginCenterConfigValid(false);
|
||||
}
|
||||
|
||||
//拆分域名url与port
|
||||
int gatePortIndex = tmpGateUrl.LastIndexOf(':');
|
||||
int chatPortIndex = tmpChatUrl.LastIndexOf(':');
|
||||
int vsnPortIndex = tmpVsnUrl.LastIndexOf(':');
|
||||
|
||||
string gatePortStr = tmpGateUrl.Substring(gatePortIndex + 1, tmpGateUrl.Length - gatePortIndex - 1);
|
||||
string chatPortStr = tmpChatUrl.Substring(chatPortIndex + 1, tmpChatUrl.Length - chatPortIndex - 1);
|
||||
string vsnPortStr = tmpVsnUrl.Substring(vsnPortIndex + 1, tmpVsnUrl.Length - vsnPortIndex - 1);
|
||||
|
||||
int gatePort = 0;
|
||||
int chatPort = 0;
|
||||
int vsnPort = 0;
|
||||
int.TryParse(gatePortStr, out gatePort);
|
||||
int.TryParse(chatPortStr, out chatPort);
|
||||
int.TryParse(vsnPortStr, out vsnPort);
|
||||
|
||||
string tmpGateUrlWithoutPort = tmpGateUrl.Substring(0, gatePortIndex);
|
||||
string tmpChatUrlWithoutPort = tmpChatUrl.Substring(0, chatPortIndex);
|
||||
string tmpVsnUrlWithoutPort = tmpVsnUrl.Substring(0, vsnPortIndex);
|
||||
|
||||
mainGateUrl = tmpGateUrlWithoutPort;
|
||||
mainGatePort = gatePort;
|
||||
chatGateUrl = tmpChatUrlWithoutPort;
|
||||
chatGatePort = chatPort;
|
||||
vsnHttpUrl = tmpVsnUrlWithoutPort;
|
||||
vsnHttpPort = vsnPort;
|
||||
|
||||
//暂时保留原格式
|
||||
_channelGate = new BFGateInfo(mainGateUrl, mainGatePort, chatGateUrl, chatGatePort);
|
||||
_vsnUrl = new BFHttpsInfo(vsnHttpUrl, vsnHttpPort);
|
||||
|
||||
payUrl = tmpPayUrl;
|
||||
communityWebUrl = tmpCommunityWebUrl;
|
||||
communitySrvUrl = tmpCommunitySrvUrl;
|
||||
aicsHttpUrl = tmpAicsHttpUrl;
|
||||
aicsWebSocketUrl = tmpAicsWebSocketUrl;
|
||||
|
||||
BFLog.Log("解析后的地址 gate:{0} gatePort:{1} chat:{2} chatPort:{3} vsn:{4} vsnPort:{5} payUrl:{6} communityWebUrl:{7} communitySrvUrl:{8} aicsHttpUrl:{9} aicsWebSocketUrl:{10}", mainGateUrl, gatePort, chatGateUrl, chatPort, vsnHttpUrl, vsnPort, payUrl, communityWebUrl, communitySrvUrl, aicsHttpUrl, aicsWebSocketUrl);
|
||||
}
|
||||
else
|
||||
{
|
||||
BFLog.LogError("GetUrlsFromLoginCenter Error,JSON is null or empty");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获得集群类型 (1-普通,2-审核,3-测试)
|
||||
/// </summary>
|
||||
@ -139,117 +255,31 @@ namespace BF
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 是否是内网渠道
|
||||
/// </summary>
|
||||
public static bool IsDevChannel()
|
||||
{
|
||||
return Identifier == "com.juzu.b6.dev" ||
|
||||
Identifier == "com.juzu.b6.dev.android" ||
|
||||
Identifier == "com.juzu.b6.dev.ios";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 是否是外网测试渠道
|
||||
/// </summary>
|
||||
public static bool IsReleaseChannel()
|
||||
{
|
||||
return Identifier == "com.juzu.b6.release.android" ||
|
||||
Identifier == "com.juzu.b6.release.ios";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 是否是正式发布渠道
|
||||
/// </summary>
|
||||
public static bool IsPublishChannel()
|
||||
{
|
||||
#if UNITY_EDITOR || BF_APP_DEV || BF_APP_TEST
|
||||
return false;
|
||||
#else
|
||||
if (Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME ||
|
||||
Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_GLOBAL ||
|
||||
Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RUSTORE ||
|
||||
Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RU_HW ||
|
||||
Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RU)
|
||||
{
|
||||
// 深度链接可以强制改为内网环境
|
||||
if (BFMain.DPIsLan)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
public static bool IsRuPackage()
|
||||
{
|
||||
if (Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RU || Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RUSTORE || Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RU_HW)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 是否使用ru支付
|
||||
/// </summary>
|
||||
public static bool IsSupportRuPay()
|
||||
{
|
||||
#if BF_APP_DEV || BF_APP_TEST
|
||||
return false;
|
||||
#else
|
||||
if (Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RU || Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RUSTORE || Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RU_HW)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 是否使用ru商店好评
|
||||
/// </summary>
|
||||
public static bool IsSupportRuStoreReview()
|
||||
{
|
||||
#if BF_APP_DEV || BF_APP_TEST
|
||||
return false;
|
||||
#else
|
||||
if (Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RU || Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RUSTORE || Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RU_HW)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
// 这是Facebook SDK
|
||||
public static bool IsSupportFB()
|
||||
{
|
||||
#if BF_APP_DEV || BF_APP_TEST
|
||||
return true;
|
||||
#else
|
||||
if (Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RU || Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RUSTORE || Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RU_HW)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
#endif
|
||||
}
|
||||
|
||||
public static bool IsSupportGDPR()
|
||||
{
|
||||
#if BF_APP_DEV || BF_APP_TEST
|
||||
return true;
|
||||
#else
|
||||
if (Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RU || Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RUSTORE || Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RU_HW)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
#endif
|
||||
}
|
||||
// 这是Facebook广告SDK
|
||||
|
||||
public static bool IsSupportFBAD()
|
||||
{
|
||||
if (Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RU || Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RUSTORE || Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RU_HW)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public static bool IsSupportVK()
|
||||
{
|
||||
if (Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RU || Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RUSTORE || Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RU_HW)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
return !IsDevChannel() && !IsReleaseChannel();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@ -315,19 +345,11 @@ namespace BF
|
||||
|
||||
public static string GetLoginCenterURL()
|
||||
{
|
||||
#if BF_APP_DEV || UNITY_EDITOR
|
||||
return LoginCenterURLDev;
|
||||
#else
|
||||
if (BFMain.DPIsLan)
|
||||
if (BFLoginCenterURLDict.TryGetValue(Identifier, out string url))
|
||||
{
|
||||
return LoginCenterURLDev;
|
||||
}
|
||||
if (IsRuPackage())
|
||||
{
|
||||
return LoginCenterURLRU;
|
||||
return url;
|
||||
}
|
||||
return LoginCenterURL;
|
||||
#endif
|
||||
}
|
||||
|
||||
public static string GetPayCenterURL()
|
||||
@ -361,22 +383,5 @@ namespace BF
|
||||
{
|
||||
return aicsWebSocketUrl;
|
||||
}
|
||||
//region 华为支付
|
||||
/// <summary>
|
||||
/// 是否使用hw支付
|
||||
/// </summary>
|
||||
public static bool IsSupportHWPay()
|
||||
{
|
||||
#if BF_APP_DEV || BF_APP_TEST
|
||||
return false;
|
||||
#else
|
||||
if (Identifier == BFPlatform.ANDROID_GP_PACKAGE_NAME_RU_HW)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
//regionend
|
||||
}
|
||||
}
|
||||
@ -42,14 +42,14 @@ namespace BF
|
||||
// 渠道对应的语言配置
|
||||
public static Dictionary<string, BFLanguageInfo> languageInfos = new Dictionary<string, BFLanguageInfo>()
|
||||
{
|
||||
{"com.juzu.b13.dev", new BFLanguageInfo(new List<string>{"en", "cn", "zh", "th", "ru", "id", "vi"})},
|
||||
{"com.juzu.b13.dev.android", new BFLanguageInfo(new List<string>{"en", "cn", "zh", "th", "ru", "id", "vi"})},
|
||||
{"com.juzu.b13.dev.ios", new BFLanguageInfo(new List<string>{"en", "cn"})},
|
||||
{"com.juzu.b13.release.android", new BFLanguageInfo(new List<string>{"en"})},
|
||||
{"com.juzu.b13.release.ios", new BFLanguageInfo(new List<string>{"en"})},
|
||||
{"com.gearpaw.defenders.td.game", new BFLanguageInfo(new List<string>{"en", "cn", "zh", "th", "ru", "id", "vi"})},
|
||||
{"com.gearpaw.defenders.td.game.ru", new BFLanguageInfo(new List<string>{"en", "cn", "zh", "th", "ru", "id", "vi"})},
|
||||
{"com.juzu.b13.ios", new BFLanguageInfo(new List<string>{"en"})},
|
||||
{"com.juzu.b6.dev", new BFLanguageInfo(new List<string>{"en", "cn", "zh", "th", "ru", "id", "vi"})},
|
||||
{"com.juzu.b6.dev.android", new BFLanguageInfo(new List<string>{"en", "cn", "zh", "th", "ru", "id", "vi"})},
|
||||
{"com.juzu.b6.dev.ios", new BFLanguageInfo(new List<string>{"en", "cn"})},
|
||||
{"com.juzu.b6.release.android", new BFLanguageInfo(new List<string>{"en"})},
|
||||
{"com.juzu.b6.release.ios", new BFLanguageInfo(new List<string>{"en"})},
|
||||
// 这个是gp渠道
|
||||
{"com.combo.heroes.puzzle.rpg", new BFLanguageInfo(new List<string>{"en", "cn", "zh", "th", "ru", "id", "vi"})},
|
||||
{"com.juzu.b6.ios", new BFLanguageInfo(new List<string>{"en"})},
|
||||
};
|
||||
|
||||
public static BFLanguageInfo GetLanguageInfo(string identifier)
|
||||
|
||||
@ -37,20 +37,6 @@ namespace BF
|
||||
public const bool SKIP_VERSION = false;
|
||||
#endif
|
||||
|
||||
#if BF_APP_DEV
|
||||
public const bool BF_APP_DEV = true;
|
||||
public const bool BF_APP_TEST = false;
|
||||
public const bool BF_APP_PUBLISH = false;
|
||||
#elif BF_APP_TEST
|
||||
public const bool BF_APP_DEV = false;
|
||||
public const bool BF_APP_TEST = true;
|
||||
public const bool BF_APP_PUBLISH = false;
|
||||
#else
|
||||
public const bool BF_APP_DEV = false;
|
||||
public const bool BF_APP_TEST = false;
|
||||
public const bool BF_APP_PUBLISH = true;
|
||||
#endif
|
||||
|
||||
public static char[] C_FREE_CHAR = new char[16] {
|
||||
(char)('g' ^ (0x29 - 0)),
|
||||
(char)('w' ^ (0x29 - 1)),
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
using System;
|
||||
|
||||
namespace BF
|
||||
{
|
||||
public static class TimeHelper
|
||||
{
|
||||
public static long GetDayBeginTimestamp(long timestamp, int timeZoneOffset)
|
||||
{
|
||||
// 将时间戳转换为UTC时间
|
||||
DateTime utcTime = DateTimeOffset.FromUnixTimeSeconds(timestamp).UtcDateTime;
|
||||
// 应用时区偏移（不考虑夏令时）
|
||||
if (timeZoneOffset != 0)
|
||||
{
|
||||
utcTime = utcTime.AddHours(timeZoneOffset);
|
||||
}
|
||||
// 构造当天0点的UTC时间
|
||||
DateTime utcDayBegin = new DateTime(utcTime.Year, utcTime.Month, utcTime.Day, 0, 0, 0, DateTimeKind.Utc);
|
||||
// 减去时区偏移量恢复UTC时间
|
||||
if (timeZoneOffset != 0)
|
||||
{
|
||||
utcDayBegin = utcDayBegin.AddHours(-timeZoneOffset);
|
||||
}
|
||||
// 转换为时间戳并减去时区偏移
|
||||
long utcDayBeginTimestamp = new DateTimeOffset(utcDayBegin).ToUnixTimeSeconds();
|
||||
return utcDayBeginTimestamp;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c322159b684af9d4eb38fbfe9b9ed89a
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -22,8 +22,6 @@ namespace BF
|
||||
|
||||
private static bool c_free_flag = false;
|
||||
private static bool c_config_flag = false;
|
||||
private static string DefaultSpecialPatternStr = "[【】\\[\\]\\^*×―%＠@＃#$…&￥=<>《》:：•`·~；;\\\\/\'\"{}‘’“”]";
|
||||
public static string CustomSpecialPatternStr = "[【】\\[\\]\\^*×―%＠@＃#$…&￥=<>《》:：•`·~；;\\\\/\'\"{}‘’“”]";
|
||||
|
||||
public static char[] GetFreeChar()
|
||||
{
|
||||
@ -100,15 +98,6 @@ namespace BF
|
||||
return lp;
|
||||
}
|
||||
|
||||
public static Vector3 LocalPointInRectangleToWorld(RectTransform rt, float planeZ, Camera uiCam, Camera main)
|
||||
{
|
||||
var screenPoint = uiCam.WorldToScreenPoint(rt.transform.position);
|
||||
Vector3 position = new Vector3(screenPoint.x, screenPoint.y, 0);
|
||||
Vector3 result = main.ScreenToWorldPoint(position);
|
||||
result.z = planeZ;
|
||||
return result;
|
||||
}
|
||||
|
||||
public static bool RectangleContainsScreenPoint(RectTransform rt, float x, float y, Camera cam)
|
||||
{
|
||||
return RectTransformUtility.RectangleContainsScreenPoint(rt, new Vector2(x, y), cam);
|
||||
@ -282,22 +271,5 @@ namespace BF
|
||||
};
|
||||
return Convert.ToBase64String(sha1);
|
||||
}
|
||||
|
||||
public static bool IsSpecialChar(string str, bool useDefaultPattern)
|
||||
{
|
||||
Regex regExp;
|
||||
if (useDefaultPattern)
|
||||
{
|
||||
regExp = new Regex(DefaultSpecialPatternStr);
|
||||
}
|
||||
else
|
||||
{
|
||||
regExp = new Regex(CustomSpecialPatternStr);
|
||||
}
|
||||
if(regExp.IsMatch(str)){
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
71
Assets/ThirdParty/AppsFlyer/AFAdRevenueData.cs
vendored
71
Assets/ThirdParty/AppsFlyer/AFAdRevenueData.cs
vendored
@ -1,71 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace AppsFlyerSDK
|
||||
{
|
||||
public enum MediationNetwork : ulong
|
||||
{
|
||||
GoogleAdMob = 1,
|
||||
IronSource = 2,
|
||||
ApplovinMax = 3,
|
||||
Fyber = 4,
|
||||
Appodeal = 5,
|
||||
Admost = 6,
|
||||
Topon = 7,
|
||||
Tradplus = 8,
|
||||
Yandex = 9,
|
||||
ChartBoost = 10,
|
||||
Unity = 11,
|
||||
ToponPte = 12,
|
||||
Custom = 13,
|
||||
DirectMonetization = 14
|
||||
}
|
||||
|
||||
public static class AdRevenueScheme
|
||||
{
|
||||
/**
|
||||
* code ISO 3166-1 format
|
||||
*/
|
||||
public const string COUNTRY = "country";
|
||||
|
||||
/**
|
||||
* ID of the ad unit for the impression
|
||||
*/
|
||||
public const string AD_UNIT = "ad_unit";
|
||||
|
||||
/**
|
||||
* Format of the ad
|
||||
*/
|
||||
public const string AD_TYPE = "ad_type";
|
||||
|
||||
/**
|
||||
* ID of the ad placement for the impression
|
||||
*/
|
||||
public const string PLACEMENT = "placement";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
// Data class representing ad revenue information.
|
||||
//
|
||||
// @property monetizationNetwork The name of the network that monetized the ad.
|
||||
// @property mediationNetwork An instance of MediationNetwork representing the mediation service used.
|
||||
// @property currencyIso4217Code The ISO 4217 currency code describing the currency of the revenue.
|
||||
// @property eventRevenue The amount of revenue generated by the ad.
|
||||
/// </summary>
|
||||
public class AFAdRevenueData
|
||||
{
|
||||
public string monetizationNetwork { get; private set; }
|
||||
public MediationNetwork mediationNetwork { get; private set; }
|
||||
public string currencyIso4217Code { get; private set; }
|
||||
public double eventRevenue { get; private set; }
|
||||
|
||||
public AFAdRevenueData(string monetization, MediationNetwork mediation, string currency, double revenue)
|
||||
{
|
||||
monetizationNetwork = monetization;
|
||||
mediationNetwork = mediation;
|
||||
currencyIso4217Code = currency;
|
||||
eventRevenue = revenue;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 49e1906ae949e4bfea400bd1da9f7e39
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
34
Assets/ThirdParty/AppsFlyer/AFAdRevenueEvent.cs
vendored
Normal file
34
Assets/ThirdParty/AppsFlyer/AFAdRevenueEvent.cs
vendored
Normal file
@ -0,0 +1,34 @@
|
||||
using System.Collections;
|
||||
using UnityEngine;
|
||||
|
||||
public class AFAdRevenueEvent {
|
||||
|
||||
/**
|
||||
*Pre-defined keys for non-mandatory dictionary
|
||||
*Code ISO 3166-1 format
|
||||
**/
|
||||
public const string COUNTRY = "country";
|
||||
|
||||
/**
|
||||
*ID of the ad unit for the impression
|
||||
**/
|
||||
public const string AD_UNIT = "ad_unit";
|
||||
|
||||
/**
|
||||
*Format of the ad
|
||||
**/
|
||||
public const string AD_TYPE = "ad_type";
|
||||
|
||||
/**
|
||||
*ID of the ad placement for the impression
|
||||
**/
|
||||
public const string PLACEMENT = "placement";
|
||||
|
||||
/**
|
||||
*Provided by Facebook Audience Network only, and will be reported to publishers
|
||||
*approved by Facebook Audience Network within the closed beta
|
||||
**/
|
||||
public const string ECPM_PAYLOAD = "ecpm_payload";
|
||||
|
||||
|
||||
}
|
||||
11
Assets/ThirdParty/AppsFlyer/AFAdRevenueEvent.cs.meta
vendored
Normal file
11
Assets/ThirdParty/AppsFlyer/AFAdRevenueEvent.cs.meta
vendored
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 597a8e5b837f64353b0aa9af2fe9aa84
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,35 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace AppsFlyerSDK
|
||||
{
|
||||
public enum AFPurchaseType
|
||||
{
|
||||
Subscription = 0,
|
||||
OneTimePurchase = 1
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
//
|
||||
/// </summary>
|
||||
public class AFPurchaseDetailsAndroid
|
||||
|
||||
{
|
||||
public AFPurchaseType purchaseType { get; private set; }
|
||||
public string purchaseToken { get; private set; }
|
||||
public string productId { get; private set; }
|
||||
public string price { get; private set; }
|
||||
public string currency { get; private set; }
|
||||
|
||||
public AFPurchaseDetailsAndroid(AFPurchaseType type, String purchaseToken, String productId, String price, String currency)
|
||||
{
|
||||
this.purchaseType = type;
|
||||
this.purchaseToken = purchaseToken;
|
||||
this.productId = productId;
|
||||
this.price = price;
|
||||
this.currency = currency;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d71b3864006f94ac08938b2ebdc940bc
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,30 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace AppsFlyerSDK
|
||||
{
|
||||
/// <summary>
|
||||
//
|
||||
/// </summary>
|
||||
public class AFSDKPurchaseDetailsIOS
|
||||
{
|
||||
public string productId { get; private set; }
|
||||
public string price { get; private set; }
|
||||
public string currency { get; private set; }
|
||||
public string transactionId { get; private set; }
|
||||
|
||||
private AFSDKPurchaseDetailsIOS(string productId, string price, string currency, string transactionId)
|
||||
{
|
||||
this.productId = productId;
|
||||
this.price = price;
|
||||
this.currency = currency;
|
||||
this.transactionId = transactionId;
|
||||
}
|
||||
|
||||
public static AFSDKPurchaseDetailsIOS Init(string productId, string price, string currency, string transactionId)
|
||||
{
|
||||
return new AFSDKPurchaseDetailsIOS(productId, price, currency, transactionId);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 44bb6c4472701416080eb050732075ea
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,38 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace AppsFlyerSDK
|
||||
{
|
||||
public enum AFSDKValidateAndLogStatus
|
||||
{
|
||||
AFSDKValidateAndLogStatusSuccess,
|
||||
AFSDKValidateAndLogStatusFailure,
|
||||
AFSDKValidateAndLogStatusError
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
//
|
||||
/// </summary>
|
||||
public class AFSDKValidateAndLogResult
|
||||
{
|
||||
public AFSDKValidateAndLogStatus status { get; private set; }
|
||||
public Dictionary<string, object> result { get; private set; }
|
||||
public Dictionary<string, object> errorData { get; private set; }
|
||||
public string error { get; private set; }
|
||||
|
||||
private AFSDKValidateAndLogResult(AFSDKValidateAndLogStatus status, Dictionary<string, object> result, Dictionary<string, object> errorData, string error)
|
||||
{
|
||||
this.status = status;
|
||||
this.result = result;
|
||||
this.errorData = errorData;
|
||||
this.error = error;
|
||||
}
|
||||
|
||||
public static AFSDKValidateAndLogResult Init(AFSDKValidateAndLogStatus status, Dictionary<string, object> result, Dictionary<string, object> errorData, string error)
|
||||
{
|
||||
return new AFSDKValidateAndLogResult(status, result, errorData, error);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user