iwnc2020/ProjectDDD
2
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

롤백

Browse Source
This commit is contained in:
NTG 2025-08-25 10:56:42 +09:00
parent cf43d6f0ff
commit e135850dda
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/External/Behavior Designer/Runtime/Tasks/Unity/Vector2/SetXY.cs vendored
View File

@ -8,9 +8,9 @@ public class SetXY : Action
{ {
[Tooltip("The Vector2 to set the values of")] [Tooltip("The Vector2 to set the values of")]
public SharedVector2 vector2Variable; public SharedVector2 vector2Variable;
[Tooltip("The X value. Set to Normal to have the value ignored")] [Tooltip("The X value. Set to None to have the value ignored")]
public SharedFloat xValue; public SharedFloat xValue;
[Tooltip("The Y value. Set to Normal to have the value ignored")] [Tooltip("The Y value. Set to None to have the value ignored")]
public SharedFloat yValue; public SharedFloat yValue;
public override TaskStatus OnUpdate() public override TaskStatus OnUpdate()

6
Assets/External/Behavior Designer/Runtime/Tasks/Unity/Vector3/SetXYZ.cs vendored
View File

@ -8,11 +8,11 @@ public class SetXYZ : Action
{ {
[Tooltip("The Vector3 to set the values of")] [Tooltip("The Vector3 to set the values of")]
public SharedVector3 vector3Variable; public SharedVector3 vector3Variable;
[Tooltip("The X value. Set to Normal to have the value ignored")] [Tooltip("The X value. Set to None to have the value ignored")]
public SharedFloat xValue; public SharedFloat xValue;
[Tooltip("The Y value. Set to Normal to have the value ignored")] [Tooltip("The Y value. Set to None to have the value ignored")]
public SharedFloat yValue; public SharedFloat yValue;
[Tooltip("The Z value. Set to Normal to have the value ignored")] [Tooltip("The Z value. Set to None to have the value ignored")]
public SharedFloat zValue; public SharedFloat zValue;
public override TaskStatus OnUpdate() public override TaskStatus OnUpdate()

2
Assets/_DDD/_Scripts/GameFramework/Scene/SceneManager.cs
View File

@ -59,7 +59,7 @@ public async Task Init()
} }
#else #else
var data = new SceneData(activeScene, null); var data = new SceneData(activeScene, null);
_loadedSceneDatas[GameFlowState.Normal] = data; _loadedSceneDatas[GameFlowState.None] = data;
#endif #endif
await PreloadAll(); await PreloadAll();
} }

6
Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/Implementations/CodeGeneration/CSharpCodeGenerator.cs
View File

@ -145,7 +145,7 @@ private static string BuildEnumCode(string rootNamespace, Dictionary<string, Has
var enumName = IdentifierSanitizer.Sanitize(kv.Key, true); var enumName = IdentifierSanitizer.Sanitize(kv.Key, true);
var values = kv.Value var values = kv.Value
.Where(v => !string.IsNullOrWhiteSpace(v) && .Where(v => !string.IsNullOrWhiteSpace(v) &&
!string.Equals(v, "Normal", StringComparison.OrdinalIgnoreCase)) !string.Equals(v, "None", StringComparison.OrdinalIgnoreCase))
.Select(v => IdentifierSanitizer.Sanitize(v, true)) .Select(v => IdentifierSanitizer.Sanitize(v, true))
.Distinct(StringComparer.OrdinalIgnoreCase) .Distinct(StringComparer.OrdinalIgnoreCase)
.OrderBy(v => v, StringComparer.Ordinal) .OrderBy(v => v, StringComparer.Ordinal)
@ -153,7 +153,7 @@ private static string BuildEnumCode(string rootNamespace, Dictionary<string, Has
sb.AppendLine($" public enum {enumName}"); sb.AppendLine($" public enum {enumName}");
sb.AppendLine(" {"); sb.AppendLine(" {");
sb.AppendLine(" Normal = 0,"); sb.AppendLine(" None = 0,");
for (int i = 0; i < values.Count; i++) for (int i = 0; i < values.Count; i++)
sb.AppendLine($" {values[i]} = {i + 1},"); sb.AppendLine($" {values[i]} = {i + 1},");
sb.AppendLine(" }"); sb.AppendLine(" }");
@ -231,7 +231,7 @@ private string GenerateDataClass(string rootNamespace, string className, JArray
private static string NormalizeEnumKey(string input) private static string NormalizeEnumKey(string input)
{ {
if (string.IsNullOrEmpty(input)) return "Normal"; if (string.IsNullOrEmpty(input)) return "None";
var valid = System.Text.RegularExpressions.Regex.Replace(input, @"[^a-zA-Z0-9_]+", "_"); var valid = System.Text.RegularExpressions.Regex.Replace(input, @"[^a-zA-Z0-9_]+", "_");
if (char.IsDigit(valid[0])) valid = "_" + valid; if (char.IsDigit(valid[0])) valid = "_" + valid;
return char.ToUpperInvariant(valid[0]) + valid.Substring(1); return char.ToUpperInvariant(valid[0]) + valid.Substring(1);

2
Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/Implementations/Conversion/DefaultValueConverterRegistry.cs
View File

@ -66,7 +66,7 @@ public bool TryConvert(string source, Type targetType, out object value)
private static string NormalizeEnumKey(string input) private static string NormalizeEnumKey(string input)
{ {
if (string.IsNullOrEmpty(input)) return "Normal"; if (string.IsNullOrEmpty(input)) return "None";
string valid = System.Text.RegularExpressions.Regex.Replace(input, @"[^a-zA-Z0-9_]+", "_"); string valid = System.Text.RegularExpressions.Regex.Replace(input, @"[^a-zA-Z0-9_]+", "_");
if (char.IsDigit(valid[0])) valid = "_" + valid; if (char.IsDigit(valid[0])) valid = "_" + valid;
return char.ToUpperInvariant(valid[0]) + valid.Substring(1); return char.ToUpperInvariant(valid[0]) + valid.Substring(1);

2
Assets/_DDD/_Scripts/RestaurantEvent/InteractableHighlight.cs
View File

@ -201,7 +201,7 @@ private void ApplyOutlineType(InteractionOutlineType type)
// OutlineData에서 해당 타입의 스타일 가져오기 // OutlineData에서 해당 타입의 스타일 가져오기
if (!_outlineData.TryGetValue(type, out var data)) if (!_outlineData.TryGetValue(type, out var data))
{ {
// 데이터가 없으면 Normal 타입 적용 // 데이터가 없으면 None 타입 적용
data = _outlineData[InteractionOutlineType.None]; data = _outlineData[InteractionOutlineType.None];
} }