Merge branch 'MinusEins/feature/UIHistory' into MinusEins/development

rwth-acis · Jan 29, 2023 · 121a0de · 121a0de
2 parents a753eb5 + 530246b
commit 121a0de
Show file tree

Hide file tree

Showing 23 changed files with 9,900 additions and 929 deletions.
diff --git a/Frontend/VIAProMa/Assets/ButtonThemes/AvatarCategoryTabDefaultTheme.asset b/Frontend/VIAProMa/Assets/ButtonThemes/AvatarCategoryTabDefaultTheme.asset
@@ -12,22 +12,22 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e7e7db9a2688ed540af9819c456ba2e2, type: 3}
   m_Name: AvatarCategoryTabDefaultTheme
   m_EditorClassIdentifier: 
-  Name: 
-  Settings:
-  - Name: ScaleOffsetColorTheme
+  definitions:
+  - ClassName: ScaleOffsetColorTheme
     AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.ScaleOffsetColorTheme,
       Microsoft.MixedReality.Toolkit.SDK, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
-    Properties:
-    - Name: Scale
-      Type: 6
-      Values:
+    stateProperties:
+    - name: Scale
+      type: 6
+      values:
       - Name: Default
         String: 
         Bool: 0
         Int: 0
         Float: 0
         Texture: {fileID: 0}
         Material: {fileID: 0}
+        Shader: {fileID: 0}
         GameObject: {fileID: 0}
         Vector2: {x: 0, y: 0}
         Vector3: {x: 1, y: 1, z: 1}
@@ -43,6 +43,7 @@ MonoBehaviour:
         Float: 0
         Texture: {fileID: 0}
         Material: {fileID: 0}
+        Shader: {fileID: 0}
         GameObject: {fileID: 0}
         Vector2: {x: 0, y: 0}
         Vector3: {x: 1, y: 1, z: 1}
@@ -58,6 +59,7 @@ MonoBehaviour:
         Float: 0
         Texture: {fileID: 0}
         Material: {fileID: 0}
+        Shader: {fileID: 0}
         GameObject: {fileID: 0}
         Vector2: {x: 0, y: 0}
         Vector3: {x: 1, y: 1, z: 1}
@@ -73,6 +75,7 @@ MonoBehaviour:
         Float: 0
         Texture: {fileID: 0}
         Material: {fileID: 0}
+        Shader: {fileID: 0}
         GameObject: {fileID: 0}
         Vector2: {x: 0, y: 0}
         Vector3: {x: 1, y: 1, z: 1}
@@ -81,14 +84,15 @@ MonoBehaviour:
         Quaternion: {x: 0, y: 0, z: 0, w: 0}
         AudioClip: {fileID: 0}
         Animation: {fileID: 0}
-      StartValue:
+      startValue:
         Name: 
         String: 
         Bool: 0
         Int: 0
         Float: 0
         Texture: {fileID: 0}
         Material: {fileID: 0}
+        Shader: {fileID: 0}
         GameObject: {fileID: 0}
         Vector2: {x: 0, y: 0}
         Vector3: {x: 0, y: 0, z: 0}
@@ -97,17 +101,15 @@ MonoBehaviour:
         Quaternion: {x: 0, y: 0, z: 0, w: 0}
         AudioClip: {fileID: 0}
         Animation: {fileID: 0}
-      PropId: 0
-      ShaderOptions: []
-      ShaderOptionNames: []
-      Default:
+      defaultValue:
         Name: 
         String: 
         Bool: 0
         Int: 0
         Float: 0
         Texture: {fileID: 0}
         Material: {fileID: 0}
+        Shader: {fileID: 0}
         GameObject: {fileID: 0}
         Vector2: {x: 0, y: 0}
         Vector3: {x: 0, y: 0, z: 0}
@@ -116,17 +118,23 @@ MonoBehaviour:
         Quaternion: {x: 0, y: 0, z: 0, w: 0}
         AudioClip: {fileID: 0}
         Animation: {fileID: 0}
+      targetShader: {fileID: 0}
+      shaderPropertyName: 
+      PropId: 0
+      ShaderOptions: []
+      ShaderOptionNames: []
       ShaderName: 
-    - Name: Offset
-      Type: 6
-      Values:
+    - name: Offset
+      type: 6
+      values:
       - Name: Default
         String: 
         Bool: 0
         Int: 0
         Float: 0
         Texture: {fileID: 0}
         Material: {fileID: 0}
+        Shader: {fileID: 0}
         GameObject: {fileID: 0}
         Vector2: {x: 0, y: 0}
         Vector3: {x: 0, y: 0, z: 0}
@@ -142,6 +150,7 @@ MonoBehaviour:
         Float: 0
         Texture: {fileID: 0}
         Material: {fileID: 0}
+        Shader: {fileID: 0}
         GameObject: {fileID: 0}
         Vector2: {x: 0, y: 0}
         Vector3: {x: 0, y: 0, z: 0}
@@ -157,6 +166,7 @@ MonoBehaviour:
         Float: 0
         Texture: {fileID: 0}
         Material: {fileID: 0}
+        Shader: {fileID: 0}
         GameObject: {fileID: 0}
         Vector2: {x: 0, y: 0}
         Vector3: {x: 0, y: 0, z: 0}
@@ -172,6 +182,7 @@ MonoBehaviour:
         Float: 0
         Texture: {fileID: 0}
         Material: {fileID: 0}
+        Shader: {fileID: 0}
         GameObject: {fileID: 0}
         Vector2: {x: 0, y: 0}
         Vector3: {x: 0, y: 0, z: 0}
@@ -180,14 +191,15 @@ MonoBehaviour:
         Quaternion: {x: 0, y: 0, z: 0, w: 0}
         AudioClip: {fileID: 0}
         Animation: {fileID: 0}
-      StartValue:
+      startValue:
         Name: 
         String: 
         Bool: 0
         Int: 0
         Float: 0
         Texture: {fileID: 0}
         Material: {fileID: 0}
+        Shader: {fileID: 0}
         GameObject: {fileID: 0}
         Vector2: {x: 0, y: 0}
         Vector3: {x: 0, y: 0, z: 0}
@@ -196,17 +208,15 @@ MonoBehaviour:
         Quaternion: {x: 0, y: 0, z: 0, w: 0}
         AudioClip: {fileID: 0}
         Animation: {fileID: 0}
-      PropId: 0
-      ShaderOptions: []
-      ShaderOptionNames: []
-      Default:
+      defaultValue:
         Name: 
         String: 
         Bool: 0
         Int: 0
         Float: 0
         Texture: {fileID: 0}
         Material: {fileID: 0}
+        Shader: {fileID: 0}
         GameObject: {fileID: 0}
         Vector2: {x: 0, y: 0}
         Vector3: {x: 0, y: 0, z: 0}
@@ -215,17 +225,23 @@ MonoBehaviour:
         Quaternion: {x: 0, y: 0, z: 0, w: 0}
         AudioClip: {fileID: 0}
         Animation: {fileID: 0}
+      targetShader: {fileID: 0}
+      shaderPropertyName: 
+      PropId: 0
+      ShaderOptions: []
+      ShaderOptionNames: []
       ShaderName: 
-    - Name: Color
-      Type: 2
-      Values:
+    - name: Color
+      type: 2
+      values:
       - Name: Default
         String: 
         Bool: 0
         Int: 0
         Float: 0
         Texture: {fileID: 0}
         Material: {fileID: 0}
+        Shader: {fileID: 0}
         GameObject: {fileID: 0}
         Vector2: {x: 0, y: 0}
         Vector3: {x: 0, y: 0, z: 0}
@@ -241,6 +257,7 @@ MonoBehaviour:
         Float: 0
         Texture: {fileID: 0}
         Material: {fileID: 0}
+        Shader: {fileID: 0}
         GameObject: {fileID: 0}
         Vector2: {x: 0, y: 0}
         Vector3: {x: 0, y: 0, z: 0}
@@ -256,6 +273,7 @@ MonoBehaviour:
         Float: 0
         Texture: {fileID: 0}
         Material: {fileID: 0}
+        Shader: {fileID: 0}
         GameObject: {fileID: 0}
         Vector2: {x: 0, y: 0}
         Vector3: {x: 0, y: 0, z: 0}
@@ -271,6 +289,7 @@ MonoBehaviour:
         Float: 0
         Texture: {fileID: 0}
         Material: {fileID: 0}
+        Shader: {fileID: 0}
         GameObject: {fileID: 0}
         Vector2: {x: 0, y: 0}
         Vector3: {x: 0, y: 0, z: 0}
@@ -279,14 +298,15 @@ MonoBehaviour:
         Quaternion: {x: 0, y: 0, z: 0, w: 0}
         AudioClip: {fileID: 0}
         Animation: {fileID: 0}
-      StartValue:
+      startValue:
         Name: 
         String: 
         Bool: 0
         Int: 0
         Float: 0
         Texture: {fileID: 0}
         Material: {fileID: 0}
+        Shader: {fileID: 0}
         GameObject: {fileID: 0}
         Vector2: {x: 0, y: 0}
         Vector3: {x: 0, y: 0, z: 0}
@@ -295,53 +315,15 @@ MonoBehaviour:
         Quaternion: {x: 0, y: 0, z: 0, w: 0}
         AudioClip: {fileID: 0}
         Animation: {fileID: 0}
-      PropId: 0
-      ShaderOptions:
-      - Name: _Color
-        Type: 0
-        Range: {x: 1, y: 1}
-      - Name: _EmissiveColor
-        Type: 0
-        Range: {x: 0, y: 0}
-      - Name: _RimColor
-        Type: 0
-        Range: {x: 0.5, y: 0.5}
-      - Name: _ClippingBorderColor
-        Type: 0
-        Range: {x: 0.2, y: 0}
-      - Name: _HoverColorOverride
-        Type: 0
-        Range: {x: 1, y: 1}
-      - Name: _InnerGlowColor
-        Type: 0
-        Range: {x: 1, y: 1}
-      - Name: _EnvironmentColorX
-        Type: 0
-        Range: {x: 0, y: 0}
-      - Name: _EnvironmentColorY
-        Type: 0
-        Range: {x: 1, y: 0}
-      - Name: _EnvironmentColorZ
-        Type: 0
-        Range: {x: 0, y: 1}
-      ShaderOptionNames:
-      - _Color
-      - _EmissiveColor
-      - _RimColor
-      - _ClippingBorderColor
-      - _HoverColorOverride
-      - _InnerGlowColor
-      - _EnvironmentColorX
-      - _EnvironmentColorY
-      - _EnvironmentColorZ
-      Default:
+      defaultValue:
         Name: 
         String: 
         Bool: 0
         Int: 0
         Float: 0
         Texture: {fileID: 0}
         Material: {fileID: 0}
+        Shader: {fileID: 0}
         GameObject: {fileID: 0}
         Vector2: {x: 0, y: 0}
         Vector3: {x: 0, y: 0, z: 0}
@@ -350,9 +332,23 @@ MonoBehaviour:
         Quaternion: {x: 0, y: 0, z: 0, w: 0}
         AudioClip: {fileID: 0}
         Animation: {fileID: 0}
+      targetShader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
+      shaderPropertyName: _Color
+      PropId: 0
+      ShaderOptions: []
+      ShaderOptionNames:
+      - _Color
+      - _EmissiveColor
+      - _RimColor
+      - _ClippingBorderColor
+      - _HoverColorOverride
+      - _InnerGlowColor
+      - _EnvironmentColorX
+      - _EnvironmentColorY
+      - _EnvironmentColorZ
       ShaderName: Mixed Reality Toolkit/Standard
-    History: []
-    Easing:
+    customProperties: []
+    easing:
       Enabled: 1
       Curve:
         serializedVersion: 2
@@ -379,11 +375,4 @@ MonoBehaviour:
         m_PostInfinity: 2
         m_RotationOrder: 4
       LerpTime: 0.5
-    NoEasing: 0
-    IsValid: 1
-    ThemeTarget:
-      Properties: []
-      Target: {fileID: 0}
-      States: []
-  CustomSettings: []
-  States: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}
+  states: {fileID: 11400000, guid: 5eac1712038236e4b8ffdb3893804fe1, type: 2}