Merge branch 'master' into leonard

client_Wu Xijin

2018-11-01 cecdc26b2a4b290c0ee92366234b37f9bdc5499b

Merge branch 'master' into leonard

 Assets/Editor/Actor/ResourcesBuilder.cs

@@ -135,14 +135,15 @@
            outName = resName;

        }



        string _absOriginalePath = string.Format("{0}/ART/Role/{1}/{2}_Dm.FBX", Application.dataPath, path, resName);

        string _originalAssetPath = string.Format("Assets/ART/Role/{0}/{1}_Dm.FBX", path, resName);

        string _absOriginalePath = string.Format("{0}/ART/Role/{1}/{2}.FBX", Application.dataPath, path, resName);

        string _originalAssetPath = string.Format("Assets/ART/Role/{0}/{1}.FBX", path, resName);



        if ((!resName.StartsWith("A_Zs") && !resName.StartsWith("A_Fs"))

          || !suffix.Equals(InstanceResourcesLoader.raceSuffix))

        if ((resName.StartsWith("A_Zs") || resName.StartsWith("A_Fs"))

         && !isHighMesh

         && suffix.Equals(InstanceResourcesLoader.raceSuffix))

        {

            _absOriginalePath = string.Format("{0}/ART/Role/{1}/{2}.FBX", Application.dataPath, path, resName);

            _originalAssetPath = string.Format("Assets/ART/Role/{0}/{1}.FBX", path, resName);

            _absOriginalePath = string.Format("{0}/ART/Role/{1}/{2}_Dm.FBX", Application.dataPath, path, resName);

            _originalAssetPath = string.Format("Assets/ART/Role/{0}/{1}_Dm.FBX", path, resName);

        }



        string _tempPrefabName = outName;

@@ -580,7 +581,7 @@
            _assetPath = string.Format("{0}Mob/{1}/{2}{3}.controller", ResourcesPath.ResourcesOutAssetPath, resName, AnimatorControllerLoader.controllerRealmSuffix, resName);

        }



        if(templeName.Equals("Temple_AnimatorController_UI"))

        if (templeName.Equals("Temple_AnimatorController_UI"))

        {

            _absAssetPath = string.Format("{0}Mob/{1}/{2}{3}.controller", ResourcesPath.ResourcesOutPath, outName, AnimatorControllerLoader.controllerUISuffix, outName);

            _assetPath = string.Format("{0}Mob/{1}/{2}{3}.controller", ResourcesPath.ResourcesOutAssetPath, outName, AnimatorControllerLoader.controllerUISuffix, outName);


 Assets/Editor/Beebyte/Obfuscator/ObfuscatorOptions.asset

@@ -24,7 +24,7 @@
  stripLiteralEscapeCharacters: 1
  obfuscateMarkerInDecimal: 94
  RSAKeyLength: 1024
  addFakeCode: 1
  addFakeCode: 0
  minFalseMethodsPerClass: 10
  maxFalseMethodsPerClass: 50
  unicodeStartInDecimal: 65

 Assets/Editor/Tool/BuiltInResourceSetting.cs

@@ -39,7 +39,7 @@
                    platformSetting.allowsAlphaSplitting = false;
                    platformSetting.name = "iOS";
                    platformSetting.maxTextureSize = 1024;
                    platformSetting.format = TextureImporterFormat.PVRTC_RGBA4;
                    platformSetting.format = TextureImporterFormat.PVRTC_RGB4;
                    platformSetting.compressionQuality = 1;
                    break;
            }
@@ -87,7 +87,7 @@
                    platformSetting.allowsAlphaSplitting = false;
                    platformSetting.name = "iOS";
                    platformSetting.maxTextureSize = 1024;
                    platformSetting.format = TextureImporterFormat.PVRTC_RGBA4;
                    platformSetting.format = TextureImporterFormat.PVRTC_RGB4;
                    platformSetting.compressionQuality = 1;
                    break;
            }

 Assets/Resources/ScriptableObject/Curves/FairyCallMember.asset

New file
@@ -0,0 +1,61 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 5e8751910f36c154898b3bca27c09d8b, type: 3}
  m_Name: FairyCallMember
  m_EditorClassIdentifier: 
  curve:
    serializedVersion: 2
    m_Curve:
    - serializedVersion: 2
      time: 0
      value: 0
      inSlope: 1
      outSlope: 20
      tangentMode: 69
    - serializedVersion: 2
      time: 0.05
      value: 1
      inSlope: 20
      outSlope: -20
      tangentMode: 69
    - serializedVersion: 2
      time: 0.1
      value: 0
      inSlope: -20
      outSlope: 19.999998
      tangentMode: 69
    - serializedVersion: 2
      time: 0.15
      value: 1
      inSlope: 19.999998
      outSlope: -20.000002
      tangentMode: 69
    - serializedVersion: 2
      time: 0.2
      value: 0
      inSlope: -20.000002
      outSlope: 20.000008
      tangentMode: 69
    - serializedVersion: 2
      time: 0.225
      value: 0.5
      inSlope: 20.000008
      outSlope: -0
      tangentMode: 69
    - serializedVersion: 2
      time: 1
      value: 0.5
      inSlope: 0
      outSlope: 0.2004008
      tangentMode: 69
    m_PreInfinity: 2
    m_PostInfinity: 2
    m_RotationOrder: 0

 Assets/Resources/ScriptableObject/Curves/FairyCallMember.asset.meta

New file
@@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: f7a6513c68d4efe4998d60bf22dd6f3a
timeCreated: 1501145072
licenseType: Free
NativeFormatImporter:
  mainObjectFileID: 11400000
  userData: 
  assetBundleName: 
  assetBundleVariant: