Skip to content
This repository was archived by the owner on May 9, 2023. It is now read-only.

Commit 8949e3d

Browse files
sinai-devsinai-dev
committed
Revert "some early steps remaking the GUI with UnityEngine.UI, working in all tested game so far"
This reverts commit 4280a07.
1 parent 4280a07 commit 8949e3d

File tree

79 files changed

+10374
-2304
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+10374
-2304
lines changed

‎resources/cursor.png‎

-1.9 KB
Binary file not shown.

‎src/CacheObject/CacheEnumerated.cs‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
//using System;
2-
//using System.Collections;
3-
//using System.Collections.Generic;
4-
//using System.Linq;
5-
//using System.Text;
6-
//using Explorer.UI;
1+
using System;
2+
using System.Collections;
3+
using System.Collections.Generic;
4+
using System.Linq;
5+
using System.Text;
6+
using Explorer.UI;
77

8-
//namespace Explorer.CacheObject
9-
//{
10-
// public class CacheEnumerated : CacheObjectBase
11-
// {
12-
// public int Index { get; set; }
13-
// public IList RefIList { get; set; }
14-
// public InteractiveEnumerable ParentEnumeration { get; set; }
8+
namespace Explorer.CacheObject
9+
{
10+
public class CacheEnumerated : CacheObjectBase
11+
{
12+
public int Index { get; set; }
13+
public IList RefIList { get; set; }
14+
public InteractiveEnumerable ParentEnumeration { get; set; }
1515

16-
// public override bool CanWrite => RefIList != null && ParentEnumeration.OwnerCacheObject.CanWrite;
16+
public override bool CanWrite => RefIList != null && ParentEnumeration.OwnerCacheObject.CanWrite;
1717

18-
// public override void SetValue()
19-
// {
20-
// RefIList[Index] = IValue.Value;
21-
// ParentEnumeration.Value = RefIList;
18+
public override void SetValue()
19+
{
20+
RefIList[Index] = IValue.Value;
21+
ParentEnumeration.Value = RefIList;
2222

23-
// ParentEnumeration.OwnerCacheObject.SetValue();
24-
// }
25-
// }
26-
//}
23+
ParentEnumeration.OwnerCacheObject.SetValue();
24+
}
25+
}
26+
}

‎src/CacheObject/CacheFactory.cs‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,76 @@
1-
//using System;
2-
//using System.Reflection;
3-
//using Explorer.CacheObject;
4-
//using UnityEngine;
5-
//using Explorer.Helpers;
1+
using System;
2+
using System.Reflection;
3+
using Explorer.CacheObject;
4+
using UnityEngine;
5+
using Explorer.Helpers;
66

7-
//namespace Explorer
8-
//{
9-
// public static class CacheFactory
10-
// {
11-
// public static CacheObjectBase GetCacheObject(object obj)
12-
// {
13-
// if (obj == null) return null;
7+
namespace Explorer
8+
{
9+
public static class CacheFactory
10+
{
11+
public static CacheObjectBase GetCacheObject(object obj)
12+
{
13+
if (obj == null) return null;
1414

15-
// return GetCacheObject(obj, ReflectionHelpers.GetActualType(obj));
16-
// }
15+
return GetCacheObject(obj, ReflectionHelpers.GetActualType(obj));
16+
}
1717

18-
// public static CacheObjectBase GetCacheObject(object obj, Type type)
19-
// {
20-
// var ret = new CacheObjectBase();
21-
// ret.Init(obj, type);
22-
// return ret;
23-
// }
18+
public static CacheObjectBase GetCacheObject(object obj, Type type)
19+
{
20+
var ret = new CacheObjectBase();
21+
ret.Init(obj, type);
22+
return ret;
23+
}
2424

25-
// public static CacheMember GetCacheObject(MemberInfo member, object declaringInstance)
26-
// {
27-
// CacheMember ret;
25+
public static CacheMember GetCacheObject(MemberInfo member, object declaringInstance)
26+
{
27+
CacheMember ret;
2828

29-
// if (member is MethodInfo mi && CanProcessArgs(mi.GetParameters()))
30-
// {
31-
// ret = new CacheMethod();
32-
// ret.InitMember(mi, declaringInstance);
33-
// }
34-
// else if (member is PropertyInfo pi && CanProcessArgs(pi.GetIndexParameters()))
35-
// {
36-
// ret = new CacheProperty();
37-
// ret.InitMember(pi, declaringInstance);
38-
// }
39-
// else if (member is FieldInfo fi)
40-
// {
41-
// ret = new CacheField();
42-
// ret.InitMember(fi, declaringInstance);
43-
// }
44-
// else
45-
// {
46-
// return null;
47-
// }
29+
if (member is MethodInfo mi && CanProcessArgs(mi.GetParameters()))
30+
{
31+
ret = new CacheMethod();
32+
ret.InitMember(mi, declaringInstance);
33+
}
34+
else if (member is PropertyInfo pi && CanProcessArgs(pi.GetIndexParameters()))
35+
{
36+
ret = new CacheProperty();
37+
ret.InitMember(pi, declaringInstance);
38+
}
39+
else if (member is FieldInfo fi)
40+
{
41+
ret = new CacheField();
42+
ret.InitMember(fi, declaringInstance);
43+
}
44+
else
45+
{
46+
return null;
47+
}
4848

49-
// return ret;
50-
// }
49+
return ret;
50+
}
5151

52-
// public static bool CanProcessArgs(ParameterInfo[] parameters)
53-
// {
54-
// foreach (var param in parameters)
55-
// {
56-
// var pType = param.ParameterType;
52+
public static bool CanProcessArgs(ParameterInfo[] parameters)
53+
{
54+
foreach (var param in parameters)
55+
{
56+
var pType = param.ParameterType;
5757

58-
// if (pType.IsByRef && pType.HasElementType)
59-
// {
60-
// pType = pType.GetElementType();
61-
// }
58+
if (pType.IsByRef && pType.HasElementType)
59+
{
60+
pType = pType.GetElementType();
61+
}
6262

63-
// if (pType.IsPrimitive || pType == typeof(string))
64-
// {
65-
// continue;
66-
// }
67-
// else
68-
// {
69-
// return false;
70-
// }
71-
// }
63+
if (pType.IsPrimitive || pType == typeof(string))
64+
{
65+
continue;
66+
}
67+
else
68+
{
69+
return false;
70+
}
71+
}
7272

73-
// return true;
74-
// }
75-
// }
76-
//}
73+
return true;
74+
}
75+
}
76+
}

