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

yyl

9 天以前 537957ea5d7c57dddbb45589a77739d4304cb46d

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

 Assets/Editor/SpritePacking/SpriteSettings.asset

@@ -1905,6 +1905,28 @@
      maxTextureSize: 2048
      textureCompression: 1
      textureFormat: 50
  - folderName: HeroSkinFlashSaleSkin_5200131
    blockOffset: 1
    enableRotation: 0
    enableTightPacking: 0
    padding: 4
    readable: 0
    generateMipMaps: 0
    sRGB: 1
    filterMode: 1
    platformSettings:
    - name: Standalone
      maxTextureSize: 2048
      textureCompression: 1
      textureFormat: 4
    - name: Android
      maxTextureSize: 2048
      textureCompression: 1
      textureFormat: 50
    - name: iPhone
      maxTextureSize: 2048
      textureCompression: 1
      textureFormat: 50
  - folderName: HeroSkinFlashSaleSkin_5200141
    blockOffset: 1
    enableRotation: 0
@@ -1993,6 +2015,28 @@
      maxTextureSize: 2048
      textureCompression: 1
      textureFormat: 50
  - folderName: HeroSkinFlashSaleSkin_5300121
    blockOffset: 1
    enableRotation: 0
    enableTightPacking: 0
    padding: 4
    readable: 0
    generateMipMaps: 0
    sRGB: 1
    filterMode: 1
    platformSettings:
    - name: Standalone
      maxTextureSize: 2048
      textureCompression: 1
      textureFormat: 4
    - name: Android
      maxTextureSize: 2048
      textureCompression: 1
      textureFormat: 50
    - name: iPhone
      maxTextureSize: 2048
      textureCompression: 1
      textureFormat: 50
  - folderName: HeroSkinFlashSaleSkin_5300131
    blockOffset: 1
    enableRotation: 0

 Assets/Editor/UIComponent/GradientTextEditor.cs

@@ -11,6 +11,7 @@
    private SerializedProperty m_BottomLeftColor;
    private SerializedProperty m_BottomRightColor;
    private SerializedProperty m_UseGradient;
    private SerializedProperty m_GradientPower;

    protected override void OnEnable()
    {
@@ -22,6 +23,7 @@
        m_BottomLeftColor = serializedObject.FindProperty("m_BottomLeftColor");
        m_BottomRightColor = serializedObject.FindProperty("m_BottomRightColor");
        m_UseGradient = serializedObject.FindProperty("m_UseGradient");
        m_GradientPower = serializedObject.FindProperty("m_GradientPower");
    }

    public override void OnInspectorGUI()
@@ -77,6 +79,8 @@
                    break;
            }
            
            EditorGUILayout.PropertyField(m_GradientPower, new GUIContent("缓出指数(1=线性)"));
            
            // 快速设置按钮
            EditorGUILayout.Space();
            EditorGUILayout.LabelField("快速设置", EditorStyles.miniLabel);

 Assets/Editor/XCodeProjectMod.cs

@@ -183,7 +183,7 @@
        //修改UnityAppController.mm 文件
        var _xclass = new XClass(projectPath + "/Classes/UnityAppController.mm");
        //引入fimpfunSDK
        _xclass.WriteBelow("#include \"PluginBase/AppDelegateListener.h\"", "#import \"fimpfunSDK.h\"");
        _xclass.WriteBelow("#include \"PluginBase/AppDelegateListener.h\"", "#import \"fimpfunSDK.h\"\n#import <AppTrackingTransparency/AppTrackingTransparency.h>");
        //unity交互调用的方法
        string newCode = "\n" +
                 "extern \"C\" void IOSUniyMessageHandle(const char* jsonString) {\n" +
@@ -199,7 +199,7 @@
        // fimpfunSDK 生命周期
        _xclass.WriteBelow("- (BOOL)application:(UIApplication*)app openURL:(NSURL*)url options:(NSDictionary<NSString*, id>*)options\n{", "\n    [_fimpfunBridge application:app openURL:url options:options];");

        _xclass.WriteBelow("::printf(\"-> applicationDidBecomeActive()\\n\");", "[_fimpfunBridge applicationDidBecomeActive:application];");
        _xclass.WriteBelow("::printf(\"-> applicationDidBecomeActive()\\n\");", "    [_fimpfunBridge applicationDidBecomeActive:application];\n    if (@available(iOS 14, *)) {\n        static dispatch_once_t onceToken;\n        dispatch_once(&onceToken, ^{\n            [ATTrackingManager requestTrackingAuthorizationWithCompletionHandler:^(ATTrackingManagerAuthorizationStatus status) {\n                NSLog(@\"[ATT] Authorization status: %ld\", (long)status);\n            }];\n        });\n    }");


        //修改UnityAppController.h 文件