Skip to content

Commit dafaa24

Browse files
bluebackbluebluebackblue
committed
整理
1 parent 5e2a763 commit dafaa24

File tree

15 files changed

+86
-102
lines changed

15 files changed

+86
-102
lines changed

‎BlueBackUnityPlayerLoop/Assets/Editor/ProejctParam.json.txt‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,23 @@
2323
"root_readmemd_path":"../../README.md",
2424
"need_unity_version":"2020.1",
2525
"asmdef_runtime":{
26-
"define_list":[
26+
"define_constraint_list":[
27+
],
28+
"version_define_list":[
2729
],
2830
"reference_list":[
31+
{
32+
"mode":"package",
33+
"package_fullname":"BlueBack.Debug",
34+
"url":"https://github.com/bluebackblue/UpmDebug",
35+
"define_package_pathname":"blueback.debug"
36+
}
2937
]
3038
},
3139
"asmdef_editor":{
32-
"define_list":[
40+
"define_constraint_list":[
41+
],
42+
"version_define_list":[
3343
],
3444
"reference_list":[
3545
{
@@ -41,7 +51,9 @@
4151
]
4252
},
4353
"asmdef_sample":{
44-
"define_list":[
54+
"define_constraint_list":[
55+
],
56+
"version_define_list":[
4557
],
4658
"reference_list":[
4759
{

‎BlueBackUnityPlayerLoop/Assets/UPM/Documentation~/BlueBack.UnityPlayerLoop.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ MIT License
88

99
## 依存 / 使用ライセンス等
1010
### ランタイム
11+
* https://github.com/bluebackblue/UpmDebug
1112
### エディター
1213
* https://github.com/bluebackblue/UpmUnityPlayerLoop
1314
### サンプル
@@ -18,7 +19,7 @@ Unity 2022.1.0b16
1819

1920
## UPM
2021
### 最新
21-
* https://github.com/bluebackblue/UpmUnityPlayerLoop.git?path=BlueBackUnityPlayerLoop/Assets/UPM#0.0.17
22+
* https://github.com/bluebackblue/UpmUnityPlayerLoop.git?path=BlueBackUnityPlayerLoop/Assets/UPM#0.0.18
2223
### 開発
2324
* https://github.com/bluebackblue/UpmUnityPlayerLoop.git?path=BlueBackUnityPlayerLoop/Assets/UPM
2425

‎BlueBackUnityPlayerLoop/Assets/UPM/Editor/BlueBack/UnityPlayerLoop/Editor/UpdatePackage.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ private static byte[] Inner_DownloadBinary(string a_url)
7777
t_text = t_webrequest.downloadHandler.text;
7878
}
7979
#if(UNITY_EDITOR)
80-
DebugTool.EditorLogError(a_url + " : " + t_webrequest.error + " : " + t_text);
80+
DebugTool.EditorErrorLog(a_url + " : " + t_webrequest.error + " : " + t_text);
8181
#endif
8282
return null;
8383
}else{
@@ -87,7 +87,7 @@ private static byte[] Inner_DownloadBinary(string a_url)
8787
}
8888
}
8989
}catch(System.Exception t_exception){
90-
DebugTool.EditorLogError(a_url + " : " + t_exception.Message + "\n" + t_exception.StackTrace);
90+
DebugTool.EditorErrorLog(a_url + " : " + t_exception.Message + "\n" + t_exception.StackTrace);
9191
return null;
9292
}
9393
}
@@ -108,19 +108,19 @@ private static string Inner_GetLastReleaseNameFromGitHub()
108108
return t_text;
109109
}else{
110110
#if(UNITY_EDITOR)
111-
DebugTool.EditorLogError(t_url + " : text == null");
111+
DebugTool.EditorErrorLog(t_url + " : text == null");
112112
#endif
113113
return null;
114114
}
115115
}else{
116116
#if(UNITY_EDITOR)
117-
DebugTool.EditorLogError(t_url + " : binary == null");
117+
DebugTool.EditorErrorLog(t_url + " : binary == null");
118118
#endif
119119
return null;
120120
}
121121
}catch(System.Exception t_exception){
122122
#if(UNITY_EDITOR)
123-
DebugTool.EditorLogError(t_url + " : " + t_exception.Message + "\n" + t_exception.StackTrace);
123+
DebugTool.EditorErrorLog(t_url + " : " + t_exception.Message + "\n" + t_exception.StackTrace);
124124
#endif
125125
return null;
126126
}

