From 8680b2b992354013cb33c4c346abc60640319336 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期二, 01 七月 2025 17:37:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_client
---
Assets/Editor/SpritePacking/SpriteSettings.asset | 2 +-
Assets/Editor/UIComponent/CustomImageEditor.cs | 2 +-
Assets/Editor/ScriptEditor/RotationTweenEditor.cs | 2 +-
Assets/Editor/ScriptEditor/ScaleTweenEditor.cs | 2 +-
Assets/Editor/UIComponent/ToggleExEditor.cs | 2 +-
Assets/Editor/ScriptEditor/PositionTweenEditor.cs | 2 +-
Assets/Editor/UIComponent/PolylineImageEditor.cs | 2 +-
Assets/Editor/Tool/PrefabCreateTool.cs | 4 ++--
Assets/Editor/UIComponent/FlipScrollEditor.cs | 2 +-
Assets/Editor/ScriptEditor/TweenEditor.cs | 2 +-
Assets/Editor/UIPattern/CustomizedItemCell.prefab | 4 ++--
11 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Assets/Editor/ScriptEditor/PositionTweenEditor.cs b/Assets/Editor/ScriptEditor/PositionTweenEditor.cs
index 007755a..a388cc0 100644
--- a/Assets/Editor/ScriptEditor/PositionTweenEditor.cs
+++ b/Assets/Editor/ScriptEditor/PositionTweenEditor.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Wednesday, January 10, 2018
//--------------------------------------------------------
using UnityEditor;
diff --git a/Assets/Editor/ScriptEditor/RotationTweenEditor.cs b/Assets/Editor/ScriptEditor/RotationTweenEditor.cs
index bff6481..71d5e3b 100644
--- a/Assets/Editor/ScriptEditor/RotationTweenEditor.cs
+++ b/Assets/Editor/ScriptEditor/RotationTweenEditor.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Wednesday, January 10, 2018
//--------------------------------------------------------
using UnityEditor;
diff --git a/Assets/Editor/ScriptEditor/ScaleTweenEditor.cs b/Assets/Editor/ScriptEditor/ScaleTweenEditor.cs
index f98b69e..c993175 100644
--- a/Assets/Editor/ScriptEditor/ScaleTweenEditor.cs
+++ b/Assets/Editor/ScriptEditor/ScaleTweenEditor.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Wednesday, January 10, 2018
//--------------------------------------------------------
using UnityEditor;
diff --git a/Assets/Editor/ScriptEditor/TweenEditor.cs b/Assets/Editor/ScriptEditor/TweenEditor.cs
index d6c2b85..4c20df9 100644
--- a/Assets/Editor/ScriptEditor/TweenEditor.cs
+++ b/Assets/Editor/ScriptEditor/TweenEditor.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Wednesday, January 10, 2018
//--------------------------------------------------------
using UnityEngine;
diff --git a/Assets/Editor/SpritePacking/SpriteSettings.asset b/Assets/Editor/SpritePacking/SpriteSettings.asset
index f24b2ba..109eaf6 100644
--- a/Assets/Editor/SpritePacking/SpriteSettings.asset
+++ b/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
diff --git a/Assets/Editor/Tool/PrefabCreateTool.cs b/Assets/Editor/Tool/PrefabCreateTool.cs
index 2cf810a..6c2d885 100644
--- a/Assets/Editor/Tool/PrefabCreateTool.cs
+++ b/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;
diff --git a/Assets/Editor/UIComponent/CustomImageEditor.cs b/Assets/Editor/UIComponent/CustomImageEditor.cs
index ef21a82..f531592 100644
--- a/Assets/Editor/UIComponent/CustomImageEditor.cs
+++ b/Assets/Editor/UIComponent/CustomImageEditor.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Monday, August 14, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Assets/Editor/UIComponent/FlipScrollEditor.cs b/Assets/Editor/UIComponent/FlipScrollEditor.cs
index c332f86..4503fde 100644
--- a/Assets/Editor/UIComponent/FlipScrollEditor.cs
+++ b/Assets/Editor/UIComponent/FlipScrollEditor.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Monday, September 11, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Assets/Editor/UIComponent/PolylineImageEditor.cs b/Assets/Editor/UIComponent/PolylineImageEditor.cs
index bad7fea..e35e8e1 100644
--- a/Assets/Editor/UIComponent/PolylineImageEditor.cs
+++ b/Assets/Editor/UIComponent/PolylineImageEditor.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Monday, August 14, 2017
//--------------------------------------------------------
using UnityEngine;
diff --git a/Assets/Editor/UIComponent/ToggleExEditor.cs b/Assets/Editor/UIComponent/ToggleExEditor.cs
index f0b1d76..92a0912 100644
--- a/Assets/Editor/UIComponent/ToggleExEditor.cs
+++ b/Assets/Editor/UIComponent/ToggleExEditor.cs
@@ -1,5 +1,5 @@
锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
+// [Author]: 鐜╀釜娓告垙
// [ Date ]: Tuesday, August 15, 2017
//--------------------------------------------------------
using UnityEditor;
diff --git a/Assets/Editor/UIPattern/CustomizedItemCell.prefab b/Assets/Editor/UIPattern/CustomizedItemCell.prefab
index 72805a3..65945c8 100644
--- a/Assets/Editor/UIPattern/CustomizedItemCell.prefab
+++ b/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:
--
Gitblit v1.8.0