Merge branch 'master' into RLRuntime

lwb

2021-01-20 a6510eacce3458603fc4a0868f5eeb915f50cb6f

Merge branch 'master' into RLRuntime

 Assets/Editor/Config/ExportMaps.txt

@@ -11,8 +11,6 @@
Map134_Yams
Map136_Bzjdc
Map137_Dmzd
Map140_Qy
Map143_Bz
Map202_Whmj_2
Map203_Whmj_3
Map204_Whmj_4

 Assets/Editor/Tool/ClientPackage.cs

@@ -248,18 +248,22 @@


            //剔除视频资源

            tempFiles.Clear();

            FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(_assetBundlePath, "/video"), tempFiles);

            foreach (var file in tempFiles)

            var videoPath = StringUtility.Contact(_assetBundlePath, "/video");

            if (File.Exists(videoPath))

            {

                var extersion = Path.GetExtension(file.FullName);

                var fileName = Path.GetFileNameWithoutExtension(file.FullName);

                var prior = PriorBundleConfig.GetAssetPrior(AssetVersion.AssetCategory.Video, fileName);

                if (prior > AssetPrior)

                FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(_assetBundlePath, "/video"), tempFiles);

                foreach (var file in tempFiles)

                {

                    excludeFileFullNames.Add(file.FullName);

                    var extersion = Path.GetExtension(file.FullName);

                    var fileName = Path.GetFileNameWithoutExtension(file.FullName);

                    var prior = PriorBundleConfig.GetAssetPrior(AssetVersion.AssetCategory.Video, fileName);

                    if (prior > AssetPrior)

                    {

                        excludeFileFullNames.Add(file.FullName);

                    }

                }

            }



            
            //剔除表资源

            if (!includeConfig)

            {


 Assets/Editor/VersionConfigs/Versions.txt

@@ -6,5 +6,6 @@
100    gtgame    gtgame    1    1.0.0    aaa    1    xbqy    0    0    鎮魔訣    com.sanxiagame.zmjgp    gtgame    Fjsx123123    Key0    Fjsx123123        0    0    (0,80)        gtgame    0    0
999    gtgame    gtgame    1    1.0.0    aaa    999    xbqy    0    0    鎮魔訣    com.sanxiagame.zmjgp    gtgame    Fjsx123123    Key0    Fjsx123123        0    0    (0,80)        gtgame    0    0
9998    xmyjgame    xmyjgame    1    1.100.2    aaa    4    xbqy    1    1    仙魔战场    com.xfzc.yj.quick    mengxiandao    mengxiandao2020    mengxiandao    mengxiandao2020        0    0    (-15,64)    出版单位名称:天津电子出版社有限公司 著作权人名称:广州秒乐网络科技有限公司</r>运营单位:广州游路网络科技有限公司 游戏内容类别:移动游戏 批文号:国新出审[2019]1132号 游戏版号:ISBN 978-7-498-06329-8    xmyjgame    0    
9527    TheSecondWorld    test    0    1.100.1    aaa    2    xbqy    3    0    仙宝奇缘    com.secondworld.snxxz    thesecondworld    thesecondworld2018    thesecondworld    thesecondworld2018        1    0     (-32,144)            0	
9528    gtgame    gtgame    1    1.100.1    aaa    1    xbqy    3    0    鎮魔訣    com.sanxiagame.zmjgp    gtgame    Fjsx123123    Key0    Fjsx123123        1    0    (0,80)        gtgame    0    1
9527    TheSecondWorld    test    0    1.100.1    aaa    911    xbqy    2    0    仙宝奇缘    com.secondworld.snxxz    thesecondworld    thesecondworld2018    thesecondworld    thesecondworld2018        1    0     (-32,144)            0	
9528    gtgame    gtgame    1    1.100.1    aaa    1    xbqy    3    0    鎮魔訣    com.sanxiagame.zmjgp    gtgame    Fjsx123123    Key0    Fjsx123123        1    0    (0,80)        gtgame    0    1
911    TheSecondWorld    test    0    1.100.1    aaa    911    xbqy    2    0    仙宝奇缘    com.secondworld.snxxz    thesecondworld    thesecondworld2018    thesecondworld    thesecondworld2018        1    0     (-32,144)            0