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

yyl

8 小时以前 705f3630dba34540e8ba6b941d0b650361ffdbdc

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

 Assets/Editor/SpritePacking/SpriteSettings.asset

@@ -849,3 +849,25 @@
      maxTextureSize: 2048
      textureCompression: 1
      textureFormat: 50
  - folderName: PrivilegeCard
    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

 Assets/Editor/Tool/PrefabCreateTool.cs

@@ -171,6 +171,8 @@
    public static void CreateButtonEx()
    {
        var button = UIUtility.CreateWidget("CommonButton", "CommonButton");
        var buttonEx = button.GetComponent<ButtonEx>();
        buttonEx.interval = 0.5f;
        SetParent(button);
    }