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

allez

2021-05-27 2fdb88b4d24d586f1e200ab17bf55ac55514e6b7

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

 Assets/Editor/Logo/gtgame/Icon.png

 Assets/Editor/Logo/gtgame/SplashImage.png

 Assets/Editor/Logo/gtgame/TB_DL_Logo.png

 Assets/Editor/Logo/gtios/Icon.png

 Assets/Editor/Logo/gtios/SplashImage.png

 Assets/Editor/Logo/gtios/TB_DL_Logo.png

 Assets/Editor/Tool/UpdateAssetBundleName.cs

@@ -514,6 +514,10 @@
                continue;

            }



            if (extension == ".DS_Store")

            {

                continue;

            }

            var directoryName = file.DirectoryName.Replace("\\", "/");

            var relativeDirectory = directoryName.Replace(amendRootPath, "");




 Assets/Editor/VersionConfigs/Versions.txt

@@ -1,14 +1,14 @@
Id    name    AppId    VersionAuthority    m_Version    m_ClientPackageFlag    m_Branch    m_GameId    m_AssetAccess    m_PartAssetPackage    m_ProductName    m_BundleIdentifier    m_KeystoreFileName    m_KeystorePassword    m_KeystoreAlias    m_KeystoreAliasPassword    m_AppleDeveloperTeamID    m_DebugVersion    m_IsBanShu    m_LogoPosition    m_BanHao    m_SpID    m_Recharge    m_CreateRolePattern
版本标识    版本名称    渠道id    版本权限，0是测试版本，1是发布版本    版本号    客户端标识    分支    游戏项目标识    资源,0NullAsset,1HalfAsset,2FullAsset,3IgnoreDownLoad    是否分包，0不分包，1分包    产品名    产品包名    签名文件名    签名文件密码    签名文件别名    签名文件别名密码    开发者账号密码    是否debug版本，0否1是    是否版署版本，0否1是    登录界面的Logo位置    版号    运营商ID    充值界面风格    创角场景风格
10000    TheSecondWorld    test    0    1.100.1    2021    7    xbqy    1    1    仙宝奇缘    com.secondworld.snxxz    thesecondworld    thesecondworld2018    thesecondworld    thesecondworld2018        0    0    (-32,144)            0    
1    gtgame    gtgame    1    1.100.5    2021    1    xbqy    1    1    鎮魔訣    com.sanxiagame.zmjgp    gtgame    Fjsx123123    Key0    Fjsx123123        0    0    (0,80)        gtgame    0    0
2    gtgame    gtgame    1    1.100.5    2021    2    xbqy    1    1    鎮魔訣    com.sanxiagame.zmjgp    gtgame    Fjsx123123    Key0    Fjsx123123        0    0    (0,80)        gtgame    0    0
3    gtgame    gtgame    1    1.100.6    2021    3    xbqy    1    1    鎮魔訣    com.sanxiagame.zmjgp    gtgame    Fjsx123123    Key0    Fjsx123123        0    0    (0,80)        gtgame    0    0
11    gtios    gtios    1    1.100.5    2021    11    xbqy    1    1    鎮魔訣    com.sanxiagame.zmjas    gtgame    Fjsx123123    Key0    Fjsx123123        0    0    (0,80)        gtios    0    0
12    gtios    gtios    1    1.100.5    2021    12    xbqy    1    1    鎮魔訣    com.sanxiagame.zmjas    gtgame    Fjsx123123    Key0    Fjsx123123        0    0    (0,80)        gtios    0    0
13    gtios    gtios    1    1.100.5    2021    13    xbqy    1    1    鎮魔訣    com.sanxiagame.zmjas    gtgame    Fjsx123123    Key0    Fjsx123123        0    0    (0,80)        gtios    0    0
901    gtgame    gtgame    1    1.100.5    2021    901    xbqy    1    1    鎮魔訣    com.sanxiagame.zmjgp    gtgame    Fjsx123123    Key0    Fjsx123123        0    0    (0,80)        gtgame    0    0
911    gtios    gtios    1    1.100.5    2021    911    xbqy    1    1    鎮魔訣    com.sanxiagame.zmjas    gtgame    Fjsx123123    Key0    Fjsx123123        0    0    (0,80)        gtios    0    0
1    gtgame    gtgame    1    1.100.7    2021    1    xbqy    1    1    鎮魔訣    com.sanxiagame.zmjgp    gtgame    Fjsx123123    Key0    Fjsx123123        0    0    (0,80)        gtgame    0    0
2    gtgame    gtgame    1    1.100.7    2021    2    xbqy    1    1    鎮魔訣    com.sanxiagame.zmjgp    gtgame    Fjsx123123    Key0    Fjsx123123        0    0    (0,80)        gtgame    0    0
3    gtgame    gtgame    1    1.100.7    2021    3    xbqy    1    1    鎮魔訣    com.sanxiagame.zmjgp    gtgame    Fjsx123123    Key0    Fjsx123123        0    0    (0,80)        gtgame    0    0
11    gtios    gtios    1    1.100.7    2021    11    xbqy    2    1    鎮魔訣    com.sanxiagame.zmjas    gtgame    Fjsx123123    Key0    Fjsx123123        0    0    (0,80)        gtios    0    0
12    gtios    gtios    1    1.100.7    2021    12    xbqy    2    1    鎮魔訣    com.sanxiagame.zmjas    gtgame    Fjsx123123    Key0    Fjsx123123        0    0    (0,80)        gtios    0    0
13    gtios    gtios    1    1.100.7    2021    13    xbqy    2    1    鎮魔訣    com.sanxiagame.zmjas    gtgame    Fjsx123123    Key0    Fjsx123123        0    0    (0,80)        gtios    0    0
901    gtgame    gtgame    1    1.100.7    2021    901    xbqy    1    1    鎮魔訣    com.sanxiagame.zmjgp    gtgame    Fjsx123123    Key0    Fjsx123123        0    0    (0,80)        gtgame    0    0
911    gtios    gtios    1    1.100.7    2021    911    xbqy    1    1    鎮魔訣    com.sanxiagame.zmjas    gtgame    Fjsx123123    Key0    Fjsx123123        0    0    (0,80)        gtios    0    0
999    gtgame    gtgame    1    1.0.0    2021    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    2021    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    


 Assets/Editor/XCodeProjectMod.cs

