Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

8 天以前 ee81928228fcf1f5e3496cb1be1ddb9c0d6dc0f5

Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

 Main/Core/GameEngine/Launch/BuiltInAssetCopyTask.cs

@@ -52,6 +52,16 @@

    public override void End()
    {
        AssetBundleUtility.Instance.InitBuiltInAsset();

        LaunchInHot.Instance.InitSystemMgr();

        //  这里还没开始加载配置 但是提前加载了供LaunchWin使用
        PriorLanguageConfig.LazyInit();
        InitialFunctionConfig.LazyInit();

        UIManager.Instance.OpenWindow<LaunchWin>();

        // ConfigInitiator.SyncInit();
        UIManager.Instance.CloseWindow<DownLoadWin>();
        UIManager.Instance.CloseWindow<VersionUpdateWin>();

 Main/Core/GameEngine/Launch/LaunchInHot.cs

@@ -26,19 +26,18 @@
        Application.backgroundLoadingPriority = ThreadPriority.High;
        Screen.sleepTimeout = SleepTimeout.NeverSleep;

        if (AssetSource.isUseAssetBundle)
        {
            AssetBundleUtility.Instance.InitBuiltInAsset();
        }

        InitSystemMgr();
        SDKUtils.Instance.Init();  //原sdk接口
        if (!AssetSource.isUseAssetBundle)
        {
            InitSystemMgr();

        //  这里还没开始加载配置 但是提前加载了供LaunchWin使用
        PriorLanguageConfig.LazyInit();
        InitialFunctionConfig.LazyInit();

        UIManager.Instance.OpenWindow<LaunchWin>();
        }


        var builtInAssetCopyTask = new BuiltInAssetCopyTask();
        var requestPermissionStart = new RequestPermissionStart();
@@ -54,6 +53,7 @@
        var launchFadeOutTask = new LaunchFadeOutTask();

        tasks.Enqueue(builtInAssetCopyTask);
        tasks.Enqueue(assetBundleInitTask);
        tasks.Enqueue(requestPermissionStart);
        tasks.Enqueue(initSettingTask);

@@ -86,7 +86,7 @@

        tasks.Enqueue(checkAssetValidTask);
        tasks.Enqueue(downLoadAssetTask);
        tasks.Enqueue(assetBundleInitTask);
        
        tasks.Enqueue(configInitTask);
        tasks.Enqueue(launchFadeOutTask);

@@ -94,7 +94,7 @@

    }

    protected void InitSystemMgr()
    public void InitSystemMgr()
    {
        ResManager.Instance.Init();
        UIManager.Instance.Init();

 Main/Manager/StageManager.cs

@@ -36,6 +36,11 @@
    {

        UIManager.Instance.DestroyAllUI();



        if (AssetSource.isUseAssetBundle)

        {

            AssetBundleUtility.Instance.Sync_LoadAll("maps/Login");

        }



        AsyncOperation asyncOperation = SceneManager.LoadSceneAsync("Login");



        await OnLoading(asyncOperation, ConfigManager.Instance.GetLoadingProgress, Main.InitManagers);

@@ -76,6 +81,10 @@
        BeforeLoadingGameScene?.Invoke();



        // ResManager.Instance.PrewarmResources();

        if (AssetSource.isUseAssetBundle)

        {

            AssetBundleUtility.Instance.Sync_LoadAll("maps/Game");

        }



        AsyncOperation asyncOperation = SceneManager.LoadSceneAsync("Game");




 Main/ResModule/AssetBundle/AssetBundleUtility.cs

@@ -100,9 +100,9 @@
    public async UniTask Initialize()
    {
        await Co_LoadMainfestFile("audio");
        await Co_LoadMainfestFile("video");
        // await Co_LoadMainfestFile("video");
        await Co_LoadMainfestFile("mobeffectshader");
        await Co_LoadMainfestFile("config");
        // await Co_LoadMainfestFile("config");
        await Co_LoadMainfestFile("maps");
        await Co_LoadMainfestFile("ui");


 Main/ResModule/ResManager.cs

@@ -148,6 +148,14 @@
        }
        else
        {
            if (directory == "UI" || directory == "UIComp" || directory.StartsWith("Sprite") || directory == "Battle/Prefabs")
            { 
                directory = "UI/" + directory;
            }
            else if (name == "Hero_001")
            {
                directory = "UI/Hero/SpineRes";
            }
            var assetInfo = new AssetInfo(directory.ToLower(), name.ToLower());
            asset = AssetBundleUtility.Instance.Sync_LoadAsset(assetInfo, typeof(T)) as T;
        }
@@ -171,7 +179,7 @@
        else
#endif
        {
            path = AssetVersionUtility.GetAssetFilePath($"Config/{name}.txt");
            path = AssetVersionUtility.GetAssetFilePath($"config/{name}.txt");
        }

        return File.ReadAllLines(path);
@@ -179,7 +187,7 @@

    private Sprite LoadSprite(string atlasName, string spriteName)
    {
#if !UNITY_EDITOR
#if UNITY_EDITOR
        SpriteAtlas atlas = LoadAsset<SpriteAtlas>("Sprite", atlasName.Replace("Sprite/", ""));
        return atlas.GetSprite(spriteName);
#else

 Main/SDK/SDKUtils.cs

@@ -5,7 +5,7 @@
using System.Collections.Generic;
using System.IO;
using System;
using UnityEngine.Android;


public class SDKUtils : SingletonMonobehaviour<SDKUtils>
{
@@ -128,6 +128,7 @@

    public void Init()
    {
        ynmbxxjUtil.Instance.Init();
        Device = new DeviceInfo();
        string uid = LocalSave.GetString("Device_uniqueID");
        //Debug.Log(Math.Abs(System.Environment.TickCount));
@@ -406,211 +407,200 @@

    public void HandleMsgWithSDK(string jsonString)
    {
//         Debug.Log("收到SDK发来的信息: " + jsonString);
//         var _json = JsonMapper.ToObject(jsonString);
//         var _code = (int)_json["code"];
//         switch (_code)
//         {
//             case CodeA2U.DeviceInfo:
        Debug.Log("收到SDK发来的信息: " + jsonString);
        var _json = JsonMapper.ToObject(jsonString);
        var _code = (int)_json["code"];
        switch (_code)
        {
            case CodeA2U.DeviceInfo:


//                 //Device.uniqueID = _json["unique_id"].ToString();
//                 Device.androidID = _json["android_id"].ToString();// ios平台下为idfa
//                 Device.userAgent = _json["userAgent"].ToString();
// #if UNITY_ANDROID
//                 Device.macAddress = _json["mac"].ToString();
//                 if (_json["imei"] != null)
//                 {
//                     Device.imei = _json["imei"].ToString();
//                 }
//                 else
//                 {
//                     Device.imei = Device.uniqueID;
//                 }
//                 Device.totalMemory = (int)_json["memoryTotal"];
// #endif
//                 if (OnDeviceInfoChanged != null)
//                 {
//                     OnDeviceInfoChanged(Device);
//                 }
                //Device.uniqueID = _json["unique_id"].ToString();
                Device.androidID = _json["android_id"].ToString();// ios平台下为idfa
                Device.userAgent = _json["userAgent"].ToString();
#if UNITY_ANDROID
                Device.macAddress = _json["mac"].ToString();
                if (_json["imei"] != null)
                {
                    Device.imei = _json["imei"].ToString();
                }
                else
                {
                    Device.imei = Device.uniqueID;
                }
                Device.totalMemory = (int)_json["memoryTotal"];
#endif
                if (OnDeviceInfoChanged != null)
                {
                    OnDeviceInfoChanged(Device);
                }

//                 break;
//             case CodeA2U.AssetCopyFinished:
//                 AssetCopyFinished = true;
//                 break;
//             case CodeA2U.BatteryLevel:
                break;
            case CodeA2U.AssetCopyFinished:
                AssetCopyFinished = true;
                break;
            case CodeA2U.BatteryLevel:

//                 BatteryLevel = (int)_json["level"];
//                 if (OnBatteryLevelChanged != null)
//                 {
//                     OnBatteryLevelChanged(BatteryLevel);
//                 }
                BatteryLevel = (int)_json["level"];
                if (OnBatteryLevelChanged != null)
                {
                    OnBatteryLevelChanged(BatteryLevel);
                }

//                 break;
//             case CodeA2U.BatteryCharging:
                break;
            case CodeA2U.BatteryCharging:

//                 ChargingType = (E_ChargingType)((int)_json["status"]);
//                 if (OnChargingTypeChanged != null)
//                 {
//                     OnChargingTypeChanged(ChargingType);
//                 }
                ChargingType = (E_ChargingType)((int)_json["status"]);
                if (OnChargingTypeChanged != null)
                {
                    OnChargingTypeChanged(ChargingType);
                }

//                 break;
//             case CodeA2U.SdkInitComplete:
//                 InitFinished = true;
//                 var _dict = _json as IDictionary;
//                 if (_dict != null && _dict.Contains("channelPlatform"))
//                 {
//                     var _channelPlatform = _json["channelPlatform"].ToString();
//                     if (!string.IsNullOrEmpty(_channelPlatform))
//                     {
//                         if (_channelPlatform.Equals("hygame"))
//                         {
//                             ChannelPlatform = E_ChannelPlatform.Hy;
//                         }
//                         else if (_channelPlatform.Equals("quick"))
//                         {
//                             ChannelPlatform = E_ChannelPlatform.Quick;
//                         }
//                         else if (_channelPlatform.Equals("hyyn"))
//                         {
//                             ChannelPlatform = E_ChannelPlatform.newyn;
//                         }
//                         else if (_channelPlatform.Equals("hygtgame"))
//                         {
//                             ChannelPlatform = E_ChannelPlatform.hygt;
//                         }
//                         else if (_channelPlatform.Equals("hyenglish"))
//                         {
//                             ChannelPlatform = E_ChannelPlatform.en;
//                         }
//                     }
//                 }
                break;
            case CodeA2U.SdkInitComplete:
                InitFinished = true;
                var _dict = _json as IDictionary;
                if (_dict != null && _dict.Contains("channelPlatform"))
                {
                    var _channelPlatform = _json["channelPlatform"].ToString();
                    if (!string.IsNullOrEmpty(_channelPlatform))
                    {
                        if (_channelPlatform.Equals("hygame"))
                        {
                            ChannelPlatform = E_ChannelPlatform.Hy;
                        }
                        else if (_channelPlatform.Equals("quick"))
                        {
                            ChannelPlatform = E_ChannelPlatform.Quick;
                        }

//                 //Sdk 可能会修改渠道信息，所以需要重新获取
//                 if (_dict.Contains("yj_appid"))
//                 {
//                     Yj_AppID = _json["yj_appid"].ToString();
//                 }
                    }
                }

//                 if (_dict.Contains("yj_spid"))
//                 {
//                     Yj_SpID = _json["yj_spid"].ToString();
//                 }
                //Sdk 可能会修改渠道信息，所以需要重新获取
                if (_dict.Contains("yj_appid"))
                {
                    Yj_AppID = _json["yj_appid"].ToString();
                }

//                 if (_dict.Contains("banhao"))
//                 {
//                     Yj_BanHao = _json["banhao"].ToString();
//                 }
                if (_dict.Contains("yj_spid"))
                {
                    Yj_SpID = _json["yj_spid"].ToString();
                }

//                 break;
//             case CodeA2U.PushClientID:
//                 RegistrationID = _json["clientID"].ToString();
//                 break;
//             case CodeA2U.ExternalStorage:
//                 DeviceRootPath = _json["path"].ToString();
//                 break;
//             case CodeA2U.PermissionCallBack:
//                 {
//                     var state = (int)_json["state"];
//                     var permission = (string)_json["permission"];
//                     onPermissionCallBack?.Invoke(permission, state);
//                     onPermissionCallBack = null;
//                     break;
//                 }
//             case CodeA2U.FreePlatformInitOk:
                if (_dict.Contains("banhao"))
                {
                    Yj_BanHao = _json["banhao"].ToString();
                }

//                 if (onFreePlatformInitOk != null)
//                 {
//                     onFreePlatformInitOk();
//                 }
                break;
            case CodeA2U.PushClientID:
                RegistrationID = _json["clientID"].ToString();
                break;
            case CodeA2U.ExternalStorage:
                DeviceRootPath = _json["path"].ToString();
                break;
            case CodeA2U.PermissionCallBack:
                {
                    var state = (int)_json["state"];
                    var permission = (string)_json["permission"];
                    onPermissionCallBack?.Invoke(permission, state);
                    onPermissionCallBack = null;
                    break;
                }
            case CodeA2U.FreePlatformInitOk:

//                 break;
//             case CodeA2U.FreePlatformInitFail:
//                 if (onFreePlatformInitFail != null)
//                 {
//                     onFreePlatformInitFail();
//                 }
//                 break;
//             case CodeA2U.FreePlatformRegisterOk:
//                 // HandleFreePlatformRegisteOk(_json);
                if (onFreePlatformInitOk != null)
                {
                    onFreePlatformInitOk();
                }

                break;
            case CodeA2U.FreePlatformInitFail:
                if (onFreePlatformInitFail != null)
                {
                    onFreePlatformInitFail();
                }
                break;
            case CodeA2U.FreePlatformRegisterOk:
                // HandleFreePlatformRegisteOk(_json);
//                 OperationLogCollect.Instance.RecordEvent(5);
//                 var values = new JsonData();
//                 if (_json.Keys.Contains("reg_type"))
//                     values["af_registration_method"] = _json["reg_type"];
//                 break;
//             case CodeA2U.FreePlatformLoginOk:
//                 HandleFreePlatformLoginOk(_json["info"]);
                var values = new JsonData();
                if (_json.Keys.Contains("reg_type"))
                    values["af_registration_method"] = _json["reg_type"];
                break;
            case CodeA2U.FreePlatformLoginOk:
                HandleFreePlatformLoginOk(_json["info"]);
//                 OperationLogCollect.Instance.RecordEvent(6);
//                 break;
//             case CodeA2U.FreePlatformLoginFail:
//                 if (onFreePlatformLoginFail != null)
//                 {
//                     onFreePlatformLoginFail();
//                 }
//                 break;
//             case CodeA2U.FreePlatformLogoutOk:
//                 if (onFreePlatformLogoutOk != null)
//                 {
//                     onFreePlatformLogoutOk();
//                 }
//                 FreePlatformInfo = null;
//                 break;
//             case CodeA2U.FreePlatformSwitchAccountOk:
//                 BuildFreePlatformInfo(_json["info"]);
//                 if (onFreePlatformLogoutOk != null)
//                 {
//                     onFreePlatformLogoutOk();
//                 }
//                 FreePlatformInfo = null;
//                 break;
//             case CodeA2U.FreePlatformLogoutFail:
//                 if (onFreePlatformLogoutFail != null)
//                 {
//                     onFreePlatformLogoutFail();
//                 }
//                 break;
//             case CodeA2U.FreePlatformPayOk:
//                 if (onFreePlatformPayOk != null)
//                 {
//                     onFreePlatformPayOk();
//                 }
//                 //SnxxzGame.Instance.StartCoroutine(DelayQueryRecharge());
//                 break;
//             case CodeA2U.FreePlatformPayFail:
//                 if (onFreePlatformPayFail != null)
//                 {
//                     onFreePlatformPayFail();
//                 }
//                 break;
//             case CodeA2U.FreePlatformPayCancel:
//                 if (onFreePlatformPayCancel != null)
//                 {
//                     onFreePlatformPayCancel();
//                 }
//                 break;
//             case CodeA2U.ShareCallBack:
//                 {
//                     var state = int.Parse(_json["state"].ToString());
//                     if (state == CallBackState.Success)
//                         LocalSave.SetInt("ShareToFBDay" + PlayerDatas.Instance.baseData.PlayerID, TimeUtility.ServerNow.DayOfYear);
                break;
            case CodeA2U.FreePlatformLoginFail:
                if (onFreePlatformLoginFail != null)
                {
                    onFreePlatformLoginFail();
                }
                break;
            case CodeA2U.FreePlatformLogoutOk:
                if (onFreePlatformLogoutOk != null)
                {
                    onFreePlatformLogoutOk();
                }
                FreePlatformInfo = null;
                break;
            case CodeA2U.FreePlatformSwitchAccountOk:
                BuildFreePlatformInfo(_json["info"]);
                if (onFreePlatformLogoutOk != null)
                {
                    onFreePlatformLogoutOk();
                }
                FreePlatformInfo = null;
                break;
            case CodeA2U.FreePlatformLogoutFail:
                if (onFreePlatformLogoutFail != null)
                {
                    onFreePlatformLogoutFail();
                }
                break;
            case CodeA2U.FreePlatformPayOk:
                if (onFreePlatformPayOk != null)
                {
                    onFreePlatformPayOk();
                }
                //SnxxzGame.Instance.StartCoroutine(DelayQueryRecharge());
                break;
            case CodeA2U.FreePlatformPayFail:
                if (onFreePlatformPayFail != null)
                {
                    onFreePlatformPayFail();
                }
                break;
            case CodeA2U.FreePlatformPayCancel:
                if (onFreePlatformPayCancel != null)
                {
                    onFreePlatformPayCancel();
                }
                break;
            case CodeA2U.ShareCallBack:
                {
                    var state = int.Parse(_json["state"].ToString());
                    if (state == CallBackState.Success)
                        LocalSave.SetInt("ShareToFBDay" + PlayerDatas.Instance.baseData.PlayerID, TimeUtility.ServerNow.DayOfYear);

//                     onShareFBResult?.Invoke();
//                     break;
//                 }
//             case CodeA2U.ExitGame:
//                 if (ChannelPlatform == E_ChannelPlatform.Free)
//                 {
                    onShareFBResult?.Invoke();
                    break;
                }
            case CodeA2U.ExitGame:
                if (ChannelPlatform == E_ChannelPlatform.Free)
                {
//                     WindowCenter.Instance.Open<ExitGameWin>();
//                 }
//                 else
//                 {
//                     //默认都是退出游戏
//                     Application.Quit();
//                 }
//                 break;
//         }
//         onSdkMsg?.Invoke(_code, _json);
                }
                else
                {
                    //默认都是退出游戏
                    Application.Quit();
                }
                break;
        }
        onSdkMsg?.Invoke(_code, _json);
    }

    #endregion

 Main/SDK/ynmbxxjUtil.cs

New file
@@ -0,0 +1,11 @@

public class ynmbxxjUtil : SingletonMonobehaviour<ynmbxxjUtil>
{
    public void HandleMsgWithSDK(string jsonString)
    {
        SDKUtils.Instance.HandleMsgWithSDK(jsonString);
    }

    public void Init()
    { }
}

 Main/SDK/ynmbxxjUtil.cs.meta

New file
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: d69a5f50b06dc814ea13cb20acd59e3a
MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Main/System/ClientVersion/RequestSecretWin.cs

@@ -16,7 +16,6 @@
    protected override void InitComponent()
    {

        Debug.LogError("InitComponent");
        base.InitComponent();
        // 初始化组件引用
        m_Confirm.SetListener(Confirm);
@@ -60,7 +59,6 @@

    private void Confirm()
    {
        Debug.LogError("Confirm");
        //同意隐私 并申请权限
        SDKUtils.Instance.IsAgreeSecret = true;
        LocalSave.SetBool("secretToggleStart5", true);

 Main/System/ClientVersion/VersionConfig.cs

@@ -87,7 +87,7 @@
        }
    }

    [SerializeField] InstalledAsset m_AssetAccess = InstalledAsset.IngoreDownLoad;
    [SerializeField] InstalledAsset m_AssetAccess = InstalledAsset.NullAsset;
    public InstalledAsset assetAccess { get { return m_AssetAccess; } set { m_AssetAccess = value; } }

    [SerializeField] bool m_PartAssetPackage = false;

 Main/System/Invest/InvestModel.cs

@@ -6,7 +6,7 @@

public class InvestModel : GameSystemManager<InvestModel>
{
    public ILOpenServerActivityProxy activity;
    // public ILOpenServerActivityProxy activity;

    public const int FuncID = 119;

@@ -250,7 +250,7 @@
    {
        if (id == FuncID)
        {
            activity.StateUpdate(id);
            // activity.StateUpdate(id);
            UpdateRedpoint();
        }


 Main/System/KnapSack/PackManager.cs

@@ -543,7 +543,8 @@
        else
#endif
        {
            path = AssetVersionUtility.GetAssetFilePath($"Config/{name}.ini");
            //从服务端拷贝是ini，打包用txt统一处理
            path = AssetVersionUtility.GetAssetFilePath($"Config/{name}.txt");
        }

        return File.ReadAllLines(path);

 Main/Utility/ShaderUtility.cs

@@ -19,7 +19,7 @@
    {
        if (AssetSource.isUseAssetBundle)
        {
            AssetBundleUtility.Instance.Sync_LoadAllAssets("Shader");
            AssetBundleUtility.Instance.Sync_LoadAllAssets("Graphic/Shader");
            Shader.WarmupAllShaders();
        }
    }