com.typhoon.unitysdk 1.0.10 → 1.0.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Editor/EditorIcons.cs +27 -45
- package/Editor/PreferencesWindow.cs +2 -3
- package/Editor/PublishVivoBatSettingWindow.cs +2 -3
- package/Editor/PublishWindow.cs +7 -4
- package/Editor/Skin.guiskin +66 -68
- package/Editor/SkinLight.guiskin +66 -68
- package/Editor/Styles.cs +1 -2
- package/Editor/StylesExtension.cs +7 -5
- package/Editor/Texture/icon_search.png +0 -0
- package/Editor/Texture/icon_search.png.meta +144 -0
- package/package.json +1 -1
- package/Editor/StyleEditorWindow.cs +0 -23
- package/Editor/StyleEditorWindow.cs.meta +0 -11
package/Editor/EditorIcons.cs
CHANGED
|
@@ -7,51 +7,17 @@ namespace TyphoonUnitySDK
|
|
|
7
7
|
{
|
|
8
8
|
private static string _folderPath = null;
|
|
9
9
|
private static string FolderPath => _folderPath ?? $"{UniEditor.PathRoot}/Editor/Texture";
|
|
10
|
-
private static Texture
|
|
11
|
-
public static Texture
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/
|
|
17
|
-
private static Texture
|
|
18
|
-
public static Texture
|
|
19
|
-
|
|
20
|
-
?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/
|
|
21
|
-
private static Texture __btn_blue_normal = null;
|
|
22
|
-
public static Texture btn_blue_normal =>
|
|
23
|
-
__btn_blue_normal
|
|
24
|
-
?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/btn_blue_normal.png");
|
|
25
|
-
private static Texture __btn_green_active = null;
|
|
26
|
-
public static Texture btn_green_active =>
|
|
27
|
-
__btn_green_active
|
|
28
|
-
?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/btn_green_active.png");
|
|
29
|
-
private static Texture __btn_green_hover = null;
|
|
30
|
-
public static Texture btn_green_hover =>
|
|
31
|
-
__btn_green_hover
|
|
32
|
-
?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/btn_green_hover.png");
|
|
33
|
-
private static Texture __btn_green_normal = null;
|
|
34
|
-
public static Texture btn_green_normal =>
|
|
35
|
-
__btn_green_normal
|
|
36
|
-
?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/btn_green_normal.png");
|
|
37
|
-
private static Texture __btn_hover = null;
|
|
38
|
-
public static Texture btn_hover =>
|
|
39
|
-
__btn_hover ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/btn_hover.png");
|
|
40
|
-
private static Texture __btn_normal = null;
|
|
41
|
-
public static Texture btn_normal =>
|
|
42
|
-
__btn_normal ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/btn_normal.png");
|
|
43
|
-
private static Texture __btn_yellow_active = null;
|
|
44
|
-
public static Texture btn_yellow_active =>
|
|
45
|
-
__btn_yellow_active
|
|
46
|
-
?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/btn_yellow_active.png");
|
|
47
|
-
private static Texture __btn_yellow_hover = null;
|
|
48
|
-
public static Texture btn_yellow_hover =>
|
|
49
|
-
__btn_yellow_hover
|
|
50
|
-
?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/btn_yellow_hover.png");
|
|
51
|
-
private static Texture __btn_yellow_normal = null;
|
|
52
|
-
public static Texture btn_yellow_normal =>
|
|
53
|
-
__btn_yellow_normal
|
|
54
|
-
?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/btn_yellow_normal.png");
|
|
10
|
+
private static Texture __dark_active = null;
|
|
11
|
+
public static Texture dark_active =>
|
|
12
|
+
__dark_active
|
|
13
|
+
?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/dark_active.png");
|
|
14
|
+
private static Texture __dark_hover = null;
|
|
15
|
+
public static Texture dark_hover =>
|
|
16
|
+
__dark_hover ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/dark_hover.png");
|
|
17
|
+
private static Texture __dark_normal = null;
|
|
18
|
+
public static Texture dark_normal =>
|
|
19
|
+
__dark_normal
|
|
20
|
+
?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/dark_normal.png");
|
|
55
21
|
private static Texture __icon_android = null;
|
|
56
22
|
public static Texture icon_android =>
|
|
57
23
|
__icon_android
|
|
@@ -95,6 +61,10 @@ namespace TyphoonUnitySDK
|
|
|
95
61
|
private static Texture __icon_save = null;
|
|
96
62
|
public static Texture icon_save =>
|
|
97
63
|
__icon_save ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_save.png");
|
|
64
|
+
private static Texture __icon_search = null;
|
|
65
|
+
public static Texture icon_search =>
|
|
66
|
+
__icon_search
|
|
67
|
+
?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_search.png");
|
|
98
68
|
private static Texture __icon_success = null;
|
|
99
69
|
public static Texture icon_success =>
|
|
100
70
|
__icon_success
|
|
@@ -106,6 +76,18 @@ namespace TyphoonUnitySDK
|
|
|
106
76
|
public static Texture icon_wechat =>
|
|
107
77
|
__icon_wechat
|
|
108
78
|
?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_wechat.png");
|
|
79
|
+
private static Texture __light_active = null;
|
|
80
|
+
public static Texture light_active =>
|
|
81
|
+
__light_active
|
|
82
|
+
?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/light_active.png");
|
|
83
|
+
private static Texture __light_hover = null;
|
|
84
|
+
public static Texture light_hover =>
|
|
85
|
+
__light_hover
|
|
86
|
+
?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/light_hover.png");
|
|
87
|
+
private static Texture __light_normal = null;
|
|
88
|
+
public static Texture light_normal =>
|
|
89
|
+
__light_normal
|
|
90
|
+
?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/light_normal.png");
|
|
109
91
|
private static Texture __tex_select = null;
|
|
110
92
|
public static Texture tex_select =>
|
|
111
93
|
__tex_select ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/tex_select.png");
|
|
@@ -7,7 +7,7 @@ using Object = UnityEngine.Object;
|
|
|
7
7
|
|
|
8
8
|
namespace TyphoonUnitySDK
|
|
9
9
|
{
|
|
10
|
-
public class PreferencesWindow :
|
|
10
|
+
public class PreferencesWindow : EditorWindow
|
|
11
11
|
{
|
|
12
12
|
/// <summary>
|
|
13
13
|
/// 绑定重绘逻辑
|
|
@@ -50,9 +50,8 @@ namespace TyphoonUnitySDK
|
|
|
50
50
|
}
|
|
51
51
|
|
|
52
52
|
|
|
53
|
-
protected
|
|
53
|
+
protected void OnGUI()
|
|
54
54
|
{
|
|
55
|
-
base.OnDrawGUI();
|
|
56
55
|
var rect = new Rect(0, 0, position.width, position.height);
|
|
57
56
|
var area = rect;
|
|
58
57
|
area.height -= 8;
|
|
@@ -3,7 +3,7 @@ using UnityEngine;
|
|
|
3
3
|
|
|
4
4
|
namespace TyphoonUnitySDK
|
|
5
5
|
{
|
|
6
|
-
public class PublishVivoBatSettingWindow :
|
|
6
|
+
public class PublishVivoBatSettingWindow : EditorWindow
|
|
7
7
|
{
|
|
8
8
|
[MenuItem("临时发布/发布vivo", priority = 10000)]
|
|
9
9
|
public static void Open()
|
|
@@ -36,9 +36,8 @@ namespace TyphoonUnitySDK
|
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
|
|
39
|
-
protected
|
|
39
|
+
protected void OnGUI()
|
|
40
40
|
{
|
|
41
|
-
base.OnDrawGUI();
|
|
42
41
|
var rect = new Rect(0, 0, position.width, position.height);
|
|
43
42
|
var area = rect;
|
|
44
43
|
area.height -= 8;
|
package/Editor/PublishWindow.cs
CHANGED
|
@@ -5,7 +5,7 @@ using UnityEngine;
|
|
|
5
5
|
|
|
6
6
|
namespace TyphoonUnitySDK
|
|
7
7
|
{
|
|
8
|
-
public class PublishWindow :
|
|
8
|
+
public class PublishWindow : EditorWindow
|
|
9
9
|
{
|
|
10
10
|
//锁定,未开放
|
|
11
11
|
private static HashSet<AppChannel> _LockChannel = new HashSet<AppChannel>()
|
|
@@ -76,9 +76,9 @@ namespace TyphoonUnitySDK
|
|
|
76
76
|
ReloadSettings();
|
|
77
77
|
}
|
|
78
78
|
|
|
79
|
-
protected
|
|
79
|
+
protected void OnGUI()
|
|
80
80
|
{
|
|
81
|
-
|
|
81
|
+
|
|
82
82
|
var temEnable = GUI.enabled;
|
|
83
83
|
if (EditorApplication.isPlaying)
|
|
84
84
|
{
|
|
@@ -152,7 +152,10 @@ namespace TyphoonUnitySDK
|
|
|
152
152
|
var rectSearch = rectLeftMenu;
|
|
153
153
|
rectSearch.y = rectToolbar.yMax;
|
|
154
154
|
rectSearch.height = 22;
|
|
155
|
-
InputTxtSearchSetting = GUI.TextField(rectSearch, InputTxtSearchSetting
|
|
155
|
+
InputTxtSearchSetting = GUI.TextField(rectSearch, InputTxtSearchSetting);
|
|
156
|
+
if(string.IsNullOrEmpty(InputTxtSearchSetting)){
|
|
157
|
+
GUI.Label(rectSearch,"搜索...",Styles.rlabel_italic);
|
|
158
|
+
}
|
|
156
159
|
|
|
157
160
|
/*绘制菜单栏*/
|
|
158
161
|
var rectPos = rectLeftMenu;
|
package/Editor/Skin.guiskin
CHANGED
|
@@ -1390,74 +1390,6 @@ MonoBehaviour:
|
|
|
1390
1390
|
m_StretchWidth: 1
|
|
1391
1391
|
m_StretchHeight: 0
|
|
1392
1392
|
m_CustomStyles:
|
|
1393
|
-
- m_Name: SearchTextField
|
|
1394
|
-
m_Normal:
|
|
1395
|
-
m_Background: {fileID: 0}
|
|
1396
|
-
m_ScaledBackgrounds:
|
|
1397
|
-
- {fileID: -8620864801757323007, guid: 0000000000000000d000000000000000, type: 0}
|
|
1398
|
-
m_TextColor: {r: 0.8235294, g: 0.8235294, b: 0.8235294, a: 1}
|
|
1399
|
-
m_Hover:
|
|
1400
|
-
m_Background: {fileID: 0}
|
|
1401
|
-
m_ScaledBackgrounds: []
|
|
1402
|
-
m_TextColor: {r: 0.8235294, g: 0.8235294, b: 0.8235294, a: 1}
|
|
1403
|
-
m_Active:
|
|
1404
|
-
m_Background: {fileID: 0}
|
|
1405
|
-
m_ScaledBackgrounds: []
|
|
1406
|
-
m_TextColor: {r: 0.8235294, g: 0.8235294, b: 0.8235294, a: 1}
|
|
1407
|
-
m_Focused:
|
|
1408
|
-
m_Background: {fileID: 0}
|
|
1409
|
-
m_ScaledBackgrounds:
|
|
1410
|
-
- {fileID: -3046269524464749635, guid: 0000000000000000d000000000000000, type: 0}
|
|
1411
|
-
m_TextColor: {r: 0.8235294, g: 0.8235294, b: 0.8235294, a: 1}
|
|
1412
|
-
m_OnNormal:
|
|
1413
|
-
m_Background: {fileID: 0}
|
|
1414
|
-
m_ScaledBackgrounds: []
|
|
1415
|
-
m_TextColor: {r: 0.8235294, g: 0.8235294, b: 0.8235294, a: 1}
|
|
1416
|
-
m_OnHover:
|
|
1417
|
-
m_Background: {fileID: 0}
|
|
1418
|
-
m_ScaledBackgrounds: []
|
|
1419
|
-
m_TextColor: {r: 0.8235294, g: 0.8235294, b: 0.8235294, a: 1}
|
|
1420
|
-
m_OnActive:
|
|
1421
|
-
m_Background: {fileID: 0}
|
|
1422
|
-
m_ScaledBackgrounds: []
|
|
1423
|
-
m_TextColor: {r: 0.8235294, g: 0.8235294, b: 0.8235294, a: 1}
|
|
1424
|
-
m_OnFocused:
|
|
1425
|
-
m_Background: {fileID: 0}
|
|
1426
|
-
m_ScaledBackgrounds: []
|
|
1427
|
-
m_TextColor: {r: 0.8235294, g: 0.8235294, b: 0.8235294, a: 1}
|
|
1428
|
-
m_Border:
|
|
1429
|
-
m_Left: 17
|
|
1430
|
-
m_Right: 0
|
|
1431
|
-
m_Top: 0
|
|
1432
|
-
m_Bottom: 0
|
|
1433
|
-
m_Margin:
|
|
1434
|
-
m_Left: 3
|
|
1435
|
-
m_Right: 3
|
|
1436
|
-
m_Top: 2
|
|
1437
|
-
m_Bottom: 2
|
|
1438
|
-
m_Padding:
|
|
1439
|
-
m_Left: 14
|
|
1440
|
-
m_Right: 14
|
|
1441
|
-
m_Top: 0
|
|
1442
|
-
m_Bottom: 0
|
|
1443
|
-
m_Overflow:
|
|
1444
|
-
m_Left: 0
|
|
1445
|
-
m_Right: 0
|
|
1446
|
-
m_Top: 0
|
|
1447
|
-
m_Bottom: 0
|
|
1448
|
-
m_Font: {fileID: 0}
|
|
1449
|
-
m_FontSize: 11
|
|
1450
|
-
m_FontStyle: 0
|
|
1451
|
-
m_Alignment: 3
|
|
1452
|
-
m_WordWrap: 0
|
|
1453
|
-
m_RichText: 0
|
|
1454
|
-
m_TextClipping: 1
|
|
1455
|
-
m_ImagePosition: 0
|
|
1456
|
-
m_ContentOffset: {x: 0, y: 0}
|
|
1457
|
-
m_FixedWidth: 0
|
|
1458
|
-
m_FixedHeight: 16
|
|
1459
|
-
m_StretchWidth: 1
|
|
1460
|
-
m_StretchHeight: 0
|
|
1461
1393
|
- m_Name: rbutton
|
|
1462
1394
|
m_Normal:
|
|
1463
1395
|
m_Background: {fileID: 2800000, guid: 1f5f7dbcaa7483f49a0d352bbb800cd5, type: 3}
|
|
@@ -1922,6 +1854,72 @@ MonoBehaviour:
|
|
|
1922
1854
|
m_FixedHeight: 0
|
|
1923
1855
|
m_StretchWidth: 0
|
|
1924
1856
|
m_StretchHeight: 0
|
|
1857
|
+
- m_Name: rlabel_italic
|
|
1858
|
+
m_Normal:
|
|
1859
|
+
m_Background: {fileID: 0}
|
|
1860
|
+
m_ScaledBackgrounds: []
|
|
1861
|
+
m_TextColor: {r: 0.76862746, g: 0.76862746, b: 0.76862746, a: 0.627451}
|
|
1862
|
+
m_Hover:
|
|
1863
|
+
m_Background: {fileID: 0}
|
|
1864
|
+
m_ScaledBackgrounds: []
|
|
1865
|
+
m_TextColor: {r: 0.76862746, g: 0.76862746, b: 0.76862746, a: 1}
|
|
1866
|
+
m_Active:
|
|
1867
|
+
m_Background: {fileID: 0}
|
|
1868
|
+
m_ScaledBackgrounds: []
|
|
1869
|
+
m_TextColor: {r: 0.76862746, g: 0.76862746, b: 0.76862746, a: 1}
|
|
1870
|
+
m_Focused:
|
|
1871
|
+
m_Background: {fileID: 0}
|
|
1872
|
+
m_ScaledBackgrounds: []
|
|
1873
|
+
m_TextColor: {r: 0.5058824, g: 0.7058824, b: 1, a: 1}
|
|
1874
|
+
m_OnNormal:
|
|
1875
|
+
m_Background: {fileID: 0}
|
|
1876
|
+
m_ScaledBackgrounds: []
|
|
1877
|
+
m_TextColor: {r: 0.76862746, g: 0.76862746, b: 0.76862746, a: 1}
|
|
1878
|
+
m_OnHover:
|
|
1879
|
+
m_Background: {fileID: 0}
|
|
1880
|
+
m_ScaledBackgrounds: []
|
|
1881
|
+
m_TextColor: {r: 0.76862746, g: 0.76862746, b: 0.76862746, a: 1}
|
|
1882
|
+
m_OnActive:
|
|
1883
|
+
m_Background: {fileID: 0}
|
|
1884
|
+
m_ScaledBackgrounds: []
|
|
1885
|
+
m_TextColor: {r: 0.76862746, g: 0.76862746, b: 0.76862746, a: 1}
|
|
1886
|
+
m_OnFocused:
|
|
1887
|
+
m_Background: {fileID: 0}
|
|
1888
|
+
m_ScaledBackgrounds: []
|
|
1889
|
+
m_TextColor: {r: 1, g: 1, b: 1, a: 1}
|
|
1890
|
+
m_Border:
|
|
1891
|
+
m_Left: 0
|
|
1892
|
+
m_Right: 0
|
|
1893
|
+
m_Top: 0
|
|
1894
|
+
m_Bottom: 0
|
|
1895
|
+
m_Margin:
|
|
1896
|
+
m_Left: 2
|
|
1897
|
+
m_Right: 2
|
|
1898
|
+
m_Top: 2
|
|
1899
|
+
m_Bottom: 2
|
|
1900
|
+
m_Padding:
|
|
1901
|
+
m_Left: 2
|
|
1902
|
+
m_Right: 0
|
|
1903
|
+
m_Top: 2
|
|
1904
|
+
m_Bottom: 0
|
|
1905
|
+
m_Overflow:
|
|
1906
|
+
m_Left: 0
|
|
1907
|
+
m_Right: 0
|
|
1908
|
+
m_Top: 0
|
|
1909
|
+
m_Bottom: 0
|
|
1910
|
+
m_Font: {fileID: 0}
|
|
1911
|
+
m_FontSize: 12
|
|
1912
|
+
m_FontStyle: 2
|
|
1913
|
+
m_Alignment: 0
|
|
1914
|
+
m_WordWrap: 0
|
|
1915
|
+
m_RichText: 0
|
|
1916
|
+
m_TextClipping: 1
|
|
1917
|
+
m_ImagePosition: 0
|
|
1918
|
+
m_ContentOffset: {x: 0, y: 0}
|
|
1919
|
+
m_FixedWidth: 0
|
|
1920
|
+
m_FixedHeight: 0
|
|
1921
|
+
m_StretchWidth: 0
|
|
1922
|
+
m_StretchHeight: 0
|
|
1925
1923
|
m_Settings:
|
|
1926
1924
|
m_DoubleClickSelectsWord: 1
|
|
1927
1925
|
m_TripleClickSelectsLine: 1
|
package/Editor/SkinLight.guiskin
CHANGED
|
@@ -1390,74 +1390,6 @@ MonoBehaviour:
|
|
|
1390
1390
|
m_StretchWidth: 1
|
|
1391
1391
|
m_StretchHeight: 0
|
|
1392
1392
|
m_CustomStyles:
|
|
1393
|
-
- m_Name: SearchTextField
|
|
1394
|
-
m_Normal:
|
|
1395
|
-
m_Background: {fileID: 0}
|
|
1396
|
-
m_ScaledBackgrounds:
|
|
1397
|
-
- {fileID: -8620864801757323007, guid: 0000000000000000d000000000000000, type: 0}
|
|
1398
|
-
m_TextColor: {r: 0.03529412, g: 0.03529412, b: 0.03529412, a: 1}
|
|
1399
|
-
m_Hover:
|
|
1400
|
-
m_Background: {fileID: 0}
|
|
1401
|
-
m_ScaledBackgrounds: []
|
|
1402
|
-
m_TextColor: {r: 0.03529412, g: 0.03529412, b: 0.03529412, a: 1}
|
|
1403
|
-
m_Active:
|
|
1404
|
-
m_Background: {fileID: 0}
|
|
1405
|
-
m_ScaledBackgrounds: []
|
|
1406
|
-
m_TextColor: {r: 0.03529412, g: 0.03529412, b: 0.03529412, a: 1}
|
|
1407
|
-
m_Focused:
|
|
1408
|
-
m_Background: {fileID: 0}
|
|
1409
|
-
m_ScaledBackgrounds:
|
|
1410
|
-
- {fileID: -3046269524464749635, guid: 0000000000000000d000000000000000, type: 0}
|
|
1411
|
-
m_TextColor: {r: 0.03529412, g: 0.03529412, b: 0.03529412, a: 1}
|
|
1412
|
-
m_OnNormal:
|
|
1413
|
-
m_Background: {fileID: 0}
|
|
1414
|
-
m_ScaledBackgrounds: []
|
|
1415
|
-
m_TextColor: {r: 0.03529412, g: 0.03529412, b: 0.03529412, a: 1}
|
|
1416
|
-
m_OnHover:
|
|
1417
|
-
m_Background: {fileID: 0}
|
|
1418
|
-
m_ScaledBackgrounds: []
|
|
1419
|
-
m_TextColor: {r: 0.03529412, g: 0.03529412, b: 0.03529412, a: 1}
|
|
1420
|
-
m_OnActive:
|
|
1421
|
-
m_Background: {fileID: 0}
|
|
1422
|
-
m_ScaledBackgrounds: []
|
|
1423
|
-
m_TextColor: {r: 0.03529412, g: 0.03529412, b: 0.03529412, a: 1}
|
|
1424
|
-
m_OnFocused:
|
|
1425
|
-
m_Background: {fileID: 0}
|
|
1426
|
-
m_ScaledBackgrounds: []
|
|
1427
|
-
m_TextColor: {r: 0.12156863, g: 0.31764707, b: 0.57254905, a: 1}
|
|
1428
|
-
m_Border:
|
|
1429
|
-
m_Left: 17
|
|
1430
|
-
m_Right: 0
|
|
1431
|
-
m_Top: 0
|
|
1432
|
-
m_Bottom: 0
|
|
1433
|
-
m_Margin:
|
|
1434
|
-
m_Left: 3
|
|
1435
|
-
m_Right: 3
|
|
1436
|
-
m_Top: 2
|
|
1437
|
-
m_Bottom: 2
|
|
1438
|
-
m_Padding:
|
|
1439
|
-
m_Left: 14
|
|
1440
|
-
m_Right: 14
|
|
1441
|
-
m_Top: 0
|
|
1442
|
-
m_Bottom: 0
|
|
1443
|
-
m_Overflow:
|
|
1444
|
-
m_Left: 0
|
|
1445
|
-
m_Right: 0
|
|
1446
|
-
m_Top: 0
|
|
1447
|
-
m_Bottom: 0
|
|
1448
|
-
m_Font: {fileID: 0}
|
|
1449
|
-
m_FontSize: 11
|
|
1450
|
-
m_FontStyle: 0
|
|
1451
|
-
m_Alignment: 3
|
|
1452
|
-
m_WordWrap: 0
|
|
1453
|
-
m_RichText: 0
|
|
1454
|
-
m_TextClipping: 1
|
|
1455
|
-
m_ImagePosition: 0
|
|
1456
|
-
m_ContentOffset: {x: 0, y: 0}
|
|
1457
|
-
m_FixedWidth: 0
|
|
1458
|
-
m_FixedHeight: 16
|
|
1459
|
-
m_StretchWidth: 1
|
|
1460
|
-
m_StretchHeight: 0
|
|
1461
1393
|
- m_Name: rbutton
|
|
1462
1394
|
m_Normal:
|
|
1463
1395
|
m_Background: {fileID: 2800000, guid: b2133d03b49dffb40870e2c2b4c9a035, type: 3}
|
|
@@ -1988,6 +1920,72 @@ MonoBehaviour:
|
|
|
1988
1920
|
m_FixedHeight: 0
|
|
1989
1921
|
m_StretchWidth: 0
|
|
1990
1922
|
m_StretchHeight: 0
|
|
1923
|
+
- m_Name: rlabel_italic
|
|
1924
|
+
m_Normal:
|
|
1925
|
+
m_Background: {fileID: 0}
|
|
1926
|
+
m_ScaledBackgrounds: []
|
|
1927
|
+
m_TextColor: {r: 0.13725491, g: 0.13725491, b: 0.13725491, a: 0.627451}
|
|
1928
|
+
m_Hover:
|
|
1929
|
+
m_Background: {fileID: 0}
|
|
1930
|
+
m_ScaledBackgrounds: []
|
|
1931
|
+
m_TextColor: {r: 0.13725491, g: 0.13725491, b: 0.13725491, a: 1}
|
|
1932
|
+
m_Active:
|
|
1933
|
+
m_Background: {fileID: 0}
|
|
1934
|
+
m_ScaledBackgrounds: []
|
|
1935
|
+
m_TextColor: {r: 0.13725491, g: 0.13725491, b: 0.13725491, a: 1}
|
|
1936
|
+
m_Focused:
|
|
1937
|
+
m_Background: {fileID: 0}
|
|
1938
|
+
m_ScaledBackgrounds: []
|
|
1939
|
+
m_TextColor: {r: 0.12156863, g: 0.31764707, b: 0.57254905, a: 1}
|
|
1940
|
+
m_OnNormal:
|
|
1941
|
+
m_Background: {fileID: 0}
|
|
1942
|
+
m_ScaledBackgrounds: []
|
|
1943
|
+
m_TextColor: {r: 0.13725491, g: 0.13725491, b: 0.13725491, a: 1}
|
|
1944
|
+
m_OnHover:
|
|
1945
|
+
m_Background: {fileID: 0}
|
|
1946
|
+
m_ScaledBackgrounds: []
|
|
1947
|
+
m_TextColor: {r: 0.13725491, g: 0.13725491, b: 0.13725491, a: 1}
|
|
1948
|
+
m_OnActive:
|
|
1949
|
+
m_Background: {fileID: 0}
|
|
1950
|
+
m_ScaledBackgrounds: []
|
|
1951
|
+
m_TextColor: {r: 0.13725491, g: 0.13725491, b: 0.13725491, a: 1}
|
|
1952
|
+
m_OnFocused:
|
|
1953
|
+
m_Background: {fileID: 0}
|
|
1954
|
+
m_ScaledBackgrounds: []
|
|
1955
|
+
m_TextColor: {r: 0.12156863, g: 0.31764707, b: 0.57254905, a: 1}
|
|
1956
|
+
m_Border:
|
|
1957
|
+
m_Left: 0
|
|
1958
|
+
m_Right: 0
|
|
1959
|
+
m_Top: 0
|
|
1960
|
+
m_Bottom: 0
|
|
1961
|
+
m_Margin:
|
|
1962
|
+
m_Left: 2
|
|
1963
|
+
m_Right: 2
|
|
1964
|
+
m_Top: 2
|
|
1965
|
+
m_Bottom: 2
|
|
1966
|
+
m_Padding:
|
|
1967
|
+
m_Left: 2
|
|
1968
|
+
m_Right: 2
|
|
1969
|
+
m_Top: 0
|
|
1970
|
+
m_Bottom: 0
|
|
1971
|
+
m_Overflow:
|
|
1972
|
+
m_Left: 0
|
|
1973
|
+
m_Right: 0
|
|
1974
|
+
m_Top: 0
|
|
1975
|
+
m_Bottom: 0
|
|
1976
|
+
m_Font: {fileID: 0}
|
|
1977
|
+
m_FontSize: 12
|
|
1978
|
+
m_FontStyle: 2
|
|
1979
|
+
m_Alignment: 3
|
|
1980
|
+
m_WordWrap: 0
|
|
1981
|
+
m_RichText: 0
|
|
1982
|
+
m_TextClipping: 1
|
|
1983
|
+
m_ImagePosition: 0
|
|
1984
|
+
m_ContentOffset: {x: 0, y: 0}
|
|
1985
|
+
m_FixedWidth: 0
|
|
1986
|
+
m_FixedHeight: 0
|
|
1987
|
+
m_StretchWidth: 0
|
|
1988
|
+
m_StretchHeight: 0
|
|
1991
1989
|
m_Settings:
|
|
1992
1990
|
m_DoubleClickSelectsWord: 1
|
|
1993
1991
|
m_TripleClickSelectsLine: 1
|
package/Editor/Styles.cs
CHANGED
|
@@ -29,14 +29,13 @@ namespace TyphoonUnitySDK
|
|
|
29
29
|
return null;
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
-
public static GUIStyle SearchTextField => Get("SearchTextField");
|
|
33
32
|
public static GUIStyle rbutton => Get("rbutton");
|
|
34
33
|
public static GUIStyle rbutton_left => Get("rbutton_left");
|
|
35
34
|
public static GUIStyle rbutton_left_active => Get("rbutton_left_active");
|
|
36
35
|
public static GUIStyle rbold_label => Get("rbold_label");
|
|
37
36
|
public static GUIStyle DropDownButton => Get("DropDownButton");
|
|
38
|
-
public static GUIStyle ToolbarTitleLab => Get("ToolbarTitleLab");
|
|
39
37
|
public static GUIStyle rbutton_bold => Get("rbutton_bold");
|
|
40
38
|
public static GUIStyle rbold_title => Get("rbold_title");
|
|
39
|
+
public static GUIStyle rlabel_italic => Get("rlabel_italic");
|
|
41
40
|
}
|
|
42
41
|
}
|
|
@@ -6,20 +6,22 @@ namespace TyphoonUnitySDK
|
|
|
6
6
|
{
|
|
7
7
|
public partial class Styles
|
|
8
8
|
{
|
|
9
|
-
private static GUIStyle
|
|
9
|
+
private static GUIStyle _dropDownButtonLeft = null;
|
|
10
10
|
|
|
11
11
|
public static GUIStyle DropDownButtonLeft
|
|
12
12
|
{
|
|
13
13
|
get
|
|
14
14
|
{
|
|
15
|
-
if (
|
|
15
|
+
if (_dropDownButtonLeft == null)
|
|
16
16
|
{
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
_dropDownButtonLeft = new GUIStyle(Styles.DropDownButton);
|
|
18
|
+
_dropDownButtonLeft.alignment = TextAnchor.MiddleLeft;
|
|
19
19
|
}
|
|
20
20
|
|
|
21
|
-
return
|
|
21
|
+
return _dropDownButtonLeft;
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
|
+
|
|
25
|
+
|
|
24
26
|
}
|
|
25
27
|
}
|
|
Binary file
|
|
@@ -0,0 +1,144 @@
|
|
|
1
|
+
fileFormatVersion: 2
|
|
2
|
+
guid: 54c8b0a6eab6ba448b4f5dfa1ddffb1d
|
|
3
|
+
TextureImporter:
|
|
4
|
+
internalIDToNameTable: []
|
|
5
|
+
externalObjects: {}
|
|
6
|
+
serializedVersion: 11
|
|
7
|
+
mipmaps:
|
|
8
|
+
mipMapMode: 0
|
|
9
|
+
enableMipMap: 1
|
|
10
|
+
sRGBTexture: 1
|
|
11
|
+
linearTexture: 0
|
|
12
|
+
fadeOut: 0
|
|
13
|
+
borderMipMap: 0
|
|
14
|
+
mipMapsPreserveCoverage: 0
|
|
15
|
+
alphaTestReferenceValue: 0.5
|
|
16
|
+
mipMapFadeDistanceStart: 1
|
|
17
|
+
mipMapFadeDistanceEnd: 3
|
|
18
|
+
bumpmap:
|
|
19
|
+
convertToNormalMap: 0
|
|
20
|
+
externalNormalMap: 0
|
|
21
|
+
heightScale: 0.25
|
|
22
|
+
normalMapFilter: 0
|
|
23
|
+
isReadable: 0
|
|
24
|
+
streamingMipmaps: 0
|
|
25
|
+
streamingMipmapsPriority: 0
|
|
26
|
+
vTOnly: 0
|
|
27
|
+
grayScaleToAlpha: 0
|
|
28
|
+
generateCubemap: 6
|
|
29
|
+
cubemapConvolution: 0
|
|
30
|
+
seamlessCubemap: 0
|
|
31
|
+
textureFormat: 1
|
|
32
|
+
maxTextureSize: 2048
|
|
33
|
+
textureSettings:
|
|
34
|
+
serializedVersion: 2
|
|
35
|
+
filterMode: 1
|
|
36
|
+
aniso: 1
|
|
37
|
+
mipBias: 0
|
|
38
|
+
wrapU: 0
|
|
39
|
+
wrapV: 0
|
|
40
|
+
wrapW: 0
|
|
41
|
+
nPOTScale: 1
|
|
42
|
+
lightmap: 0
|
|
43
|
+
compressionQuality: 50
|
|
44
|
+
spriteMode: 0
|
|
45
|
+
spriteExtrude: 1
|
|
46
|
+
spriteMeshType: 1
|
|
47
|
+
alignment: 0
|
|
48
|
+
spritePivot: {x: 0.5, y: 0.5}
|
|
49
|
+
spritePixelsToUnits: 100
|
|
50
|
+
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
|
51
|
+
spriteGenerateFallbackPhysicsShape: 1
|
|
52
|
+
alphaUsage: 1
|
|
53
|
+
alphaIsTransparency: 1
|
|
54
|
+
spriteTessellationDetail: -1
|
|
55
|
+
textureType: 0
|
|
56
|
+
textureShape: 1
|
|
57
|
+
singleChannelComponent: 0
|
|
58
|
+
flipbookRows: 1
|
|
59
|
+
flipbookColumns: 1
|
|
60
|
+
maxTextureSizeSet: 0
|
|
61
|
+
compressionQualitySet: 0
|
|
62
|
+
textureFormatSet: 0
|
|
63
|
+
ignorePngGamma: 0
|
|
64
|
+
applyGammaDecoding: 0
|
|
65
|
+
platformSettings:
|
|
66
|
+
- serializedVersion: 3
|
|
67
|
+
buildTarget: DefaultTexturePlatform
|
|
68
|
+
maxTextureSize: 2048
|
|
69
|
+
resizeAlgorithm: 0
|
|
70
|
+
textureFormat: -1
|
|
71
|
+
textureCompression: 1
|
|
72
|
+
compressionQuality: 50
|
|
73
|
+
crunchedCompression: 0
|
|
74
|
+
allowsAlphaSplitting: 0
|
|
75
|
+
overridden: 0
|
|
76
|
+
androidETC2FallbackOverride: 0
|
|
77
|
+
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
78
|
+
- serializedVersion: 3
|
|
79
|
+
buildTarget: Standalone
|
|
80
|
+
maxTextureSize: 2048
|
|
81
|
+
resizeAlgorithm: 0
|
|
82
|
+
textureFormat: -1
|
|
83
|
+
textureCompression: 1
|
|
84
|
+
compressionQuality: 50
|
|
85
|
+
crunchedCompression: 0
|
|
86
|
+
allowsAlphaSplitting: 0
|
|
87
|
+
overridden: 0
|
|
88
|
+
androidETC2FallbackOverride: 0
|
|
89
|
+
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
90
|
+
- serializedVersion: 3
|
|
91
|
+
buildTarget: iPhone
|
|
92
|
+
maxTextureSize: 2048
|
|
93
|
+
resizeAlgorithm: 0
|
|
94
|
+
textureFormat: -1
|
|
95
|
+
textureCompression: 1
|
|
96
|
+
compressionQuality: 50
|
|
97
|
+
crunchedCompression: 0
|
|
98
|
+
allowsAlphaSplitting: 0
|
|
99
|
+
overridden: 0
|
|
100
|
+
androidETC2FallbackOverride: 0
|
|
101
|
+
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
102
|
+
- serializedVersion: 3
|
|
103
|
+
buildTarget: WebGL
|
|
104
|
+
maxTextureSize: 2048
|
|
105
|
+
resizeAlgorithm: 0
|
|
106
|
+
textureFormat: -1
|
|
107
|
+
textureCompression: 1
|
|
108
|
+
compressionQuality: 50
|
|
109
|
+
crunchedCompression: 0
|
|
110
|
+
allowsAlphaSplitting: 0
|
|
111
|
+
overridden: 0
|
|
112
|
+
androidETC2FallbackOverride: 0
|
|
113
|
+
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
114
|
+
- serializedVersion: 3
|
|
115
|
+
buildTarget: Android
|
|
116
|
+
maxTextureSize: 2048
|
|
117
|
+
resizeAlgorithm: 0
|
|
118
|
+
textureFormat: -1
|
|
119
|
+
textureCompression: 1
|
|
120
|
+
compressionQuality: 50
|
|
121
|
+
crunchedCompression: 0
|
|
122
|
+
allowsAlphaSplitting: 0
|
|
123
|
+
overridden: 0
|
|
124
|
+
androidETC2FallbackOverride: 0
|
|
125
|
+
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
126
|
+
spriteSheet:
|
|
127
|
+
serializedVersion: 2
|
|
128
|
+
sprites: []
|
|
129
|
+
outline: []
|
|
130
|
+
physicsShape: []
|
|
131
|
+
bones: []
|
|
132
|
+
spriteID:
|
|
133
|
+
internalID: 0
|
|
134
|
+
vertices: []
|
|
135
|
+
indices:
|
|
136
|
+
edges: []
|
|
137
|
+
weights: []
|
|
138
|
+
secondaryTextures: []
|
|
139
|
+
spritePackingTag:
|
|
140
|
+
pSDRemoveMatte: 0
|
|
141
|
+
pSDShowRemoveMatteOption: 0
|
|
142
|
+
userData:
|
|
143
|
+
assetBundleName:
|
|
144
|
+
assetBundleVariant:
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.
|
|
1
|
+
{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.11","description":"unity端个汇总渠道的sdk,统一接口,一键发布","unity":"2018.1","type":"tool","hideInEditor":false,"author":{"name":"Jan Zhang","email":"","url":""},"changelogUrl":"","documentationUrl":"","keywords":["typhoon"],"license":"","licensesUrl":"","customDependencies":[{"PackageName":"com.unity.nuget.newtonsoft-json","Value":"2.0.0"}],"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}
|
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
using UnityEditor;
|
|
2
|
-
using UnityEngine;
|
|
3
|
-
|
|
4
|
-
namespace TyphoonUnitySDK
|
|
5
|
-
{
|
|
6
|
-
/// <summary>
|
|
7
|
-
/// 样式窗口
|
|
8
|
-
/// </summary>
|
|
9
|
-
public class StyleEditorWindow : EditorWindow
|
|
10
|
-
{
|
|
11
|
-
public void OnGUI()
|
|
12
|
-
{
|
|
13
|
-
var temSkin = GUI.skin;
|
|
14
|
-
GUI.skin = Skins.Skin;
|
|
15
|
-
OnDrawGUI();
|
|
16
|
-
GUI.skin = temSkin;
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
protected virtual void OnDrawGUI()
|
|
20
|
-
{
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
|
-
}
|