@@ -38,7 +38,8 @@

        project.AddBuildProperty(targetGUID, "OTHER_LDFLAGS", "-ObjC");
        project.AddBuildProperty(targetGUID, "GCC_GENERATE_DEBUGGING_SYMBOLS", "NO");

        //webkit
        project.AddFrameworkToProject(fwTargetGUID, "WebKit.framework", true);
        //bugly
        project.AddFrameworkToProject(fwTargetGUID, "SystemConfiguration.framework", true);
        project.AddFrameworkToProject(fwTargetGUID, "Security.framework", true);
@@ -110,9 +111,30 @@
        rootDict.SetString("NSMicrophoneUsageDescription", "使用麦克风权限");
        rootDict.SetString("NSPhotoLibraryAddUsageDescription", "使用相册权限,用以存储截屏的账号信息,以防忘记账号密码");

        //google login
        var urlTypes = rootDict.CreateArray("CFBundleURLTypes");
        var dic0 = urlTypes.AddDict();
        dic0.SetString("CFBundleTypeRole", "Editor");
        dic0.SetString("CFBundleURLName", "");
        var cfArray0 = dic0.CreateArray("CFBundleURLSchemes");
        cfArray0.AddString("com.sanxiagame.zmjas");

        var dic1 = urlTypes.AddDict();
        dic1.SetString("CFBundleTypeRole", "Editor");
        dic1.SetString("CFBundleURLName", "");
        var cfArray1 = dic1.CreateArray("CFBundleURLSchemes");
        cfArray1.AddString("com.googleusercontent.apps.468442318367-ocoqrm0kei0gpkrnnq1ql628v4g4dbqd");

        var dic2 = urlTypes.AddDict();
        dic2.SetString("CFBundleTypeRole", "Editor");
        dic2.SetString("CFBundleURLName", "");
        var cfArray2 = dic2.CreateArray("CFBundleURLSchemes");
        cfArray2.AddString("fb1749518565212194");

        //facebook
        rootDict.SetString("FacebookAppID", "1749518565212194");
        rootDict.SetString("FacebookDisplayName", "镇魔诀");
        var array = nsAppTransportSecurity.CreateArray("LSApplicationQueriesSchemes");
        rootDict.SetString("FacebookDisplayName", "鎮魔訣");
        var array = rootDict.CreateArray("LSApplicationQueriesSchemes");
        array.AddString("fbapi");
        array.AddString("fbauth2");

@@ -154,6 +176,15 @@
                "    _universalSDK = [[UniversalSDK alloc] init];\n    [_universalSDK QuickSDKInit:application didFinishLaunchingWithOptions:launchOptions];";
        xclass.WriteBelow("[KeyboardDelegate Initialize];", newCode);

        //AF 生命周期
        xclass.WriteBelow("#import <AVFoundation/AVFoundation.h>", "#import <YYJPlatform/YYJPlatform.h>");
        xclass.WriteBelow("[self removeSnapshotViewController];", "[[YYJPlatform yyj_defaultPlatform] yyj_applicationDidBecomeActive:application];");
        xclass.WriteBelow("- (BOOL)application:(UIApplication*)app openURL:(NSURL*)url options:(NSDictionary<NSString*, id>*)options\n{",
            "[[YYJPlatform yyj_defaultPlatform] yyj_application:app openURL:url options:options];");
        xclass.WriteBelow("NSURL* url = userActivity.webpageURL;", "[[YYJPlatform yyj_defaultPlatform] yyj_application:application continueUserActivity:userActivity restorationHandler:restorationHandler];");
        xclass.WriteBelow("- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult result))handler\n{",
            "[[YYJPlatform yyj_defaultPlatform] yyj_application:application didReceiveRemoteNotification:userInfo fetchCompletionHandler:handler];");



        /**修改UnityAppController.h 文件**/

 Assets/Firebase/Editor/generate_xml_from_google_services_json.py

@@ -121,7 +121,7 @@
    json_struct = {
        'project_info': {
            'project_number': xml_dict['GCM_SENDER_ID'],
            'firebase_url': xml_dict['DATABASE_URL'],
            'firebase_url': xml_dict.get('DATABASE_URL', ""),
            'project_id': xml_dict['PROJECT_ID'],
            'storage_bucket': xml_dict['STORAGE_BUCKET']
        },

 Assets/ILRuntime/Editor/ILRuntimeCLRBinding.cs

@@ -30,6 +30,7 @@
        typeof(Text),
        typeof(Button),
        typeof(Image),
        typeof(Toggle),
        //主工程相关
        typeof(Redpoint),
        typeof(Int2),

 Assets/ILRuntime/Src/ILBehaviourProxy.cs

@@ -117,11 +117,13 @@
            ILBehaviourHolder holder;
            if (ilBehaviourHolders.TryGetValue(name, out holder))
            {
                if (holder.onDisable != null)
                if (holder.onDisable != null && appDomain != null)
                { 
                    appDomain.Invoke(holder.onDisable, holder.instance);
            }
        }
    }
    }

    private void Update()
    {

 Assets/ILRuntime/Src/ILLauncherProxy.cs

@@ -203,6 +203,29 @@
            });
        });

        appdomain.DelegateManager.RegisterDelegateConvertor<UnityEngine.Events.UnityAction<bool>>((act) =>
        {
            return new UnityEngine.Events.UnityAction<bool>((arg0) =>
            {
                ((System.Action<bool>)act)(arg0);
            });
        });

        appdomain.DelegateManager.RegisterDelegateConvertor<UnityEngine.Events.UnityAction<float>>((act) =>
        {
            return new UnityEngine.Events.UnityAction<float>((arg0) =>
            {
                ((System.Action<float>)act)(arg0);
            });
        });

        appdomain.DelegateManager.RegisterDelegateConvertor<UnityEngine.Events.UnityAction<string>>((act) =>
        {
            return new UnityEngine.Events.UnityAction<string>((arg0) =>
            {
                ((System.Action<string>)act)(arg0);
            });
        });
    }

    public void LaunchStart()

 Assets/Plugins/Android/libs.meta

