0312 版本同步

hch

2023-06-14 233f4cc3588e2bf43cdd7cdbf4e5e4ad9585d46d

0312 版本同步

 Assets/Editor/UIComponent/TextExEditor.cs

@@ -1,4 +1,5 @@
using UnityEditor;
using UnityEngine;

[CustomEditor(typeof(TextEx),true),CanEditMultipleObjects]
public class TextExEditor:UnityEditor.UI.TextEditor {
@@ -8,6 +9,7 @@
        EditorGUILayout.Space();        
        TextEx text = target as TextEx;
        text.isKey = EditorGUILayout.Toggle("是语言表ID",text.isKey);
        //text.keyName = EditorGUILayout.TextField(text.keyName, GUILayout.Width(200));
        text.colorType = (TextColType)EditorGUILayout.EnumPopup("颜色类型", text.colorType);
    }


 Assets/Editor/XCodeProjectMod.cs

@@ -63,7 +63,6 @@
        project.AddFrameworkToProject(fwTargetGUID, "AuthenticationServices.framework", true);
        project.AddFrameworkToProject(fwTargetGUID, "LocalAuthentication.framework", true);

        //appsflyer
        project.AddFrameworkToProject(fwTargetGUID, "AdSupport.framework", true);
        project.AddFrameworkToProject(fwTargetGUID, "iAd.framework", true);


 Assets/ILRuntime/Src/ILLauncherProxy.cs

@@ -185,6 +185,7 @@
        appdomain.DelegateManager.RegisterMethodDelegate<int, int, int, int>();
        appdomain.DelegateManager.RegisterMethodDelegate<long, long>();
        appdomain.DelegateManager.RegisterMethodDelegate<long, long, long>();
        appdomain.DelegateManager.RegisterMethodDelegate<System.Int32, System.Single, System.Single>();

        //有返回值
        appdomain.DelegateManager.RegisterFunctionDelegate<UnityEngine.Color>();
@@ -198,6 +199,34 @@
        appdomain.DelegateManager.RegisterFunctionDelegate<System.Int32, System.Int32, System.Int32>();
        appdomain.DelegateManager.RegisterFunctionDelegate<ILRuntime.Runtime.Intepreter.ILTypeInstance, ILRuntime.Runtime.Intepreter.ILTypeInstance, System.Int32>();
        appdomain.DelegateManager.RegisterFunctionDelegate<ILRuntime.Runtime.Intepreter.ILTypeInstance, System.Boolean>();
        appdomain.DelegateManager.RegisterFunctionDelegate<global::Int3, global::Int3, System.Int32>();
        appdomain.DelegateManager.RegisterFunctionDelegate<global::StoreModel.StoreData, global::StoreModel.StoreData, System.Int32>();


        appdomain.DelegateManager.RegisterDelegateConvertor<UnityEngine.Events.UnityAction<System.Int32, System.Single, System.Single>>((act) =>
        {
            return new UnityEngine.Events.UnityAction<System.Int32, System.Single, System.Single>((arg0, arg1, arg2) =>
            {
                ((Action<System.Int32, System.Single, System.Single>)act)(arg0, arg1, arg2);
            });
        });


        appdomain.DelegateManager.RegisterDelegateConvertor<System.Comparison<global::StoreModel.StoreData>>((act) =>
        {
            return new System.Comparison<global::StoreModel.StoreData>((x, y) =>
            {
                return ((Func<global::StoreModel.StoreData, global::StoreModel.StoreData, System.Int32>)act)(x, y);
            });
        });

        appdomain.DelegateManager.RegisterDelegateConvertor<System.Comparison<global::Int3>>((act) =>
        {
            return new System.Comparison<global::Int3>((x, y) =>
            {
                return ((Func<global::Int3, global::Int3, System.Int32>)act)(x, y);
            });
        });


        appdomain.DelegateManager.RegisterDelegateConvertor<System.Predicate<ILRuntime.Runtime.Intepreter.ILTypeInstance>>((act) =>

 ProjectSettings/AndroidResolverDependencies.xml

@@ -13,7 +13,7 @@
    <file>Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/7.1.0/firebase-app-unity-7.1.0.pom</file>
  </files>
  <settings>
    <setting name="androidAbis" value="armeabi-v7a" />
    <setting name="androidAbis" value="arm64-v8a,armeabi-v7a" />
    <setting name="bundleId" value="com.sanxiagame.zmjgp" />
    <setting name="explodeAars" value="True" />
    <setting name="gradleBuildEnabled" value="True" />

 ProjectSettings/GvhProjectSettings.xml

File was deleted