‎src/CacheObject/CacheField.cs‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
1-
//using System;
2-
//using System.Collections.Generic;
3-
//using System.Linq;
4-
//using System.Text;
5-
//using System.Reflection;
6-
//using Explorer.UI;
7-
//using Explorer.Helpers;
8-
9-
//namespace Explorer.CacheObject
10-
//{
11-
// public class CacheField : CacheMember
12-
// {
13-
// public override bool IsStatic => (MemInfo as FieldInfo).IsStatic;
14-
15-
// public override void InitMember(MemberInfo member, object declaringInstance)
16-
// {
17-
// base.InitMember(member, declaringInstance);
18-
19-
// base.Init(null, (member as FieldInfo).FieldType);
20-
21-
// UpdateValue();
22-
// }
23-
24-
// public override void UpdateValue()
25-
// {
26-
// if (IValue is InteractiveDictionary iDict)
27-
// {
28-
// if (!iDict.EnsureDictionaryIsSupported())
29-
// {
30-
// ReflectionException = "Not supported due to TypeInitializationException";
31-
// return;
32-
// }
33-
// }
34-
35-
// try
36-
// {
37-
// var fi = MemInfo as FieldInfo;
38-
// IValue.Value = fi.GetValue(fi.IsStatic ? null : DeclaringInstance);
39-
40-
// base.UpdateValue();
41-
// }
42-
// catch (Exception e)
43-
// {
44-
// ReflectionException = ReflectionHelpers.ExceptionToString(e);
45-
// }
46-
// }
47-
48-
// public override void SetValue()
49-
// {
50-
// var fi = MemInfo as FieldInfo;
51-
// fi.SetValue(fi.IsStatic ? null : DeclaringInstance, IValue.Value);
52-
// }
53-
// }
54-
//}
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Reflection;
6+
using Explorer.UI;
7+
using Explorer.Helpers;
8+
9+
namespace Explorer.CacheObject
10+
{
11+
public class CacheField : CacheMember
12+
{
13+
public override bool IsStatic => (MemInfo as FieldInfo).IsStatic;
14+
15+
public override void InitMember(MemberInfo member, object declaringInstance)
16+
{
17+
base.InitMember(member, declaringInstance);
18+
19+
base.Init(null, (member as FieldInfo).FieldType);
20+
21+
UpdateValue();
22+
}
23+
24+
public override void UpdateValue()
25+
{
26+
if (IValue is InteractiveDictionary iDict)
27+
{
28+
if (!iDict.EnsureDictionaryIsSupported())
29+
{
30+
ReflectionException = "Not supported due to TypeInitializationException";
31+
return;
32+
}
33+
}
34+
35+
try
36+
{
37+
var fi = MemInfo as FieldInfo;
38+
IValue.Value = fi.GetValue(fi.IsStatic ? null : DeclaringInstance);
39+
40+
base.UpdateValue();
41+
}
42+
catch (Exception e)
43+
{
44+
ReflectionException = ReflectionHelpers.ExceptionToString(e);
45+
}
46+
}
47+
48+
public override void SetValue()
49+
{
50+
var fi = MemInfo as FieldInfo;
51+
fi.SetValue(fi.IsStatic ? null : DeclaringInstance, IValue.Value);
52+
}
53+
}
54+
}

0 commit comments

Comments
 (0)