Skip to content

Commit 2b5f498

Browse files
committed
対応 : VersionManager更新
修正 : DEF_BLUEBACK_LOG / DEF_BLUEBACK_ASSERT で統一
1 parent 17e1494 commit 2b5f498

15 files changed

Lines changed: 31 additions & 32 deletions

File tree

BlueBackUnityPlayerLoop/Assets/Editor/VersionManagerSetting.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ @brief 設定。
1111
*/
1212
#if((ASMDEF_BLUEBACK_VERSIONMANAGER)||(USERDEF_BLUEBACK_VERSIONMANAGER))
1313
#define ASMDEF_TRUE
14+
#else
15+
#warning "ASMDEF_TRUE"
1416
#endif
1517

1618

BlueBackUnityPlayerLoop/Assets/Samples/BlueBack.UnityPlayerLoop/000/GetCurrentPlayerLoop/Scene.unity

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
41+
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Unity 2022.1.0b16
1818

1919
## UPM
2020
### 最新
21-
* https://github.com/bluebackblue/UpmUnityPlayerLoop.git?path=BlueBackUnityPlayerLoop/Assets/UPM#0.0.15
21+
* https://github.com/bluebackblue/UpmUnityPlayerLoop.git?path=BlueBackUnityPlayerLoop/Assets/UPM#0.0.16
2222
### 開発
2323
* https://github.com/bluebackblue/UpmUnityPlayerLoop.git?path=BlueBackUnityPlayerLoop/Assets/UPM
2424

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

BlueBackUnityPlayerLoop/Assets/UPM/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Unity 2022.1.0b16
1818

1919
## UPM
2020
### 最新
21-
* https://github.com/bluebackblue/UpmUnityPlayerLoop.git?path=BlueBackUnityPlayerLoop/Assets/UPM#0.0.15
21+
* https://github.com/bluebackblue/UpmUnityPlayerLoop.git?path=BlueBackUnityPlayerLoop/Assets/UPM#0.0.16
2222
### 開発
2323
* https://github.com/bluebackblue/UpmUnityPlayerLoop.git?path=BlueBackUnityPlayerLoop/Assets/UPM
2424

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_UNITYPLAYERLOOP_ASSERT)
67+
#if(DEF_BLUEBACK_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_UNITYPLAYERLOOP_ASSERT)
98+
#if(DEF_BLUEBACK_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_UNITYPLAYERLOOP_ASSERT)
111+
#if(DEF_BLUEBACK_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_UNITYPLAYERLOOP_ASSERT)
144+
#if(DEF_BLUEBACK_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_UNITYPLAYERLOOP_ASSERT)
174+
#if(DEF_BLUEBACK_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_UNITYPLAYERLOOP_ASSERT)
200+
#if(DEF_BLUEBACK_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_UNITYPLAYERLOOP_ASSERT)
210+
#if(DEF_BLUEBACK_ASSERT)
211211
DebugTool.Assert(false);
212212
#endif
213213
}break;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public static class DebugTool
1717
{
1818
/** assertproc
1919
*/
20-
#if(DEF_BLUEBACK_UNITYPLAYERLOOP_ASSERT)
20+
#if(DEF_BLUEBACK_ASSERT)
2121
public static void DefaultAssertProc(System.Exception a_exception,string a_message)
2222
{
2323
if(a_message != null){
@@ -36,7 +36,7 @@ public static void DefaultAssertProc(System.Exception a_exception,string a_messa
3636

3737
/** logproc
3838
*/
39-
#if(DEF_BLUEBACK_UNITYPLAYERLOOP_LOG)
39+
#if(DEF_BLUEBACK_LOG)
4040
public static void DefaultLogProc(string a_message)
4141
{
4242
UnityEngine.Debug.Log(a_message);
@@ -47,7 +47,7 @@ public static void DefaultLogProc(string a_message)
4747

4848
/** Assert
4949
*/
50-
#if(DEF_BLUEBACK_UNITYPLAYERLOOP_ASSERT)
50+
#if(DEF_BLUEBACK_ASSERT)
5151
public static void Assert(bool a_flag,System.Exception a_exception = null)
5252
{
5353
if(a_flag != true){
@@ -58,7 +58,7 @@ public static void Assert(bool a_flag,System.Exception a_exception = null)
5858

5959
/** Assert
6060
*/
61-
#if(DEF_BLUEBACK_UNITYPLAYERLOOP_ASSERT)
61+
#if(DEF_BLUEBACK_ASSERT)
6262
public static void Assert(bool a_flag,string a_message)
6363
{
6464
if(a_flag != true){
@@ -67,7 +67,7 @@ public static void Assert(bool a_flag,string a_message)
6767
}
6868
#endif
6969

70-
#if(DEF_BLUEBACK_UNITYPLAYERLOOP_LOG)
70+
#if(DEF_BLUEBACK_LOG)
7171
public static void Log(string a_message)
7272
{
7373
DebugTool.logproc(a_message);

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_UNITYPLAYERLOOP_ASSERT)
65+
#if(DEF_BLUEBACK_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_UNITYPLAYERLOOP_LOG)
61+
#if(DEF_BLUEBACK_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.15";
24+
public const string packageversion = "0.0.16";
2525

2626
/** GetPackageVersion
2727
*/

0 commit comments

Comments
 (0)