@@ -1,7 +1,8 @@
fileFormatVersion: 2
guid: 9cd62bafd75e7604daf2b561b80d136d
guid: 8ee33a9b24450ac4abb781fd3fb2bc46
folderAsset: yes
DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Plugins/Android/libs/arm64-v8a.meta

New file
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 4f4636136e515d743914c7338ac63785
folderAsset: yes
DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Plugins/Android/libs/arm64-v8a/libopus.so

Binary files differ

 Assets/Plugins/Android/libs/arm64-v8a/libopus.so.meta

New file
@@ -0,0 +1,33 @@
fileFormatVersion: 2
guid: 419f0e930e89f844280e3ee43ea3bd69
PluginImporter:
  externalObjects: {}
  serializedVersion: 2
  iconMap: {}
  executionOrder: {}
  defineConstraints: []
  isPreloaded: 0
  isOverridable: 0
  isExplicitlyReferenced: 0
  validateReferences: 1
  platformData:
  - first:
      Android: Android
    second:
      enabled: 1
      settings:
        CPU: ARM64
  - first:
      Any: 
    second:
      enabled: 0
      settings: {}
  - first:
      Editor: Editor
    second:
      enabled: 0
      settings:
        DefaultValueInitialized: true
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Plugins/Android/libs/armeabi-v7a.meta

@@ -1,7 +1,8 @@
fileFormatVersion: 2
guid: b8d0cd0f5702f0144af2498bce3ee3e9
guid: 49800597deef82e4a93943235d7210b2
folderAsset: yes
DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Plugins/Android/libs/armeabi-v7a/libopus.so

Binary files differ

 Assets/Plugins/Android/libs/armeabi-v7a/libopus.so.meta

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7f6f1fa45f740e4499d165a5229cfbc4
guid: 4acfd5fb885680b4e959aece41dee432
PluginImporter:
  externalObjects: {}
  serializedVersion: 2

 Assets/Plugins/Android/libs/x86.meta

@@ -1,7 +1,8 @@
fileFormatVersion: 2
guid: 079ea0ed741ff194a80cce029630b5ac
guid: 553bb5fb28aa09e48a971dc35918c4bc
folderAsset: yes
DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Plugins/Android/libs/x86/libopus.so

Binary files differ

 Assets/Plugins/Android/libs/x86/libopus.so.meta

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 60087e115971d284e979bcf12138ae8d
guid: 5ca6c04343670924d8b2d5d363587f1d
PluginImporter:
  externalObjects: {}
  serializedVersion: 2

 Assets/Plugins/Android/libs/x86_64.meta

New file
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9a4850649b73bd54699a2c41dafb982e
folderAsset: yes
DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Plugins/Android/libs/x86_64/libopus.so

Binary files differ

 Assets/Plugins/Android/libs/x86_64/libopus.so.meta

New file
@@ -0,0 +1,32 @@
fileFormatVersion: 2
guid: 8c2116649829e7d44a38241c96d0fc03
PluginImporter:
  externalObjects: {}
  serializedVersion: 2
  iconMap: {}
  executionOrder: {}
  defineConstraints: []
  isPreloaded: 0
  isOverridable: 0
  isExplicitlyReferenced: 0
  validateReferences: 1
  platformData:
  - first:
      Android: Android
    second:
      enabled: 0
      settings: {}
  - first:
      Any: 
    second:
      enabled: 0
      settings: {}
  - first:
      Editor: Editor
    second:
      enabled: 0
      settings:
        DefaultValueInitialized: true
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Plugins/Android/mainTemplate.gradle

@@ -1,4 +1,3 @@
// GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN

// Android Resolver Repos Start
([rootProject] + (rootProject.subprojects as List)).each { project ->
@@ -34,12 +33,12 @@
// Android Resolver Exclusions Start
android {
  packagingOptions {
      exclude ('/lib/arm64-v8a/*' + '*')
      exclude ('/lib/armeabi/*' + '*')
      exclude ('/lib/mips/*' + '*')
      exclude ('/lib/mips64/*' + '*')
      exclude ('/lib/x86/*' + '*')
      exclude ('/lib/x86_64/*' + '*')
    //   exclude ('/lib/arm64-v8a/*' + '*')
    //   exclude ('/lib/armeabi/*' + '*')
    //   exclude ('/lib/mips/*' + '*')
    //   exclude ('/lib/mips64/*' + '*')
    //   exclude ('/lib/x86/*' + '*')
    //   exclude ('/lib/x86_64/*' + '*')
  }
}
// Android Resolver Exclusions End

 Assets/Plugins/Android/unityopus.aar

Binary files differ

 Assets/Plugins/Android/unityopus.aar.meta

New file
@@ -0,0 +1,32 @@
fileFormatVersion: 2
guid: 9e68815c63442724c9cd2a9e7f06b139
PluginImporter:
  externalObjects: {}
  serializedVersion: 2
  iconMap: {}
  executionOrder: {}
  defineConstraints: []
  isPreloaded: 0
  isOverridable: 0
  isExplicitlyReferenced: 0
  validateReferences: 1
  platformData:
  - first:
      Android: Android
    second:
      enabled: 1
      settings: {}
  - first:
      Any: 
    second:
      enabled: 0
      settings: {}
  - first:
      Editor: Editor
    second:
      enabled: 0
      settings:
        DefaultValueInitialized: true
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Assets/Plugins/BuglyPlugins/iOS/Bugly.framework/Bugly

Binary files differ

 Assets/Plugins/BuglyPlugins/iOS/Bugly.framework/Headers/Bugly.h

@@ -1,7 +1,7 @@
//
//  Bugly.h
//
//  Version: 2.5(71)
//  Version: 2.5(9)
//
//  Copyright (c) 2017年 Tencent. All rights reserved.
//

 Assets/Plugins/x86_64/UnityOpus.dll

Binary files differ

 Assets/Plugins/x86_64/UnityOpus.dll.meta

New file
@@ -0,0 +1,108 @@
fileFormatVersion: 2
guid: ed3e96f85077fb940ab466efc0395102
PluginImporter:
  externalObjects: {}
  serializedVersion: 2
  iconMap: {}
  executionOrder: {}
  defineConstraints: []
  isPreloaded: 0
  isOverridable: 0
  isExplicitlyReferenced: 0
  validateReferences: 1
  platformData:
  - first:
      '': Any
    second:
      enabled: 0
      settings:
        Exclude Android: 1
        Exclude Editor: 0
        Exclude Linux: 0
        Exclude Linux64: 0
        Exclude LinuxUniversal: 0
        Exclude OSXUniversal: 0
        Exclude Win: 1
        Exclude Win64: 0
  - first:
      '': OSXIntel
    second:
      enabled: 0
      settings:
        CPU: None
  - first:
      '': OSXIntel64
    second:
      enabled: 1
      settings:
        CPU: AnyCPU
  - first:
      Android: Android
    second:
      enabled: 0
      settings:
        CPU: ARMv7
  - first:
      Any: 
    second:
      enabled: 0
      settings: {}
  - first:
      Editor: Editor
    second:
      enabled: 1
      settings:
        CPU: x86_64
        DefaultValueInitialized: true
        OS: AnyOS
  - first:
      Facebook: Win
    second:
      enabled: 0
      settings:
        CPU: None
  - first:
      Facebook: Win64
    second:
      enabled: 1
      settings:
        CPU: AnyCPU
  - first:
      Standalone: Linux
    second:
      enabled: 1
      settings:
        CPU: None
  - first:
      Standalone: Linux64
    second:
      enabled: 1
      settings:
        CPU: x86_64
  - first:
      Standalone: LinuxUniversal
    second:
      enabled: 1
      settings:
        CPU: AnyCPU
  - first:
      Standalone: OSXUniversal
    second:
      enabled: 1
      settings:
        CPU: x86_64
  - first:
      Standalone: Win
    second:
      enabled: 0
      settings:
        CPU: None
  - first:
      Standalone: Win64
    second:
      enabled: 1
      settings:
        CPU: AnyCPU
  userData: 
  assetBundleName: 
  assetBundleVariant: