Commit 201e04b1 authored by 杨泽宇's avatar 杨泽宇

更新

parent b4eed4fc
...@@ -108,7 +108,7 @@ Material: ...@@ -108,7 +108,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.37254903, g: 0.6862745, b: 1, a: 1} - _BaseColor: {r: 0.37254903, g: 0.6862745, b: 1, a: 1}
- _Color: {r: 0.372549, g: 0.68627447, b: 1, a: 1} - _Color: {r: 0.37254903, g: 0.6862745, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
......
...@@ -108,7 +108,7 @@ Material: ...@@ -108,7 +108,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.37254903, g: 0.6862745, b: 1, a: 1} - _BaseColor: {r: 0.37254903, g: 0.6862745, b: 1, a: 1}
- _Color: {r: 0.372549, g: 0.68627447, b: 1, a: 1} - _Color: {r: 0.37254903, g: 0.6862745, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
......
...@@ -108,7 +108,7 @@ Material: ...@@ -108,7 +108,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.8490566, g: 0.22828408, b: 0.25897115, a: 1} - _BaseColor: {r: 0.8490566, g: 0.22828408, b: 0.25897115, a: 1}
- _Color: {r: 0.8490566, g: 0.22828403, b: 0.25897112, a: 1} - _Color: {r: 0.8490566, g: 0.22828408, b: 0.25897115, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
......
...@@ -107,7 +107,7 @@ Material: ...@@ -107,7 +107,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.8490566, g: 0.22828408, b: 0.25897115, a: 1} - _BaseColor: {r: 0.8490566, g: 0.22828408, b: 0.25897115, a: 1}
- _Color: {r: 0.8490566, g: 0.22828403, b: 0.25897112, a: 1} - _Color: {r: 0.8490566, g: 0.22828408, b: 0.25897115, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
......
...@@ -108,7 +108,7 @@ Material: ...@@ -108,7 +108,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.37254903, g: 0.6862745, b: 1, a: 1} - _BaseColor: {r: 0.37254903, g: 0.6862745, b: 1, a: 1}
- _Color: {r: 0.372549, g: 0.68627447, b: 1, a: 1} - _Color: {r: 0.37254903, g: 0.6862745, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
......
...@@ -108,7 +108,7 @@ Material: ...@@ -108,7 +108,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.8490566, g: 0.22828408, b: 0.25897115, a: 1} - _BaseColor: {r: 0.8490566, g: 0.22828408, b: 0.25897115, a: 1}
- _Color: {r: 0.8490566, g: 0.22828403, b: 0.25897112, a: 1} - _Color: {r: 0.8490566, g: 0.22828408, b: 0.25897115, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
......
...@@ -108,7 +108,7 @@ Material: ...@@ -108,7 +108,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.37254903, g: 0.6862745, b: 1, a: 1} - _BaseColor: {r: 0.37254903, g: 0.6862745, b: 1, a: 1}
- _Color: {r: 0.372549, g: 0.68627447, b: 1, a: 1} - _Color: {r: 0.37254903, g: 0.6862745, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
......
...@@ -108,7 +108,7 @@ Material: ...@@ -108,7 +108,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.8490566, g: 0.22828408, b: 0.25897115, a: 1} - _BaseColor: {r: 0.8490566, g: 0.22828408, b: 0.25897115, a: 1}
- _Color: {r: 0.8490566, g: 0.22828403, b: 0.25897112, a: 1} - _Color: {r: 0.8490566, g: 0.22828408, b: 0.25897115, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
......
...@@ -121,7 +121,7 @@ Material: ...@@ -121,7 +121,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.5849056, g: 0.30281585, b: 0.22347811, a: 1} - _BaseColor: {r: 0.5849056, g: 0.30281585, b: 0.22347811, a: 1}
- _Color: {r: 0.5849056, g: 0.30281582, b: 0.22347808, a: 1} - _Color: {r: 0.5849056, g: 0.30281585, b: 0.22347811, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
...@@ -120,7 +120,7 @@ Material: ...@@ -120,7 +120,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.3173294, g: 0.67279005, b: 0.9529412, a: 1} - _BaseColor: {r: 0.3173294, g: 0.67279005, b: 0.9529412, a: 1}
- _Color: {r: 0.31732938, g: 0.67279005, b: 0.9529411, a: 1} - _Color: {r: 0.3173294, g: 0.67279005, b: 0.9529412, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
...@@ -122,7 +122,7 @@ Material: ...@@ -122,7 +122,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.17924526, g: 0.17924526, b: 0.17924526, a: 1} - _BaseColor: {r: 0.17924526, g: 0.17924526, b: 0.17924526, a: 1}
- _Color: {r: 0.17924523, g: 0.17924523, b: 0.17924523, a: 1} - _Color: {r: 0.17924526, g: 0.17924526, b: 0.17924526, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
...@@ -131,7 +131,7 @@ Material: ...@@ -131,7 +131,7 @@ Material:
- _ZWriteControl: 0 - _ZWriteControl: 0
m_Colors: m_Colors:
- _BaseColor: {r: 0.3973834, g: 0.6240572, b: 0.8867924, a: 1} - _BaseColor: {r: 0.3973834, g: 0.6240572, b: 0.8867924, a: 1}
- _Color: {r: 0.39738336, g: 0.6240571, b: 0.8867924, a: 1} - _Color: {r: 0.3973834, g: 0.6240572, b: 0.8867924, a: 1}
- _EdgeHighlightColor: {r: 1, g: 1, b: 1, a: 0} - _EdgeHighlightColor: {r: 1, g: 1, b: 1, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
......
...@@ -4,6 +4,7 @@ namespace UnityEngine.XR.Content.Interaction ...@@ -4,6 +4,7 @@ namespace UnityEngine.XR.Content.Interaction
{ {
/// <summary> /// <summary>
/// Triggers a Unity Event once when an interactable is selected by an interactor. /// Triggers a Unity Event once when an interactable is selected by an interactor.
/// 当抓去了手枪之后,飞盘飞起来
/// </summary> /// </summary>
public class OnSelectInteractable : MonoBehaviour public class OnSelectInteractable : MonoBehaviour
{ {
......
...@@ -120,7 +120,7 @@ Material: ...@@ -120,7 +120,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.6226415, g: 0.6226415, b: 0.6226415, a: 1} - _BaseColor: {r: 0.6226415, g: 0.6226415, b: 0.6226415, a: 1}
- _Color: {r: 0.62264144, g: 0.62264144, b: 0.62264144, a: 1} - _Color: {r: 0.6226415, g: 0.6226415, b: 0.6226415, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
...@@ -107,7 +107,7 @@ Material: ...@@ -107,7 +107,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.3726415, g: 0.6860132, b: 1, a: 1} - _BaseColor: {r: 0.3726415, g: 0.6860132, b: 1, a: 1}
- _Color: {r: 0.37264147, g: 0.6860132, b: 1, a: 1} - _Color: {r: 0.3726415, g: 0.6860132, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
......
...@@ -107,7 +107,7 @@ Material: ...@@ -107,7 +107,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.5722232, g: 0.65651053, b: 0.7264151, a: 1} - _BaseColor: {r: 0.5722232, g: 0.65651053, b: 0.7264151, a: 1}
- _Color: {r: 0.5722232, g: 0.6565105, b: 0.7264151, a: 1} - _Color: {r: 0.5722232, g: 0.65651053, b: 0.7264151, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
......
...@@ -108,7 +108,7 @@ Material: ...@@ -108,7 +108,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.8490566, g: 0.22828408, b: 0.25897115, a: 1} - _BaseColor: {r: 0.8490566, g: 0.22828408, b: 0.25897115, a: 1}
- _Color: {r: 0.8490566, g: 0.22828403, b: 0.25897112, a: 1} - _Color: {r: 0.8490566, g: 0.22828408, b: 0.25897115, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
......
...@@ -107,7 +107,7 @@ Material: ...@@ -107,7 +107,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.33962262, g: 0.33962262, b: 0.33962262, a: 1} - _BaseColor: {r: 0.33962262, g: 0.33962262, b: 0.33962262, a: 1}
- _Color: {r: 0.3396226, g: 0.3396226, b: 0.3396226, a: 1} - _Color: {r: 0.33962262, g: 0.33962262, b: 0.33962262, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
......
...@@ -107,7 +107,7 @@ Material: ...@@ -107,7 +107,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.6860092, g: 0.751691, b: 0.7735849, a: 1} - _BaseColor: {r: 0.6860092, g: 0.751691, b: 0.7735849, a: 1}
- _Color: {r: 0.6860092, g: 0.7516909, b: 0.7735849, a: 1} - _Color: {r: 0.6860092, g: 0.751691, b: 0.7735849, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
......
...@@ -107,7 +107,7 @@ Material: ...@@ -107,7 +107,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.3018868, g: 0.21929513, b: 0.21929513, a: 1} - _BaseColor: {r: 0.3018868, g: 0.21929513, b: 0.21929513, a: 1}
- _Color: {r: 0.30188674, g: 0.21929508, b: 0.21929508, a: 1} - _Color: {r: 0.3018868, g: 0.21929513, b: 0.21929513, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
......
...@@ -120,7 +120,7 @@ Material: ...@@ -120,7 +120,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.30758277, g: 0.47837672, b: 0.6792453, a: 1} - _BaseColor: {r: 0.30758277, g: 0.47837672, b: 0.6792453, a: 1}
- _Color: {r: 0.30758274, g: 0.47837663, b: 0.6792453, a: 1} - _Color: {r: 0.30758277, g: 0.47837672, b: 0.6792453, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
...@@ -120,7 +120,7 @@ Material: ...@@ -120,7 +120,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.254717, g: 0.23068708, b: 0.23068708, a: 1} - _BaseColor: {r: 0.254717, g: 0.23068708, b: 0.23068708, a: 1}
- _Color: {r: 0.25471696, g: 0.23068705, b: 0.23068705, a: 1} - _Color: {r: 0.254717, g: 0.23068708, b: 0.23068708, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
...@@ -107,7 +107,7 @@ Material: ...@@ -107,7 +107,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.40939835, g: 0.45683855, b: 0.4716981, a: 1} - _BaseColor: {r: 0.40939835, g: 0.45683855, b: 0.4716981, a: 1}
- _Color: {r: 0.40939832, g: 0.4568385, b: 0.4716981, a: 1} - _Color: {r: 0.40939835, g: 0.45683855, b: 0.4716981, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
......
...@@ -108,7 +108,7 @@ Material: ...@@ -108,7 +108,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.5276344, g: 0.6066215, b: 0.6698113, a: 1} - _BaseColor: {r: 0.5276344, g: 0.6066215, b: 0.6698113, a: 1}
- _Color: {r: 0.5276343, g: 0.60662144, b: 0.6698113, a: 1} - _Color: {r: 0.5276344, g: 0.6066215, b: 0.6698113, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
......
...@@ -108,7 +108,7 @@ Material: ...@@ -108,7 +108,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.5276344, g: 0.6066215, b: 0.6698113, a: 1} - _BaseColor: {r: 0.5276344, g: 0.6066215, b: 0.6698113, a: 1}
- _Color: {r: 0.5276343, g: 0.60662144, b: 0.6698113, a: 1} - _Color: {r: 0.5276344, g: 0.6066215, b: 0.6698113, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
......
...@@ -108,7 +108,7 @@ Material: ...@@ -108,7 +108,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.3018868, g: 0.24829283, b: 0.20363119, a: 1} - _BaseColor: {r: 0.3018868, g: 0.24829283, b: 0.20363119, a: 1}
- _Color: {r: 0.30188674, g: 0.2482928, b: 0.20363116, a: 1} - _Color: {r: 0.3018868, g: 0.24829283, b: 0.20363119, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
......
...@@ -121,7 +121,7 @@ Material: ...@@ -121,7 +121,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.7169812, g: 0.25444508, b: 0, a: 1} - _BaseColor: {r: 0.7169812, g: 0.25444508, b: 0, a: 1}
- _Color: {r: 0.7169812, g: 0.25444505, b: 0, a: 1} - _Color: {r: 0.7169812, g: 0.25444508, b: 0, a: 1}
- _EmissionColor: {r: 0.30121204, g: 0.04866747, b: 0, a: 1} - _EmissionColor: {r: 0.30121204, g: 0.04866747, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
...@@ -120,7 +120,7 @@ Material: ...@@ -120,7 +120,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.51172936, g: 0.5471698, b: 0.25035602, a: 1} - _BaseColor: {r: 0.51172936, g: 0.5471698, b: 0.25035602, a: 1}
- _Color: {r: 0.51172936, g: 0.5471698, b: 0.250356, a: 1} - _Color: {r: 0.51172936, g: 0.5471698, b: 0.25035602, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
...@@ -120,7 +120,7 @@ Material: ...@@ -120,7 +120,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.4741701, g: 0.5754717, b: 0.29587933, a: 1} - _BaseColor: {r: 0.4741701, g: 0.5754717, b: 0.29587933, a: 1}
- _Color: {r: 0.4741701, g: 0.57547164, b: 0.2958793, a: 1} - _Color: {r: 0.4741701, g: 0.5754717, b: 0.29587933, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
...@@ -108,7 +108,7 @@ Material: ...@@ -108,7 +108,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.5377358, g: 0.03297438, b: 0.03297438, a: 1} - _BaseColor: {r: 0.5377358, g: 0.03297438, b: 0.03297438, a: 1}
- _Color: {r: 0.53773576, g: 0.03297438, b: 0.03297438, a: 1} - _Color: {r: 0.5377358, g: 0.03297438, b: 0.03297438, a: 1}
- _EmissionColor: {r: 0.2702231, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0.2702231, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
......
...@@ -123,7 +123,7 @@ Material: ...@@ -123,7 +123,7 @@ Material:
- _ZWrite: 0 - _ZWrite: 0
m_Colors: m_Colors:
- _BaseColor: {r: 0.7075472, g: 0.8212788, b: 1, a: 0.03529412} - _BaseColor: {r: 0.7075472, g: 0.8212788, b: 1, a: 0.03529412}
- _Color: {r: 0.7075471, g: 0.8212788, b: 1, a: 0.03529412} - _Color: {r: 0.7075472, g: 0.8212788, b: 1, a: 0.03529412}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
...@@ -120,7 +120,7 @@ Material: ...@@ -120,7 +120,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.18803689, g: 0.18803689, b: 0.18803689, a: 1} - _BaseColor: {r: 0.18803689, g: 0.18803689, b: 0.18803689, a: 1}
- _Color: {r: 0.18803686, g: 0.18803686, b: 0.18803686, a: 1} - _Color: {r: 0.18803689, g: 0.18803689, b: 0.18803689, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
...@@ -125,7 +125,7 @@ Material: ...@@ -125,7 +125,7 @@ Material:
- _BaseColor: {r: 0.20418847, g: 1, b: 0, a: 1} - _BaseColor: {r: 0.20418847, g: 1, b: 0, a: 1}
- _BaseColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0} - _BaseColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
- _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 0.20418844, g: 1, b: 0, a: 1} - _Color: {r: 0.20418847, g: 1, b: 0, a: 1}
- _EmissionColor: {r: 0.2582343, g: 16.646744, b: 0, a: 1} - _EmissionColor: {r: 0.2582343, g: 16.646744, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
......
...@@ -125,7 +125,7 @@ Material: ...@@ -125,7 +125,7 @@ Material:
- _BaseColor: {r: 0, g: 0.17668843, b: 1, a: 1} - _BaseColor: {r: 0, g: 0.17668843, b: 1, a: 1}
- _BaseColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0} - _BaseColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
- _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 0, g: 0.1766884, b: 1, a: 1} - _Color: {r: 0, g: 0.17668843, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 1.796299, b: 54.856552, a: 1} - _EmissionColor: {r: 0, g: 1.796299, b: 54.856552, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
......
...@@ -125,7 +125,7 @@ Material: ...@@ -125,7 +125,7 @@ Material:
- _BaseColor: {r: 1, g: 0.49936983, b: 0, a: 1} - _BaseColor: {r: 1, g: 0.49936983, b: 0, a: 1}
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 1, g: 0.49936974, b: 0, a: 1} - _Color: {r: 1, g: 0.49936983, b: 0, a: 1}
- _EmissionColor: {r: 12.001898, g: 1.0098066, b: 0.04812291, a: 1} - _EmissionColor: {r: 12.001898, g: 1.0098066, b: 0.04812291, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
......
...@@ -125,7 +125,7 @@ Material: ...@@ -125,7 +125,7 @@ Material:
- _BaseColor: {r: 0.40784314, g: 0.10980392, b: 0.8901961, a: 1} - _BaseColor: {r: 0.40784314, g: 0.10980392, b: 0.8901961, a: 1}
- _BaseColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0} - _BaseColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
- _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 0.4078431, g: 0.10980389, b: 0.8901961, a: 1} - _Color: {r: 0.40784314, g: 0.10980392, b: 0.8901961, a: 1}
- _EmissionColor: {r: 0.11968581, g: 0, b: 54.85657, a: 1} - _EmissionColor: {r: 0.11968581, g: 0, b: 54.85657, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
......
...@@ -107,7 +107,7 @@ Material: ...@@ -107,7 +107,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.6981132, g: 0.4544322, b: 0.45867008, a: 1} - _BaseColor: {r: 0.6981132, g: 0.4544322, b: 0.45867008, a: 1}
- _Color: {r: 0.6981132, g: 0.4544322, b: 0.45867002, a: 1} - _Color: {r: 0.6981132, g: 0.4544322, b: 0.45867008, a: 1}
- _EmissionColor: {r: 0.074176654, g: 0.074176654, b: 0.074176654, a: 1} - _EmissionColor: {r: 0.074176654, g: 0.074176654, b: 0.074176654, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
......
...@@ -120,7 +120,7 @@ Material: ...@@ -120,7 +120,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.12103953, g: 0.14880742, b: 0.16037738, a: 1} - _BaseColor: {r: 0.12103953, g: 0.14880742, b: 0.16037738, a: 1}
- _Color: {r: 0.1210395, g: 0.14880738, b: 0.16037735, a: 1} - _Color: {r: 0.12103953, g: 0.14880742, b: 0.16037738, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
...@@ -120,7 +120,7 @@ Material: ...@@ -120,7 +120,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.16981131, g: 0.16981131, b: 0.16981131, a: 1} - _BaseColor: {r: 0.16981131, g: 0.16981131, b: 0.16981131, a: 1}
- _Color: {r: 0.16981128, g: 0.16981128, b: 0.16981128, a: 1} - _Color: {r: 0.16981131, g: 0.16981131, b: 0.16981131, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
...@@ -121,7 +121,7 @@ Material: ...@@ -121,7 +121,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.8867924, g: 0.7505487, b: 0.50195795, a: 1} - _BaseColor: {r: 0.8867924, g: 0.7505487, b: 0.50195795, a: 1}
- _Color: {r: 0.8867924, g: 0.7505487, b: 0.5019579, a: 1} - _Color: {r: 0.8867924, g: 0.7505487, b: 0.50195795, a: 1}
- _EmissionColor: {r: 3.84442, g: 3.5412502, b: 2.786263, a: 1} - _EmissionColor: {r: 3.84442, g: 3.5412502, b: 2.786263, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
Subproject commit 4f4ea6cc69bfa28769a265b1a33c8376f927e885 Subproject commit 24bf63921fcde0c26a8b5b50e1748dd5e12e6898
...@@ -1761,7 +1761,7 @@ HingeJoint: ...@@ -1761,7 +1761,7 @@ HingeJoint:
m_Axis: {x: 0, y: 0, z: 1} m_Axis: {x: 0, y: 0, z: 1}
m_AutoConfigureConnectedAnchor: 1 m_AutoConfigureConnectedAnchor: 1
m_ConnectedAnchor: {x: -1.914615, y: 2.141095, z: 1.4571652} m_ConnectedAnchor: {x: -1.914615, y: 2.141095, z: 1.4571652}
m_UseSpring: 1 m_UseSpring: 0
m_Spring: m_Spring:
spring: 10 spring: 10
damper: 0.2 damper: 0.2
...@@ -1880,7 +1880,7 @@ HingeJoint: ...@@ -1880,7 +1880,7 @@ HingeJoint:
m_Axis: {x: 0, y: 0, z: 1} m_Axis: {x: 0, y: 0, z: 1}
m_AutoConfigureConnectedAnchor: 1 m_AutoConfigureConnectedAnchor: 1
m_ConnectedAnchor: {x: 0, y: 0, z: 0} m_ConnectedAnchor: {x: 0, y: 0, z: 0}
m_UseSpring: 1 m_UseSpring: 0
m_Spring: m_Spring:
spring: 10 spring: 10
damper: 0.2 damper: 0.2
...@@ -8011,6 +8011,10 @@ PrefabInstance: ...@@ -8011,6 +8011,10 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: "\u5012\u8BA1\u65F6UI (1)" value: "\u5012\u8BA1\u65F6UI (1)"
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3334770396958329295, guid: 4a96e7ec2a002c24882f856cd52fc562, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4a96e7ec2a002c24882f856cd52fc562, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4a96e7ec2a002c24882f856cd52fc562, type: 3}
--- !u!224 &345788031 stripped --- !u!224 &345788031 stripped
...@@ -19553,6 +19557,10 @@ PrefabInstance: ...@@ -19553,6 +19557,10 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: XR Device Simulator value: XR Device Simulator
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6598815579406187037, guid: 18ddb545287c546e19cc77dc9fbb2189, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 18ddb545287c546e19cc77dc9fbb2189, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 18ddb545287c546e19cc77dc9fbb2189, type: 3}
--- !u!4 &922103120 stripped --- !u!4 &922103120 stripped
...@@ -19560,6 +19568,11 @@ Transform: ...@@ -19560,6 +19568,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 6598815579406187027, guid: 18ddb545287c546e19cc77dc9fbb2189, type: 3} m_CorrespondingSourceObject: {fileID: 6598815579406187027, guid: 18ddb545287c546e19cc77dc9fbb2189, type: 3}
m_PrefabInstance: {fileID: 922103119} m_PrefabInstance: {fileID: 922103119}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &922103121 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6598815579406187037, guid: 18ddb545287c546e19cc77dc9fbb2189, type: 3}
m_PrefabInstance: {fileID: 922103119}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &923620911 --- !u!1001 &923620911
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -39513,7 +39526,6 @@ MonoBehaviour: ...@@ -39513,7 +39526,6 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_simulator: {fileID: 2137546374} _simulator: {fileID: 2137546374}
VR_Player: {fileID: 1125154550}
--- !u!1001 &1718475794 --- !u!1001 &1718475794
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -49716,12 +49728,26 @@ MonoBehaviour: ...@@ -49716,12 +49728,26 @@ MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6598815579406187026, guid: 18ddb545287c546e19cc77dc9fbb2189, type: 3} m_CorrespondingSourceObject: {fileID: 6598815579406187026, guid: 18ddb545287c546e19cc77dc9fbb2189, type: 3}
m_PrefabInstance: {fileID: 922103119} m_PrefabInstance: {fileID: 922103119}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0} m_GameObject: {fileID: 922103121}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5b34befe5d0cbb642bb5d09104a47160, type: 3} m_Script: {fileID: 11500000, guid: 5b34befe5d0cbb642bb5d09104a47160, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!114 &2137546375
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 922103121}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 017c5e3933235514c9520e1dace2a4b2, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ActionAssets:
- {fileID: -944628639613478452, guid: da2b439d1a2de5c46a4f428f8cf4fe19, type: 3}
--- !u!1001 &2142190207 --- !u!1001 &2142190207
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
This diff is collapsed.
This diff is collapsed.
fileFormatVersion: 2
guid: a52a514cc8ffb8e4690dd350ebd27495
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
#if UNITY_EDITOR
using System;
using UnityEditor.Build;
using UnityEditor.Build.Reporting;
public class MsvcStdextWorkaround : IPreprocessBuildWithReport
{
const string kWorkaroundFlag = "/D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS";
public int callbackOrder => 0;
public void OnPreprocessBuild(BuildReport report)
{
var clEnv = Environment.GetEnvironmentVariable("_CL_");
if (string.IsNullOrEmpty(clEnv))
{
Environment.SetEnvironmentVariable("_CL_", kWorkaroundFlag);
}
else if (!clEnv.Contains(kWorkaroundFlag))
{
clEnv += " " + kWorkaroundFlag;
Environment.SetEnvironmentVariable("_CL_", clEnv);
}
}
}
#endif // UNITY_EDITOR
\ No newline at end of file
using UnityEngine;
public class TurnColour : MonoBehaviour
{
public Renderer _renderer;
public Color color = Color.white; // 默认为白色
public float alpha = 1f; // 默认完全不透明
private void Awake()
{
ApplyColorAffordance(color, alpha);
}
private void Update()
{
ApplyColorAffordance(color, alpha);
}
private void ApplyColorAffordance(Color newColor, float newAlpha)
{
// 创建材质属性块
MaterialPropertyBlock propertyBlock = new MaterialPropertyBlock();
// 设置颜色属性值
propertyBlock.SetColor("_Color", newColor);
// 设置透明度
propertyBlock.SetFloat("_Alpha", newAlpha);
// 应用属性块到渲染器
_renderer.SetPropertyBlock(propertyBlock);
}
}
fileFormatVersion: 2 fileFormatVersion: 2
guid: 3db5eb6ff0b60bb4aa9605ae53909324 guid: 415e57f7104311b498ed16d38293ec81
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
......
...@@ -10,7 +10,7 @@ public class BaseXRManager : MonoBehaviour ...@@ -10,7 +10,7 @@ public class BaseXRManager : MonoBehaviour
[SerializeField] [SerializeField]
private XRDeviceSimulator _simulator; private XRDeviceSimulator _simulator;
private void Start() private void Awake()
{ {
if (_simulator) if (_simulator)
{ {
...@@ -19,6 +19,15 @@ public class BaseXRManager : MonoBehaviour ...@@ -19,6 +19,15 @@ public class BaseXRManager : MonoBehaviour
EnableVR(); EnableVR();
} }
//private void Start()
//{
// if (_simulator)
// {
// _simulator.gameObject.SetActive(false);
// }
// EnableVR();
//}
private void EnableVR() private void EnableVR()
{ {
StartCoroutine(StartXRCoroutine()); StartCoroutine(StartXRCoroutine());
......
...@@ -183,7 +183,7 @@ public class MathGame : MonoBehaviour ...@@ -183,7 +183,7 @@ public class MathGame : MonoBehaviour
/// 点击回答按钮 /// 点击回答按钮
/// </summary> /// </summary>
/// <param name="digit"></param> /// <param name="digit"></param>
public void AddDigit(int digit) public void AddDigit(string digit)
{ {
answerText.text += digit; answerText.text += digit;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment