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

yyl

15 小时以前 8680b2b992354013cb33c4c346abc60640319336

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

 Assets/Editor/ScriptEditor/PositionTweenEditor.cs

@@ -1,5 +1,5 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [Author]:           玩个游戏
//    [  Date ]:           Wednesday, January 10, 2018
//--------------------------------------------------------
using UnityEditor;

 Assets/Editor/ScriptEditor/RotationTweenEditor.cs

@@ -1,5 +1,5 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [Author]:           玩个游戏
//    [  Date ]:           Wednesday, January 10, 2018
//--------------------------------------------------------
using UnityEditor;

 Assets/Editor/ScriptEditor/ScaleTweenEditor.cs

@@ -1,5 +1,5 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [Author]:           玩个游戏
//    [  Date ]:           Wednesday, January 10, 2018
//--------------------------------------------------------
using UnityEditor;

 Assets/Editor/ScriptEditor/TweenEditor.cs

@@ -1,5 +1,5 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [Author]:           玩个游戏
//    [  Date ]:           Wednesday, January 10, 2018
//--------------------------------------------------------
using UnityEngine;

 Assets/Editor/SpritePacking/SpriteSettings.asset

@@ -343,7 +343,7 @@
      maxTextureSize: 2048
      textureCompression: 1
      textureFormat: 50
  - folderName: Hud
  - folderName: Title
    blockOffset: 1
    enableRotation: 0
    enableTightPacking: 0

 Assets/Editor/Tool/PrefabCreateTool.cs

@@ -1,5 +1,5 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [Author]:           玩个游戏
//    [  Date ]:           Tuesday, October 31, 2017
//--------------------------------------------------------
using UnityEngine;
@@ -134,7 +134,7 @@
    public static void CreateTextEx()
    {
        var instance = new GameObject("TextEx");
        var text = instance.AddComponent<TextEx>();

        var text = instance.AddComponent<TextEx>();
        text.font = FontUtility.preferred;
        text.fontSize = 22;
        text.alignment = TextAnchor.MiddleCenter;

 Assets/Editor/UIComponent/CustomImageEditor.cs

@@ -1,5 +1,5 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [Author]:           玩个游戏
//    [  Date ]:           Monday, August 14, 2017
//--------------------------------------------------------
using UnityEngine;

 Assets/Editor/UIComponent/FlipScrollEditor.cs

@@ -1,5 +1,5 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [Author]:           玩个游戏
//    [  Date ]:           Monday, September 11, 2017
//--------------------------------------------------------
using UnityEngine;

 Assets/Editor/UIComponent/PolylineImageEditor.cs

@@ -1,5 +1,5 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [Author]:           玩个游戏
//    [  Date ]:           Monday, August 14, 2017
//--------------------------------------------------------
using UnityEngine;

 Assets/Editor/UIComponent/ToggleExEditor.cs

@@ -1,5 +1,5 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [Author]:           玩个游戏
//    [  Date ]:           Tuesday, August 15, 2017
//--------------------------------------------------------
using UnityEditor;

 Assets/Editor/UIPattern/CustomizedItemCell.prefab

@@ -36,7 +36,7 @@
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 84, y: 84}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &621911517540831081
CanvasRenderer:
@@ -191,7 +191,7 @@
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 84, y: 84}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1751265100431819983
CanvasRenderer: