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

lwb

2021-04-25 a17f9e381a13b371db017a5adb7a0b309b752a0e

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

 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);

 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']
        },