fix:1、修复bug
This commit is contained in:
@@ -44,7 +44,7 @@ namespace BallKingdomCrush
|
||||
TrackKit.TrackLoginFunnel(LoginFunnelEventType.LoadBegin); //加载开始打点
|
||||
|
||||
var loginModel = LoginKit.Instance.LoginModel;
|
||||
Log.Info("Config", $"服务器传过来的配置表:{loginModel.Setting}");
|
||||
Debug.Log($"服务器传过来的配置表:{loginModel.Setting}");
|
||||
ConfigLoader.Instance.Init(new ConfigInitOptions
|
||||
{
|
||||
Setting = loginModel.Setting,
|
||||
@@ -142,14 +142,18 @@ namespace BallKingdomCrush
|
||||
///
|
||||
/// </summary>
|
||||
/// <returns>true:非自然 false:自然</returns>
|
||||
public static bool IsOrganic()
|
||||
private static bool IsOrganic()
|
||||
{
|
||||
bool b = false;
|
||||
|
||||
if (GameHelper.IsGiftSwitch() && SuperApplication.Instance.attribution == "organic")
|
||||
if (GameHelper.IsGiftSwitch())
|
||||
{
|
||||
b = GetCommonConf().IsOrganic == 1;
|
||||
if (SuperApplication.Instance.attribution == "organic")
|
||||
{
|
||||
b = GetCommonConf().non == 1;
|
||||
}
|
||||
}
|
||||
// Debug.Log($"上传---------开关:{GetCommonConf().non}");
|
||||
|
||||
Debug.Log($"下载---------开关:{b}");
|
||||
return b;
|
||||
@@ -157,7 +161,7 @@ namespace BallKingdomCrush
|
||||
|
||||
public static string GetConfigResVersion()
|
||||
{
|
||||
return IsOrganic() ? GetCommonConf().ResVersion : GetCommonConf().ResVersion1;
|
||||
return IsOrganic() ? GetCommonConf().ResVersion1 : GetCommonConf().ResVersion;
|
||||
}
|
||||
|
||||
public static List<T> GetConfig<T>() where T : class
|
||||
@@ -167,7 +171,7 @@ namespace BallKingdomCrush
|
||||
|
||||
private static List<T> GetConfigWithOrganicFallback<T, TOrganic>() where T : class
|
||||
{
|
||||
if (!IsOrganic())
|
||||
if (IsOrganic())
|
||||
{
|
||||
var organicConfig = ConfigLoader.Instance.GetConfig<List<TOrganic>>();
|
||||
if (organicConfig != null)
|
||||
|
||||
Reference in New Issue
Block a user