‎BlueBackUnityPlayerLoop/Assets/UPM/README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ MIT License
88

99
## 依存 / 使用ライセンス等
1010
### ランタイム
11+
* https://github.com/bluebackblue/UpmDebug
1112
### エディター
1213
* https://github.com/bluebackblue/UpmUnityPlayerLoop
1314
### サンプル
@@ -18,7 +19,7 @@ Unity 2022.1.0b16
1819

1920
## UPM
2021
### 最新
21-
* https://github.com/bluebackblue/UpmUnityPlayerLoop.git?path=BlueBackUnityPlayerLoop/Assets/UPM#0.0.17
22+
* https://github.com/bluebackblue/UpmUnityPlayerLoop.git?path=BlueBackUnityPlayerLoop/Assets/UPM#0.0.18
2223
### 開発
2324
* https://github.com/bluebackblue/UpmUnityPlayerLoop.git?path=BlueBackUnityPlayerLoop/Assets/UPM
2425

‎BlueBackUnityPlayerLoop/Assets/UPM/Runtime/BlueBack/UnityPlayerLoop/Add.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static void AddFromType(ref UnityEngine.LowLevel.PlayerLoopSystem a_playe
6464
{
6565
//未発見。
6666

67-
#if(DEF_BLUEBACK_ASSERT)
67+
#if(DEF_BLUEBACK_DEBUG_ASSERT)
6868
DebugTool.Assert(false);
6969
#endif
7070

@@ -95,7 +95,7 @@ public static void AddFromType(ref UnityEngine.LowLevel.PlayerLoopSystem a_playe
9595
{
9696
//未発見。
9797

98-
#if(DEF_BLUEBACK_ASSERT)
98+
#if(DEF_BLUEBACK_DEBUG_ASSERT)
9999
DebugTool.Assert(false);
100100
#endif
101101

@@ -108,7 +108,7 @@ public static void AddFromType(ref UnityEngine.LowLevel.PlayerLoopSystem a_playe
108108
{
109109
//不明なタイプ。
110110

111-
#if(DEF_BLUEBACK_ASSERT)
111+
#if(DEF_BLUEBACK_DEBUG_ASSERT)
112112
DebugTool.Assert(false);
113113
#endif
114114

@@ -141,7 +141,7 @@ public static void AddFromType(ref UnityEngine.LowLevel.PlayerLoopSystem a_playe
141141
{
142142
//不明なタイプ。
143143

144-
#if(DEF_BLUEBACK_ASSERT)
144+
#if(DEF_BLUEBACK_DEBUG_ASSERT)
145145
DebugTool.Assert(false);
146146
#endif
147147
}break;
@@ -171,7 +171,7 @@ public static void AddFromType(ref UnityEngine.LowLevel.PlayerLoopSystem a_playe
171171
{
172172
//未発見。
173173

174-
#if(DEF_BLUEBACK_ASSERT)
174+
#if(DEF_BLUEBACK_DEBUG_ASSERT)
175175
DebugTool.Assert(false);
176176
#endif
177177
}break;
@@ -197,7 +197,7 @@ public static void AddFromType(ref UnityEngine.LowLevel.PlayerLoopSystem a_playe
197197
{
198198
//未発見。
199199

200-
#if(DEF_BLUEBACK_ASSERT)
200+
#if(DEF_BLUEBACK_DEBUG_ASSERT)
201201
DebugTool.Assert(false);
202202
#endif
203203
}break;
@@ -207,7 +207,7 @@ public static void AddFromType(ref UnityEngine.LowLevel.PlayerLoopSystem a_playe
207207
{
208208
//不明なタイプ。
209209

210-
#if(DEF_BLUEBACK_ASSERT)
210+
#if(DEF_BLUEBACK_DEBUG_ASSERT)
211211
DebugTool.Assert(false);
212212
#endif
213213
}break;

‎BlueBackUnityPlayerLoop/Assets/UPM/Runtime/BlueBack/UnityPlayerLoop/BlueBack.UnityPlayerLoop.asmdef‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"noEngineReferences":false,"versionDefines":[],"defineConstraints":[],"autoReferenced":true,"precompiledReferences":[],"overrideReferences":false,"allowUnsafeCode":false,"excludePlatforms":[],"includePlatforms":[],"references":[],"rootNamespace":"BlueBack.UnityPlayerLoop","name":"BlueBack.UnityPlayerLoop"}
1+
{"noEngineReferences":false,"versionDefines":[{"define":"ASMDEF_BLUEBACK_DEBUG","name":"blueback.debug"}],"defineConstraints":[],"autoReferenced":true,"precompiledReferences":[],"overrideReferences":false,"allowUnsafeCode":false,"excludePlatforms":[],"includePlatforms":[],"references":[],"rootNamespace":"BlueBack.UnityPlayerLoop","name":"BlueBack.UnityPlayerLoop"}

‎BlueBackUnityPlayerLoop/Assets/UPM/Runtime/BlueBack/UnityPlayerLoop/DebugTool.cs‎

Lines changed: 38 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -15,37 +15,22 @@ namespace BlueBack.UnityPlayerLoop
1515
*/
1616
public static class DebugTool
1717
{
18-
#if(DEF_BLUEBACK_ASSERT)
19-
20-
/** DefaultAssertProc
21-
*/
22-
public static void DefaultAssertProc(System.Exception a_exception,string a_message)
23-
{
24-
if(a_message != null){
25-
UnityEngine.Debug.LogError(a_message);
26-
}
27-
28-
if(a_exception != null){
29-
UnityEngine.Debug.LogError(a_exception.ToString());
30-
}
31-
32-
UnityEngine.Debug.Assert(false);
33-
}
34-
35-
/** AssertProcType
36-
*/
37-
public delegate void AssertProcType(System.Exception a_exception,string a_message);
18+
#if(DEF_BLUEBACK_DEBUG_ASSERT)
3819

3920
/** assertproc
4021
*/
41-
public static AssertProcType assertproc = DefaultAssertProc;
22+
#if((DEF_BLUEBACK_DEBUG)&&(ASMDEF_BLUEBACK_DEBUG))
23+
public static BlueBack.Debug.Assert.ProcType assertproc = BlueBack.Debug.Assert.Default;
24+
#endif
4225

4326
/** Assert
4427
*/
4528
public static void Assert(bool a_flag,System.Exception a_exception = null)
4629
{
4730
if(a_flag != true){
48-
DebugTool.assertproc(a_exception,null);
31+
#if((DEF_BLUEBACK_DEBUG)&&(ASMDEF_BLUEBACK_DEBUG))
32+
DebugTool.assertproc(null,a_exception);
33+
#endif
4934
}
5035
}
5136

@@ -54,99 +39,82 @@ public static void Assert(bool a_flag,System.Exception a_exception = null)
5439
public static void Assert(bool a_flag,string a_message)
5540
{
5641
if(a_flag != true){
57-
DebugTool.assertproc(null,a_message);
42+
#if((DEF_BLUEBACK_DEBUG)&&(ASMDEF_BLUEBACK_DEBUG))
43+
DebugTool.assertproc(a_message,null);
44+
#endif
5845
}
5946
}
6047

6148
#endif
6249

63-
#if(DEF_BLUEBACK_LOG)
64-
65-
/** DefaultLogProc
66-
*/
67-
public static void DefaultLogProc(string a_message)
68-
{
69-
UnityEngine.Debug.Log(a_message);
70-
}
71-
72-
/** LogProcType
73-
*/
74-
public delegate void LogProcType(string a_message);
50+
#if(DEF_BLUEBACK_DEBUG_LOG)
7551

7652
/** logproc
7753
*/
78-
public static LogProcType logproc = DebugTool.DefaultLogProc;
54+
#if((DEF_BLUEBACK_DEBUG)&&(ASMDEF_BLUEBACK_DEBUG))
55+
public static BlueBack.Debug.Log.ProcType logproc = BlueBack.Debug.Log.Default;
56+
#endif
7957

8058
/** Log
8159
*/
8260
public static void Log(string a_message)
8361
{
62+
#if((DEF_BLUEBACK_DEBUG)&&(ASMDEF_BLUEBACK_DEBUG))
8463
DebugTool.logproc(a_message);
64+
#endif
8565
}
8666

8767
#endif
8868

89-
#if(DEF_BLUEBACK_DETAIL)
90-
91-
/** DefaultDetailProc
92-
*/
93-
public static void DefaultDetailProc(string a_message)
94-
{
95-
UnityEngine.Debug.Log(a_message);
96-
}
97-
98-
/** DetailProcType
99-
*/
100-
public delegate void DetailProcType(string a_message);
69+
#if(DEF_BLUEBACK_DEBUG_DETAIL)
10170

10271
/** detailproc
10372
*/
104-
public static DetailProcType detailproc = DebugTool.DefaultDetailProc;
73+
#if((DEF_BLUEBACK_DEBUG)&&(ASMDEF_BLUEBACK_DEBUG))
74+
public static BlueBack.Debug.Detail.ProcType detailproc = BlueBack.Debug.Detail.Default;
75+
#endif
10576

10677
/** Detail
10778
*/
10879
public static void Detail(string a_message)
10980
{
81+
#if((DEF_BLUEBACK_DEBUG)&&(ASMDEF_BLUEBACK_DEBUG))
11082
DebugTool.detailproc(a_message);
83+
#endif
11184
}
11285

11386
#endif
11487

11588
#if(UNITY_EDITOR)
11689

117-
/** DefaultEditorLogProc
118-
*/
119-
public static void DefaultEditorLogProc(string a_message_log,string a_message_logerror)
120-
{
121-
if(a_message_log != null){
122-
UnityEngine.Debug.Log(a_message_log);
123-
}
124-
125-
if(a_message_logerror != null){
126-
UnityEngine.Debug.Log(a_message_logerror);
127-
}
128-
}
129-
130-
/** EditorLogProcType
90+
/** editorlogproc
13191
*/
132-
public delegate void EditorLogProcType(string a_message_log,string a_message_logerror);
92+
#if((DEF_BLUEBACK_DEBUG)&&(ASMDEF_BLUEBACK_DEBUG))
93+
public static BlueBack.Debug.Log.ProcType editorlogproc = BlueBack.Debug.Log.Default;
94+
#endif
13395

134-
/** editorlogproc
96+
/** editorerrorlogproc
13597
*/
136-
public static EditorLogProcType editorlogproc = DebugTool.DefaultEditorLogProc;
98+
#if((DEF_BLUEBACK_DEBUG)&&(ASMDEF_BLUEBACK_DEBUG))
99+
public static BlueBack.Debug.ErrorLog.ProcType editorerrorlogproc = BlueBack.Debug.ErrorLog.Default;
100+
#endif
137101

138102
/** EditorLog
139103
*/
140104
public static void EditorLog(string a_message)
141105
{
142-
DebugTool.editorlogproc(a_message,null);
106+
#if((DEF_BLUEBACK_DEBUG)&&(ASMDEF_BLUEBACK_DEBUG))
107+
DebugTool.editorlogproc(a_message);
108+
#endif
143109
}
144110

145-
/** EditorLogError
111+
/** EditorErrorLog
146112
*/
147-
public static void EditorLogError(string a_message)
113+
public static void EditorErrorLog(string a_message)
148114
{
149-
DebugTool.editorlogproc(null,a_message);
115+
#if((DEF_BLUEBACK_DEBUG)&&(ASMDEF_BLUEBACK_DEBUG))
116+
DebugTool.editorerrorlogproc(a_message);
117+
#endif
150118
}
151119

152120
#endif

‎BlueBackUnityPlayerLoop/Assets/UPM/Runtime/BlueBack/UnityPlayerLoop/Find.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public static int FindFromType(in UnityEngine.LowLevel.PlayerLoopSystem a_player
6262

6363
//未発見。
6464

65-
#if(DEF_BLUEBACK_ASSERT)
65+
#if(DEF_BLUEBACK_DEBUG_ASSERT)
6666
DebugTool.Assert(false);
6767
#endif
6868

‎BlueBackUnityPlayerLoop/Assets/UPM/Runtime/BlueBack/UnityPlayerLoop/UnityPlayerLoop.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static void SetDefaultPlayerLoopOnUnityDestroy()
5858
*/
5959
public static void OnUnityDestory()
6060
{
61-
#if(DEF_BLUEBACK_LOG)
61+
#if(DEF_BLUEBACK_DEBUG_LOG)
6262
DebugTool.Log("UnityPlayerLoop : default");
6363
#endif
6464

‎BlueBackUnityPlayerLoop/Assets/UPM/Runtime/BlueBack/UnityPlayerLoop/Version.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static class Version
2121

2222
/** packageversion
2323
*/
24-
public const string packageversion = "0.0.17";
24+
public const string packageversion = "0.0.18";
2525

2626
/** GetPackageVersion
2727
*/

0 commit comments

Comments
 (0)