--- VRTK/Assets/01.Junil/Scenes/00.InitScene.unity
+++ VRTK/Assets/01.Junil/Scenes/00.InitScene.unity
... | ... | @@ -156,7 +156,7 @@ |
156 | 156 |
m_Children: [] |
157 | 157 |
m_Father: {fileID: 0} |
158 | 158 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
159 |
---- !u!21 &51073135 |
|
159 |
+--- !u!21 &25650589 |
|
160 | 160 |
Material: |
161 | 161 |
serializedVersion: 8 |
162 | 162 |
m_ObjectHideFlags: 0 |
... | ... | @@ -451,6 +451,51 @@ |
451 | 451 |
m_Children: [] |
452 | 452 |
m_Father: {fileID: 0} |
453 | 453 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
454 |
+--- !u!1 &168826865 |
|
455 |
+GameObject: |
|
456 |
+ m_ObjectHideFlags: 0 |
|
457 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
458 |
+ m_PrefabInstance: {fileID: 0} |
|
459 |
+ m_PrefabAsset: {fileID: 0} |
|
460 |
+ serializedVersion: 6 |
|
461 |
+ m_Component: |
|
462 |
+ - component: {fileID: 168826867} |
|
463 |
+ - component: {fileID: 168826866} |
|
464 |
+ m_Layer: 0 |
|
465 |
+ m_Name: Entitlement |
|
466 |
+ m_TagString: Untagged |
|
467 |
+ m_Icon: {fileID: 0} |
|
468 |
+ m_NavMeshLayer: 0 |
|
469 |
+ m_StaticEditorFlags: 0 |
|
470 |
+ m_IsActive: 1 |
|
471 |
+--- !u!114 &168826866 |
|
472 |
+MonoBehaviour: |
|
473 |
+ m_ObjectHideFlags: 0 |
|
474 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
475 |
+ m_PrefabInstance: {fileID: 0} |
|
476 |
+ m_PrefabAsset: {fileID: 0} |
|
477 |
+ m_GameObject: {fileID: 168826865} |
|
478 |
+ m_Enabled: 1 |
|
479 |
+ m_EditorHideFlags: 0 |
|
480 |
+ m_Script: {fileID: 11500000, guid: f0f8f3cde43c25b4abe357598ec48a4a, type: 3} |
|
481 |
+ m_Name: |
|
482 |
+ m_EditorClassIdentifier: |
|
483 |
+ timeOut: 10 |
|
484 |
+--- !u!4 &168826867 |
|
485 |
+Transform: |
|
486 |
+ m_ObjectHideFlags: 0 |
|
487 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
488 |
+ m_PrefabInstance: {fileID: 0} |
|
489 |
+ m_PrefabAsset: {fileID: 0} |
|
490 |
+ m_GameObject: {fileID: 168826865} |
|
491 |
+ serializedVersion: 2 |
|
492 |
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} |
|
493 |
+ m_LocalPosition: {x: 0, y: 0, z: 0} |
|
494 |
+ m_LocalScale: {x: 1, y: 1, z: 1} |
|
495 |
+ m_ConstrainProportionsScale: 0 |
|
496 |
+ m_Children: [] |
|
497 |
+ m_Father: {fileID: 0} |
|
498 |
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
|
454 | 499 |
--- !u!1 &249144039 |
455 | 500 |
GameObject: |
456 | 501 |
m_ObjectHideFlags: 0 |
... | ... | @@ -586,6 +631,45 @@ |
586 | 631 |
m_PrefabAsset: {fileID: 0} |
587 | 632 |
m_GameObject: {fileID: 249144039} |
588 | 633 |
m_CullTransparentMesh: 1 |
634 |
+--- !u!21 &577570053 |
|
635 |
+Material: |
|
636 |
+ serializedVersion: 8 |
|
637 |
+ m_ObjectHideFlags: 0 |
|
638 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
639 |
+ m_PrefabInstance: {fileID: 0} |
|
640 |
+ m_PrefabAsset: {fileID: 0} |
|
641 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
642 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
643 |
+ m_Parent: {fileID: 0} |
|
644 |
+ m_ModifiedSerializedProperties: 0 |
|
645 |
+ m_ValidKeywords: [] |
|
646 |
+ m_InvalidKeywords: [] |
|
647 |
+ m_LightmapFlags: 4 |
|
648 |
+ m_EnableInstancingVariants: 0 |
|
649 |
+ m_DoubleSidedGI: 0 |
|
650 |
+ m_CustomRenderQueue: -1 |
|
651 |
+ stringTagMap: {} |
|
652 |
+ disabledShaderPasses: [] |
|
653 |
+ m_LockedProperties: |
|
654 |
+ m_SavedProperties: |
|
655 |
+ serializedVersion: 3 |
|
656 |
+ m_TexEnvs: |
|
657 |
+ - _MainTex: |
|
658 |
+ m_Texture: {fileID: 0} |
|
659 |
+ m_Scale: {x: 1, y: 1} |
|
660 |
+ m_Offset: {x: 0, y: 0} |
|
661 |
+ m_Ints: [] |
|
662 |
+ m_Floats: |
|
663 |
+ - _ColorMask: 15 |
|
664 |
+ - _Stencil: 0 |
|
665 |
+ - _StencilComp: 8 |
|
666 |
+ - _StencilOp: 0 |
|
667 |
+ - _StencilReadMask: 255 |
|
668 |
+ - _StencilWriteMask: 255 |
|
669 |
+ - _UseUIAlphaClip: 0 |
|
670 |
+ m_Colors: |
|
671 |
+ - _WidthHeightRadius: {r: 800, g: 450, b: 40, a: 0} |
|
672 |
+ m_BuildTextureStacks: [] |
|
589 | 673 |
--- !u!1 &777275547 |
590 | 674 |
GameObject: |
591 | 675 |
m_ObjectHideFlags: 0 |
... | ... | @@ -633,7 +717,7 @@ |
633 | 717 |
metamotionUI: {fileID: 951198323} |
634 | 718 |
appLoginUI: {fileID: 1665449406} |
635 | 719 |
pressTxtObj: {fileID: 1368832410} |
636 |
- isNoUpdate: 0 |
|
720 |
+ isNoUpdate: 1 |
|
637 | 721 |
isOnClick: 0 |
638 | 722 |
anyKeyInput: |
639 | 723 |
m_UseReference: 1 |
... | ... | @@ -700,7 +784,7 @@ |
700 | 784 |
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} |
701 | 785 |
m_Name: |
702 | 786 |
m_EditorClassIdentifier: |
703 |
- m_Material: {fileID: 1049269417} |
|
787 |
+ m_Material: {fileID: 25650589} |
|
704 | 788 |
m_Color: {r: 1, g: 1, b: 1, a: 1} |
705 | 789 |
m_RaycastTarget: 1 |
706 | 790 |
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} |
... | ... | @@ -740,84 +824,6 @@ |
740 | 824 |
m_EditorClassIdentifier: |
741 | 825 |
radius: 20 |
742 | 826 |
image: {fileID: 951198325} |
743 |
---- !u!21 &1029498795 |
|
744 |
-Material: |
|
745 |
- serializedVersion: 8 |
|
746 |
- m_ObjectHideFlags: 0 |
|
747 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
748 |
- m_PrefabInstance: {fileID: 0} |
|
749 |
- m_PrefabAsset: {fileID: 0} |
|
750 |
- m_Name: UI/RoundedCorners/RoundedCorners |
|
751 |
- m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
752 |
- m_Parent: {fileID: 0} |
|
753 |
- m_ModifiedSerializedProperties: 0 |
|
754 |
- m_ValidKeywords: [] |
|
755 |
- m_InvalidKeywords: [] |
|
756 |
- m_LightmapFlags: 4 |
|
757 |
- m_EnableInstancingVariants: 0 |
|
758 |
- m_DoubleSidedGI: 0 |
|
759 |
- m_CustomRenderQueue: -1 |
|
760 |
- stringTagMap: {} |
|
761 |
- disabledShaderPasses: [] |
|
762 |
- m_LockedProperties: |
|
763 |
- m_SavedProperties: |
|
764 |
- serializedVersion: 3 |
|
765 |
- m_TexEnvs: |
|
766 |
- - _MainTex: |
|
767 |
- m_Texture: {fileID: 0} |
|
768 |
- m_Scale: {x: 1, y: 1} |
|
769 |
- m_Offset: {x: 0, y: 0} |
|
770 |
- m_Ints: [] |
|
771 |
- m_Floats: |
|
772 |
- - _ColorMask: 15 |
|
773 |
- - _Stencil: 0 |
|
774 |
- - _StencilComp: 8 |
|
775 |
- - _StencilOp: 0 |
|
776 |
- - _StencilReadMask: 255 |
|
777 |
- - _StencilWriteMask: 255 |
|
778 |
- - _UseUIAlphaClip: 0 |
|
779 |
- m_Colors: |
|
780 |
- - _WidthHeightRadius: {r: 800, g: 450, b: 40, a: 0} |
|
781 |
- m_BuildTextureStacks: [] |
|
782 |
---- !u!21 &1049269417 |
|
783 |
-Material: |
|
784 |
- serializedVersion: 8 |
|
785 |
- m_ObjectHideFlags: 0 |
|
786 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
787 |
- m_PrefabInstance: {fileID: 0} |
|
788 |
- m_PrefabAsset: {fileID: 0} |
|
789 |
- m_Name: UI/RoundedCorners/RoundedCorners |
|
790 |
- m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
791 |
- m_Parent: {fileID: 0} |
|
792 |
- m_ModifiedSerializedProperties: 0 |
|
793 |
- m_ValidKeywords: [] |
|
794 |
- m_InvalidKeywords: [] |
|
795 |
- m_LightmapFlags: 4 |
|
796 |
- m_EnableInstancingVariants: 0 |
|
797 |
- m_DoubleSidedGI: 0 |
|
798 |
- m_CustomRenderQueue: -1 |
|
799 |
- stringTagMap: {} |
|
800 |
- disabledShaderPasses: [] |
|
801 |
- m_LockedProperties: |
|
802 |
- m_SavedProperties: |
|
803 |
- serializedVersion: 3 |
|
804 |
- m_TexEnvs: |
|
805 |
- - _MainTex: |
|
806 |
- m_Texture: {fileID: 0} |
|
807 |
- m_Scale: {x: 1, y: 1} |
|
808 |
- m_Offset: {x: 0, y: 0} |
|
809 |
- m_Ints: [] |
|
810 |
- m_Floats: |
|
811 |
- - _ColorMask: 15 |
|
812 |
- - _Stencil: 0 |
|
813 |
- - _StencilComp: 8 |
|
814 |
- - _StencilOp: 0 |
|
815 |
- - _StencilReadMask: 255 |
|
816 |
- - _StencilWriteMask: 255 |
|
817 |
- - _UseUIAlphaClip: 0 |
|
818 |
- m_Colors: |
|
819 |
- - _WidthHeightRadius: {r: 800, g: 450, b: 40, a: 0} |
|
820 |
- m_BuildTextureStacks: [] |
|
821 | 827 |
--- !u!1 &1091513887 |
822 | 828 |
GameObject: |
823 | 829 |
m_ObjectHideFlags: 0 |
... | ... | @@ -919,7 +925,7 @@ |
919 | 925 |
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} |
920 | 926 |
m_Name: |
921 | 927 |
m_EditorClassIdentifier: |
922 |
- m_Material: {fileID: 51073135} |
|
928 |
+ m_Material: {fileID: 1394320385} |
|
923 | 929 |
m_Color: {r: 0, g: 0, b: 0, a: 0.627451} |
924 | 930 |
m_RaycastTarget: 1 |
925 | 931 |
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} |
... | ... | @@ -1739,6 +1745,45 @@ |
1739 | 1745 |
m_PrefabAsset: {fileID: 0} |
1740 | 1746 |
m_GameObject: {fileID: 1368832410} |
1741 | 1747 |
m_CullTransparentMesh: 1 |
1748 |
+--- !u!21 &1394320385 |
|
1749 |
+Material: |
|
1750 |
+ serializedVersion: 8 |
|
1751 |
+ m_ObjectHideFlags: 0 |
|
1752 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
1753 |
+ m_PrefabInstance: {fileID: 0} |
|
1754 |
+ m_PrefabAsset: {fileID: 0} |
|
1755 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
1756 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
1757 |
+ m_Parent: {fileID: 0} |
|
1758 |
+ m_ModifiedSerializedProperties: 0 |
|
1759 |
+ m_ValidKeywords: [] |
|
1760 |
+ m_InvalidKeywords: [] |
|
1761 |
+ m_LightmapFlags: 4 |
|
1762 |
+ m_EnableInstancingVariants: 0 |
|
1763 |
+ m_DoubleSidedGI: 0 |
|
1764 |
+ m_CustomRenderQueue: -1 |
|
1765 |
+ stringTagMap: {} |
|
1766 |
+ disabledShaderPasses: [] |
|
1767 |
+ m_LockedProperties: |
|
1768 |
+ m_SavedProperties: |
|
1769 |
+ serializedVersion: 3 |
|
1770 |
+ m_TexEnvs: |
|
1771 |
+ - _MainTex: |
|
1772 |
+ m_Texture: {fileID: 0} |
|
1773 |
+ m_Scale: {x: 1, y: 1} |
|
1774 |
+ m_Offset: {x: 0, y: 0} |
|
1775 |
+ m_Ints: [] |
|
1776 |
+ m_Floats: |
|
1777 |
+ - _ColorMask: 15 |
|
1778 |
+ - _Stencil: 0 |
|
1779 |
+ - _StencilComp: 8 |
|
1780 |
+ - _StencilOp: 0 |
|
1781 |
+ - _StencilReadMask: 255 |
|
1782 |
+ - _StencilWriteMask: 255 |
|
1783 |
+ - _UseUIAlphaClip: 0 |
|
1784 |
+ m_Colors: |
|
1785 |
+ - _WidthHeightRadius: {r: 800, g: 450, b: 40, a: 0} |
|
1786 |
+ m_BuildTextureStacks: [] |
|
1742 | 1787 |
--- !u!1 &1628293475 |
1743 | 1788 |
GameObject: |
1744 | 1789 |
m_ObjectHideFlags: 0 |
... | ... | @@ -1872,7 +1917,7 @@ |
1872 | 1917 |
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} |
1873 | 1918 |
m_Name: |
1874 | 1919 |
m_EditorClassIdentifier: |
1875 |
- m_Material: {fileID: 1029498795} |
|
1920 |
+ m_Material: {fileID: 577570053} |
|
1876 | 1921 |
m_Color: {r: 1, g: 1, b: 1, a: 1} |
1877 | 1922 |
m_RaycastTarget: 1 |
1878 | 1923 |
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} |
... | ... | @@ -16185,7 +16230,7 @@ |
16185 | 16230 |
type: 3} |
16186 | 16231 |
StrafeSpeed: 1 |
16187 | 16232 |
StrafeSprintSpeed: 1.25 |
16188 |
- JumpForce: 3 |
|
16233 |
+ JumpForce: 0 |
|
16189 | 16234 |
JumpInput: 00000000 |
16190 | 16235 |
JumpAction: {fileID: -9021694325216703141, guid: e39f4b35a6db18348b41eb0262520e69, |
16191 | 16236 |
type: 3} |
... | ... | @@ -25192,7 +25237,7 @@ |
25192 | 25237 |
m_Icon: {fileID: 0} |
25193 | 25238 |
m_NavMeshLayer: 0 |
25194 | 25239 |
m_StaticEditorFlags: 0 |
25195 |
- m_IsActive: 1 |
|
25240 |
+ m_IsActive: 0 |
|
25196 | 25241 |
--- !u!4 &6230062477012298924 |
25197 | 25242 |
Transform: |
25198 | 25243 |
m_ObjectHideFlags: 0 |
... | ... | @@ -36431,7 +36476,7 @@ |
36431 | 36476 |
m_PrefabInstance: {fileID: 0} |
36432 | 36477 |
m_PrefabAsset: {fileID: 0} |
36433 | 36478 |
m_GameObject: {fileID: 2584343032224696397} |
36434 |
- m_Enabled: 1 |
|
36479 |
+ m_Enabled: 0 |
|
36435 | 36480 |
m_EditorHideFlags: 0 |
36436 | 36481 |
m_Script: {fileID: 11500000, guid: 1bd2fd7429a30714ca570a60a988ab32, type: 3} |
36437 | 36482 |
m_Name: |
... | ... | @@ -37634,3 +37679,4 @@ |
37634 | 37679 |
- {fileID: 145822400} |
37635 | 37680 |
- {fileID: 1219925103} |
37636 | 37681 |
- {fileID: 1091513889} |
37682 |
+ - {fileID: 168826867} |
--- VRTK/Assets/01.Junil/Scenes/00.ModelIkTest.unity
+++ VRTK/Assets/01.Junil/Scenes/00.ModelIkTest.unity
This diff is too big to display. |
--- VRTK/Assets/01.Junil/Scenes/04.TK_Scene.unity
+++ VRTK/Assets/01.Junil/Scenes/04.TK_Scene.unity
... | ... | @@ -203,7 +203,7 @@ |
203 | 203 |
m_EditorClassIdentifier: |
204 | 204 |
m_HorizontalFit: 0 |
205 | 205 |
m_VerticalFit: 2 |
206 |
---- !u!21 &72587258 |
|
206 |
+--- !u!21 &28165389 |
|
207 | 207 |
Material: |
208 | 208 |
serializedVersion: 8 |
209 | 209 |
m_ObjectHideFlags: 0 |
... | ... | @@ -242,6 +242,45 @@ |
242 | 242 |
m_Colors: |
243 | 243 |
- _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0} |
244 | 244 |
m_BuildTextureStacks: [] |
245 |
+--- !u!21 &35445010 |
|
246 |
+Material: |
|
247 |
+ serializedVersion: 8 |
|
248 |
+ m_ObjectHideFlags: 0 |
|
249 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
250 |
+ m_PrefabInstance: {fileID: 0} |
|
251 |
+ m_PrefabAsset: {fileID: 0} |
|
252 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
253 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
254 |
+ m_Parent: {fileID: 0} |
|
255 |
+ m_ModifiedSerializedProperties: 0 |
|
256 |
+ m_ValidKeywords: [] |
|
257 |
+ m_InvalidKeywords: [] |
|
258 |
+ m_LightmapFlags: 4 |
|
259 |
+ m_EnableInstancingVariants: 0 |
|
260 |
+ m_DoubleSidedGI: 0 |
|
261 |
+ m_CustomRenderQueue: -1 |
|
262 |
+ stringTagMap: {} |
|
263 |
+ disabledShaderPasses: [] |
|
264 |
+ m_LockedProperties: |
|
265 |
+ m_SavedProperties: |
|
266 |
+ serializedVersion: 3 |
|
267 |
+ m_TexEnvs: |
|
268 |
+ - _MainTex: |
|
269 |
+ m_Texture: {fileID: 0} |
|
270 |
+ m_Scale: {x: 1, y: 1} |
|
271 |
+ m_Offset: {x: 0, y: 0} |
|
272 |
+ m_Ints: [] |
|
273 |
+ m_Floats: |
|
274 |
+ - _ColorMask: 15 |
|
275 |
+ - _Stencil: 0 |
|
276 |
+ - _StencilComp: 8 |
|
277 |
+ - _StencilOp: 0 |
|
278 |
+ - _StencilReadMask: 255 |
|
279 |
+ - _StencilWriteMask: 255 |
|
280 |
+ - _UseUIAlphaClip: 0 |
|
281 |
+ m_Colors: |
|
282 |
+ - _WidthHeightRadius: {r: 50, g: 20, b: 8, a: 0} |
|
283 |
+ m_BuildTextureStacks: [] |
|
245 | 284 |
--- !u!1001 &111259170 |
246 | 285 |
PrefabInstance: |
247 | 286 |
m_ObjectHideFlags: 0 |
... | ... | @@ -260,16 +299,41 @@ |
260 | 299 |
propertyPath: m_AnchorMax.y |
261 | 300 |
value: 0 |
262 | 301 |
objectReference: {fileID: 0} |
302 |
+ - target: {fileID: 493026700955958715, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
|
303 |
+ type: 3} |
|
304 |
+ propertyPath: m_Material |
|
305 |
+ value: |
|
306 |
+ objectReference: {fileID: 1521551904} |
|
263 | 307 |
- target: {fileID: 694883175304625322, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
264 | 308 |
type: 3} |
265 | 309 |
propertyPath: m_Material |
266 | 310 |
value: |
267 |
- objectReference: {fileID: 276755460} |
|
311 |
+ objectReference: {fileID: 1988859065} |
|
268 | 312 |
- target: {fileID: 1024652476880369328, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
269 | 313 |
type: 3} |
270 | 314 |
propertyPath: m_Material |
271 | 315 |
value: |
272 | 316 |
objectReference: {fileID: 1541378491} |
317 |
+ - target: {fileID: 1183065591973936299, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
|
318 |
+ type: 3} |
|
319 |
+ propertyPath: m_Material |
|
320 |
+ value: |
|
321 |
+ objectReference: {fileID: 28165389} |
|
322 |
+ - target: {fileID: 1264947967085963445, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
|
323 |
+ type: 3} |
|
324 |
+ propertyPath: m_Enabled |
|
325 |
+ value: 0 |
|
326 |
+ objectReference: {fileID: 0} |
|
327 |
+ - target: {fileID: 1845862271225141416, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
|
328 |
+ type: 3} |
|
329 |
+ propertyPath: m_Material |
|
330 |
+ value: |
|
331 |
+ objectReference: {fileID: 1935445589} |
|
332 |
+ - target: {fileID: 3136968244178446314, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
|
333 |
+ type: 3} |
|
334 |
+ propertyPath: m_Material |
|
335 |
+ value: |
|
336 |
+ objectReference: {fileID: 324550995} |
|
273 | 337 |
- target: {fileID: 3262382832439577305, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
274 | 338 |
type: 3} |
275 | 339 |
propertyPath: m_AnchoredPosition.x |
... | ... | @@ -284,12 +348,32 @@ |
284 | 348 |
type: 3} |
285 | 349 |
propertyPath: m_Material |
286 | 350 |
value: |
287 |
- objectReference: {fileID: 812064812} |
|
351 |
+ objectReference: {fileID: 1049602717} |
|
352 |
+ - target: {fileID: 4456572421980562742, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
|
353 |
+ type: 3} |
|
354 |
+ propertyPath: m_Material |
|
355 |
+ value: |
|
356 |
+ objectReference: {fileID: 1108239644} |
|
357 |
+ - target: {fileID: 4535177494135943642, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
|
358 |
+ type: 3} |
|
359 |
+ propertyPath: m_Material |
|
360 |
+ value: |
|
361 |
+ objectReference: {fileID: 753659250} |
|
288 | 362 |
- target: {fileID: 5066027179430075191, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
289 | 363 |
type: 3} |
290 | 364 |
propertyPath: m_Material |
291 | 365 |
value: |
292 |
- objectReference: {fileID: 1338993131} |
|
366 |
+ objectReference: {fileID: 331922550} |
|
367 |
+ - target: {fileID: 5509930216631795394, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
|
368 |
+ type: 3} |
|
369 |
+ propertyPath: m_Material |
|
370 |
+ value: |
|
371 |
+ objectReference: {fileID: 1530724336} |
|
372 |
+ - target: {fileID: 5885093626403301413, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
|
373 |
+ type: 3} |
|
374 |
+ propertyPath: m_Material |
|
375 |
+ value: |
|
376 |
+ objectReference: {fileID: 2058290193} |
|
293 | 377 |
- target: {fileID: 5912026499952602004, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
294 | 378 |
type: 3} |
295 | 379 |
propertyPath: m_LocalPosition.x |
... | ... | @@ -340,6 +424,11 @@ |
340 | 424 |
propertyPath: m_LocalEulerAnglesHint.z |
341 | 425 |
value: 0 |
342 | 426 |
objectReference: {fileID: 0} |
427 |
+ - target: {fileID: 6152666896977577269, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
|
428 |
+ type: 3} |
|
429 |
+ propertyPath: m_Material |
|
430 |
+ value: |
|
431 |
+ objectReference: {fileID: 370462652} |
|
343 | 432 |
- target: {fileID: 6319246086841688977, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
344 | 433 |
type: 3} |
345 | 434 |
propertyPath: m_Parameters.widthMultiplier |
... | ... | @@ -349,38 +438,263 @@ |
349 | 438 |
type: 3} |
350 | 439 |
propertyPath: m_Material |
351 | 440 |
value: |
352 |
- objectReference: {fileID: 72587258} |
|
441 |
+ objectReference: {fileID: 240581599} |
|
442 |
+ - target: {fileID: 7002698900906623716, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
|
443 |
+ type: 3} |
|
444 |
+ propertyPath: m_Material |
|
445 |
+ value: |
|
446 |
+ objectReference: {fileID: 1536530577} |
|
353 | 447 |
- target: {fileID: 7072539969491669522, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
354 | 448 |
type: 3} |
355 | 449 |
propertyPath: m_Material |
356 | 450 |
value: |
357 | 451 |
objectReference: {fileID: 1919688643} |
452 |
+ - target: {fileID: 7166393241669345908, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
|
453 |
+ type: 3} |
|
454 |
+ propertyPath: m_Material |
|
455 |
+ value: |
|
456 |
+ objectReference: {fileID: 246931006} |
|
457 |
+ - target: {fileID: 7283428281115504234, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
|
458 |
+ type: 3} |
|
459 |
+ propertyPath: m_Material |
|
460 |
+ value: |
|
461 |
+ objectReference: {fileID: 1522123162} |
|
358 | 462 |
- target: {fileID: 7510963209272482857, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
359 | 463 |
type: 3} |
360 | 464 |
propertyPath: m_Material |
361 | 465 |
value: |
362 |
- objectReference: {fileID: 1836140802} |
|
466 |
+ objectReference: {fileID: 1112221061} |
|
363 | 467 |
- target: {fileID: 8197555497905690887, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
364 | 468 |
type: 3} |
365 | 469 |
propertyPath: m_Name |
366 | 470 |
value: VR_IK_Rig |
367 | 471 |
objectReference: {fileID: 0} |
472 |
+ - target: {fileID: 8357735341095343048, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
|
473 |
+ type: 3} |
|
474 |
+ propertyPath: m_Material |
|
475 |
+ value: |
|
476 |
+ objectReference: {fileID: 1281555230} |
|
477 |
+ - target: {fileID: 8411532955008861834, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
|
478 |
+ type: 3} |
|
479 |
+ propertyPath: m_Material |
|
480 |
+ value: |
|
481 |
+ objectReference: {fileID: 969903528} |
|
368 | 482 |
- target: {fileID: 8867422816790896285, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
369 | 483 |
type: 3} |
370 | 484 |
propertyPath: m_Material |
371 | 485 |
value: |
372 |
- objectReference: {fileID: 1027850072} |
|
486 |
+ objectReference: {fileID: 1445972438} |
|
487 |
+ - target: {fileID: 9021673671511626661, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
|
488 |
+ type: 3} |
|
489 |
+ propertyPath: m_Material |
|
490 |
+ value: |
|
491 |
+ objectReference: {fileID: 224961689} |
|
373 | 492 |
m_RemovedComponents: [] |
374 | 493 |
m_RemovedGameObjects: [] |
375 | 494 |
m_AddedGameObjects: [] |
376 | 495 |
m_AddedComponents: [] |
377 | 496 |
m_SourcePrefab: {fileID: 100100000, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, type: 3} |
497 |
+--- !u!21 &112281358 |
|
498 |
+Material: |
|
499 |
+ serializedVersion: 8 |
|
500 |
+ m_ObjectHideFlags: 0 |
|
501 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
502 |
+ m_PrefabInstance: {fileID: 0} |
|
503 |
+ m_PrefabAsset: {fileID: 0} |
|
504 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
505 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
506 |
+ m_Parent: {fileID: 0} |
|
507 |
+ m_ModifiedSerializedProperties: 0 |
|
508 |
+ m_ValidKeywords: [] |
|
509 |
+ m_InvalidKeywords: [] |
|
510 |
+ m_LightmapFlags: 4 |
|
511 |
+ m_EnableInstancingVariants: 0 |
|
512 |
+ m_DoubleSidedGI: 0 |
|
513 |
+ m_CustomRenderQueue: -1 |
|
514 |
+ stringTagMap: {} |
|
515 |
+ disabledShaderPasses: [] |
|
516 |
+ m_LockedProperties: |
|
517 |
+ m_SavedProperties: |
|
518 |
+ serializedVersion: 3 |
|
519 |
+ m_TexEnvs: |
|
520 |
+ - _MainTex: |
|
521 |
+ m_Texture: {fileID: 0} |
|
522 |
+ m_Scale: {x: 1, y: 1} |
|
523 |
+ m_Offset: {x: 0, y: 0} |
|
524 |
+ m_Ints: [] |
|
525 |
+ m_Floats: |
|
526 |
+ - _ColorMask: 15 |
|
527 |
+ - _Stencil: 0 |
|
528 |
+ - _StencilComp: 8 |
|
529 |
+ - _StencilOp: 0 |
|
530 |
+ - _StencilReadMask: 255 |
|
531 |
+ - _StencilWriteMask: 255 |
|
532 |
+ - _UseUIAlphaClip: 0 |
|
533 |
+ m_Colors: |
|
534 |
+ - _WidthHeightRadius: {r: 24, g: 10, b: 4, a: 0} |
|
535 |
+ m_BuildTextureStacks: [] |
|
378 | 536 |
--- !u!4 &157784992 stripped |
379 | 537 |
Transform: |
380 | 538 |
m_CorrespondingSourceObject: {fileID: 3624948757354426646, guid: a9a38cd3fcd0a6c40a51bf5664f61c53, |
381 | 539 |
type: 3} |
382 | 540 |
m_PrefabInstance: {fileID: 111259170} |
383 | 541 |
m_PrefabAsset: {fileID: 0} |
542 |
+--- !u!21 &171293047 |
|
543 |
+Material: |
|
544 |
+ serializedVersion: 8 |
|
545 |
+ m_ObjectHideFlags: 0 |
|
546 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
547 |
+ m_PrefabInstance: {fileID: 0} |
|
548 |
+ m_PrefabAsset: {fileID: 0} |
|
549 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
550 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
551 |
+ m_Parent: {fileID: 0} |
|
552 |
+ m_ModifiedSerializedProperties: 0 |
|
553 |
+ m_ValidKeywords: [] |
|
554 |
+ m_InvalidKeywords: [] |
|
555 |
+ m_LightmapFlags: 4 |
|
556 |
+ m_EnableInstancingVariants: 0 |
|
557 |
+ m_DoubleSidedGI: 0 |
|
558 |
+ m_CustomRenderQueue: -1 |
|
559 |
+ stringTagMap: {} |
|
560 |
+ disabledShaderPasses: [] |
|
561 |
+ m_LockedProperties: |
|
562 |
+ m_SavedProperties: |
|
563 |
+ serializedVersion: 3 |
|
564 |
+ m_TexEnvs: |
|
565 |
+ - _MainTex: |
|
566 |
+ m_Texture: {fileID: 0} |
|
567 |
+ m_Scale: {x: 1, y: 1} |
|
568 |
+ m_Offset: {x: 0, y: 0} |
|
569 |
+ m_Ints: [] |
|
570 |
+ m_Floats: |
|
571 |
+ - _ColorMask: 15 |
|
572 |
+ - _Stencil: 0 |
|
573 |
+ - _StencilComp: 8 |
|
574 |
+ - _StencilOp: 0 |
|
575 |
+ - _StencilReadMask: 255 |
|
576 |
+ - _StencilWriteMask: 255 |
|
577 |
+ - _UseUIAlphaClip: 0 |
|
578 |
+ m_Colors: |
|
579 |
+ - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0} |
|
580 |
+ m_BuildTextureStacks: [] |
|
581 |
+--- !u!21 &224961689 |
|
582 |
+Material: |
|
583 |
+ serializedVersion: 8 |
|
584 |
+ m_ObjectHideFlags: 0 |
|
585 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
586 |
+ m_PrefabInstance: {fileID: 0} |
|
587 |
+ m_PrefabAsset: {fileID: 0} |
|
588 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
589 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
590 |
+ m_Parent: {fileID: 0} |
|
591 |
+ m_ModifiedSerializedProperties: 0 |
|
592 |
+ m_ValidKeywords: [] |
|
593 |
+ m_InvalidKeywords: [] |
|
594 |
+ m_LightmapFlags: 4 |
|
595 |
+ m_EnableInstancingVariants: 0 |
|
596 |
+ m_DoubleSidedGI: 0 |
|
597 |
+ m_CustomRenderQueue: -1 |
|
598 |
+ stringTagMap: {} |
|
599 |
+ disabledShaderPasses: [] |
|
600 |
+ m_LockedProperties: |
|
601 |
+ m_SavedProperties: |
|
602 |
+ serializedVersion: 3 |
|
603 |
+ m_TexEnvs: |
|
604 |
+ - _MainTex: |
|
605 |
+ m_Texture: {fileID: 0} |
|
606 |
+ m_Scale: {x: 1, y: 1} |
|
607 |
+ m_Offset: {x: 0, y: 0} |
|
608 |
+ m_Ints: [] |
|
609 |
+ m_Floats: |
|
610 |
+ - _ColorMask: 15 |
|
611 |
+ - _Stencil: 0 |
|
612 |
+ - _StencilComp: 8 |
|
613 |
+ - _StencilOp: 0 |
|
614 |
+ - _StencilReadMask: 255 |
|
615 |
+ - _StencilWriteMask: 255 |
|
616 |
+ - _UseUIAlphaClip: 0 |
|
617 |
+ m_Colors: |
|
618 |
+ - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0} |
|
619 |
+ m_BuildTextureStacks: [] |
|
620 |
+--- !u!21 &240581599 |
|
621 |
+Material: |
|
622 |
+ serializedVersion: 8 |
|
623 |
+ m_ObjectHideFlags: 0 |
|
624 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
625 |
+ m_PrefabInstance: {fileID: 0} |
|
626 |
+ m_PrefabAsset: {fileID: 0} |
|
627 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
628 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
629 |
+ m_Parent: {fileID: 0} |
|
630 |
+ m_ModifiedSerializedProperties: 0 |
|
631 |
+ m_ValidKeywords: [] |
|
632 |
+ m_InvalidKeywords: [] |
|
633 |
+ m_LightmapFlags: 4 |
|
634 |
+ m_EnableInstancingVariants: 0 |
|
635 |
+ m_DoubleSidedGI: 0 |
|
636 |
+ m_CustomRenderQueue: -1 |
|
637 |
+ stringTagMap: {} |
|
638 |
+ disabledShaderPasses: [] |
|
639 |
+ m_LockedProperties: |
|
640 |
+ m_SavedProperties: |
|
641 |
+ serializedVersion: 3 |
|
642 |
+ m_TexEnvs: |
|
643 |
+ - _MainTex: |
|
644 |
+ m_Texture: {fileID: 0} |
|
645 |
+ m_Scale: {x: 1, y: 1} |
|
646 |
+ m_Offset: {x: 0, y: 0} |
|
647 |
+ m_Ints: [] |
|
648 |
+ m_Floats: |
|
649 |
+ - _ColorMask: 15 |
|
650 |
+ - _Stencil: 0 |
|
651 |
+ - _StencilComp: 8 |
|
652 |
+ - _StencilOp: 0 |
|
653 |
+ - _StencilReadMask: 255 |
|
654 |
+ - _StencilWriteMask: 255 |
|
655 |
+ - _UseUIAlphaClip: 0 |
|
656 |
+ m_Colors: |
|
657 |
+ - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0} |
|
658 |
+ m_BuildTextureStacks: [] |
|
659 |
+--- !u!21 &246931006 |
|
660 |
+Material: |
|
661 |
+ serializedVersion: 8 |
|
662 |
+ m_ObjectHideFlags: 0 |
|
663 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
664 |
+ m_PrefabInstance: {fileID: 0} |
|
665 |
+ m_PrefabAsset: {fileID: 0} |
|
666 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
667 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
668 |
+ m_Parent: {fileID: 0} |
|
669 |
+ m_ModifiedSerializedProperties: 0 |
|
670 |
+ m_ValidKeywords: [] |
|
671 |
+ m_InvalidKeywords: [] |
|
672 |
+ m_LightmapFlags: 4 |
|
673 |
+ m_EnableInstancingVariants: 0 |
|
674 |
+ m_DoubleSidedGI: 0 |
|
675 |
+ m_CustomRenderQueue: -1 |
|
676 |
+ stringTagMap: {} |
|
677 |
+ disabledShaderPasses: [] |
|
678 |
+ m_LockedProperties: |
|
679 |
+ m_SavedProperties: |
|
680 |
+ serializedVersion: 3 |
|
681 |
+ m_TexEnvs: |
|
682 |
+ - _MainTex: |
|
683 |
+ m_Texture: {fileID: 0} |
|
684 |
+ m_Scale: {x: 1, y: 1} |
|
685 |
+ m_Offset: {x: 0, y: 0} |
|
686 |
+ m_Ints: [] |
|
687 |
+ m_Floats: |
|
688 |
+ - _ColorMask: 15 |
|
689 |
+ - _Stencil: 0 |
|
690 |
+ - _StencilComp: 8 |
|
691 |
+ - _StencilOp: 0 |
|
692 |
+ - _StencilReadMask: 255 |
|
693 |
+ - _StencilWriteMask: 255 |
|
694 |
+ - _UseUIAlphaClip: 0 |
|
695 |
+ m_Colors: |
|
696 |
+ - _WidthHeightRadius: {r: 24, g: 10, b: 8, a: 0} |
|
697 |
+ m_BuildTextureStacks: [] |
|
384 | 698 |
--- !u!1 &252877261 |
385 | 699 |
GameObject: |
386 | 700 |
m_ObjectHideFlags: 0 |
... | ... | @@ -517,7 +831,38 @@ |
517 | 831 |
m_AnchoredPosition: {x: 0, y: 1.5} |
518 | 832 |
m_SizeDelta: {x: 500, y: 500} |
519 | 833 |
m_Pivot: {x: 0.5, y: 0.5} |
520 |
---- !u!21 &276755460 |
|
834 |
+--- !u!1 &301333514 |
|
835 |
+GameObject: |
|
836 |
+ m_ObjectHideFlags: 0 |
|
837 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
838 |
+ m_PrefabInstance: {fileID: 0} |
|
839 |
+ m_PrefabAsset: {fileID: 0} |
|
840 |
+ serializedVersion: 6 |
|
841 |
+ m_Component: |
|
842 |
+ - component: {fileID: 301333515} |
|
843 |
+ m_Layer: 0 |
|
844 |
+ m_Name: ======[Etc]============ |
|
845 |
+ m_TagString: Untagged |
|
846 |
+ m_Icon: {fileID: 0} |
|
847 |
+ m_NavMeshLayer: 0 |
|
848 |
+ m_StaticEditorFlags: 0 |
|
849 |
+ m_IsActive: 1 |
|
850 |
+--- !u!4 &301333515 |
|
851 |
+Transform: |
|
852 |
+ m_ObjectHideFlags: 0 |
|
853 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
854 |
+ m_PrefabInstance: {fileID: 0} |
|
855 |
+ m_PrefabAsset: {fileID: 0} |
|
856 |
+ m_GameObject: {fileID: 301333514} |
|
857 |
+ serializedVersion: 2 |
|
858 |
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} |
|
859 |
+ m_LocalPosition: {x: 0, y: 0, z: 0} |
|
860 |
+ m_LocalScale: {x: 1, y: 1, z: 1} |
|
861 |
+ m_ConstrainProportionsScale: 0 |
|
862 |
+ m_Children: [] |
|
863 |
+ m_Father: {fileID: 0} |
|
864 |
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
|
865 |
+--- !u!21 &318539065 |
|
521 | 866 |
Material: |
522 | 867 |
serializedVersion: 8 |
523 | 868 |
m_ObjectHideFlags: 0 |
... | ... | @@ -554,39 +899,86 @@ |
554 | 899 |
- _StencilWriteMask: 255 |
555 | 900 |
- _UseUIAlphaClip: 0 |
556 | 901 |
m_Colors: |
557 |
- - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0} |
|
902 |
+ - _WidthHeightRadius: {r: 24, g: 10, b: 4, a: 0} |
|
558 | 903 |
m_BuildTextureStacks: [] |
559 |
---- !u!1 &301333514 |
|
560 |
-GameObject: |
|
904 |
+--- !u!21 &324550995 |
|
905 |
+Material: |
|
906 |
+ serializedVersion: 8 |
|
561 | 907 |
m_ObjectHideFlags: 0 |
562 | 908 |
m_CorrespondingSourceObject: {fileID: 0} |
563 | 909 |
m_PrefabInstance: {fileID: 0} |
564 | 910 |
m_PrefabAsset: {fileID: 0} |
565 |
- serializedVersion: 6 |
|
566 |
- m_Component: |
|
567 |
- - component: {fileID: 301333515} |
|
568 |
- m_Layer: 0 |
|
569 |
- m_Name: ======[Etc]============ |
|
570 |
- m_TagString: Untagged |
|
571 |
- m_Icon: {fileID: 0} |
|
572 |
- m_NavMeshLayer: 0 |
|
573 |
- m_StaticEditorFlags: 0 |
|
574 |
- m_IsActive: 1 |
|
575 |
---- !u!4 &301333515 |
|
576 |
-Transform: |
|
911 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
912 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
913 |
+ m_Parent: {fileID: 0} |
|
914 |
+ m_ModifiedSerializedProperties: 0 |
|
915 |
+ m_ValidKeywords: [] |
|
916 |
+ m_InvalidKeywords: [] |
|
917 |
+ m_LightmapFlags: 4 |
|
918 |
+ m_EnableInstancingVariants: 0 |
|
919 |
+ m_DoubleSidedGI: 0 |
|
920 |
+ m_CustomRenderQueue: -1 |
|
921 |
+ stringTagMap: {} |
|
922 |
+ disabledShaderPasses: [] |
|
923 |
+ m_LockedProperties: |
|
924 |
+ m_SavedProperties: |
|
925 |
+ serializedVersion: 3 |
|
926 |
+ m_TexEnvs: |
|
927 |
+ - _MainTex: |
|
928 |
+ m_Texture: {fileID: 0} |
|
929 |
+ m_Scale: {x: 1, y: 1} |
|
930 |
+ m_Offset: {x: 0, y: 0} |
|
931 |
+ m_Ints: [] |
|
932 |
+ m_Floats: |
|
933 |
+ - _ColorMask: 15 |
|
934 |
+ - _Stencil: 0 |
|
935 |
+ - _StencilComp: 8 |
|
936 |
+ - _StencilOp: 0 |
|
937 |
+ - _StencilReadMask: 255 |
|
938 |
+ - _StencilWriteMask: 255 |
|
939 |
+ - _UseUIAlphaClip: 0 |
|
940 |
+ m_Colors: |
|
941 |
+ - _WidthHeightRadius: {r: 55, g: 20, b: 8, a: 0} |
|
942 |
+ m_BuildTextureStacks: [] |
|
943 |
+--- !u!21 &331922550 |
|
944 |
+Material: |
|
945 |
+ serializedVersion: 8 |
|
577 | 946 |
m_ObjectHideFlags: 0 |
578 | 947 |
m_CorrespondingSourceObject: {fileID: 0} |
579 | 948 |
m_PrefabInstance: {fileID: 0} |
580 | 949 |
m_PrefabAsset: {fileID: 0} |
581 |
- m_GameObject: {fileID: 301333514} |
|
582 |
- serializedVersion: 2 |
|
583 |
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} |
|
584 |
- m_LocalPosition: {x: 0, y: 0, z: 0} |
|
585 |
- m_LocalScale: {x: 1, y: 1, z: 1} |
|
586 |
- m_ConstrainProportionsScale: 0 |
|
587 |
- m_Children: [] |
|
588 |
- m_Father: {fileID: 0} |
|
589 |
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
|
950 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
951 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
952 |
+ m_Parent: {fileID: 0} |
|
953 |
+ m_ModifiedSerializedProperties: 0 |
|
954 |
+ m_ValidKeywords: [] |
|
955 |
+ m_InvalidKeywords: [] |
|
956 |
+ m_LightmapFlags: 4 |
|
957 |
+ m_EnableInstancingVariants: 0 |
|
958 |
+ m_DoubleSidedGI: 0 |
|
959 |
+ m_CustomRenderQueue: -1 |
|
960 |
+ stringTagMap: {} |
|
961 |
+ disabledShaderPasses: [] |
|
962 |
+ m_LockedProperties: |
|
963 |
+ m_SavedProperties: |
|
964 |
+ serializedVersion: 3 |
|
965 |
+ m_TexEnvs: |
|
966 |
+ - _MainTex: |
|
967 |
+ m_Texture: {fileID: 0} |
|
968 |
+ m_Scale: {x: 1, y: 1} |
|
969 |
+ m_Offset: {x: 0, y: 0} |
|
970 |
+ m_Ints: [] |
|
971 |
+ m_Floats: |
|
972 |
+ - _ColorMask: 15 |
|
973 |
+ - _Stencil: 0 |
|
974 |
+ - _StencilComp: 8 |
|
975 |
+ - _StencilOp: 0 |
|
976 |
+ - _StencilReadMask: 255 |
|
977 |
+ - _StencilWriteMask: 255 |
|
978 |
+ - _UseUIAlphaClip: 0 |
|
979 |
+ m_Colors: |
|
980 |
+ - _WidthHeightRadius: {r: 55, g: 20, b: 8, a: 0} |
|
981 |
+ m_BuildTextureStacks: [] |
|
590 | 982 |
--- !u!1 &347417642 |
591 | 983 |
GameObject: |
592 | 984 |
m_ObjectHideFlags: 0 |
... | ... | @@ -632,6 +1024,45 @@ |
632 | 1024 |
m_Children: [] |
633 | 1025 |
m_Father: {fileID: 0} |
634 | 1026 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
1027 |
+--- !u!21 &370462652 |
|
1028 |
+Material: |
|
1029 |
+ serializedVersion: 8 |
|
1030 |
+ m_ObjectHideFlags: 0 |
|
1031 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
1032 |
+ m_PrefabInstance: {fileID: 0} |
|
1033 |
+ m_PrefabAsset: {fileID: 0} |
|
1034 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
1035 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
1036 |
+ m_Parent: {fileID: 0} |
|
1037 |
+ m_ModifiedSerializedProperties: 0 |
|
1038 |
+ m_ValidKeywords: [] |
|
1039 |
+ m_InvalidKeywords: [] |
|
1040 |
+ m_LightmapFlags: 4 |
|
1041 |
+ m_EnableInstancingVariants: 0 |
|
1042 |
+ m_DoubleSidedGI: 0 |
|
1043 |
+ m_CustomRenderQueue: -1 |
|
1044 |
+ stringTagMap: {} |
|
1045 |
+ disabledShaderPasses: [] |
|
1046 |
+ m_LockedProperties: |
|
1047 |
+ m_SavedProperties: |
|
1048 |
+ serializedVersion: 3 |
|
1049 |
+ m_TexEnvs: |
|
1050 |
+ - _MainTex: |
|
1051 |
+ m_Texture: {fileID: 0} |
|
1052 |
+ m_Scale: {x: 1, y: 1} |
|
1053 |
+ m_Offset: {x: 0, y: 0} |
|
1054 |
+ m_Ints: [] |
|
1055 |
+ m_Floats: |
|
1056 |
+ - _ColorMask: 15 |
|
1057 |
+ - _Stencil: 0 |
|
1058 |
+ - _StencilComp: 8 |
|
1059 |
+ - _StencilOp: 0 |
|
1060 |
+ - _StencilReadMask: 255 |
|
1061 |
+ - _StencilWriteMask: 255 |
|
1062 |
+ - _UseUIAlphaClip: 0 |
|
1063 |
+ m_Colors: |
|
1064 |
+ - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0} |
|
1065 |
+ m_BuildTextureStacks: [] |
|
635 | 1066 |
--- !u!1 &383757023 |
636 | 1067 |
GameObject: |
637 | 1068 |
m_ObjectHideFlags: 0 |
... | ... | @@ -826,6 +1257,45 @@ |
826 | 1257 |
m_UseViewFrustumForShadowCasterCull: 1 |
827 | 1258 |
m_ShadowRadius: 0 |
828 | 1259 |
m_ShadowAngle: 0 |
1260 |
+--- !u!21 &560512085 |
|
1261 |
+Material: |
|
1262 |
+ serializedVersion: 8 |
|
1263 |
+ m_ObjectHideFlags: 0 |
|
1264 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
1265 |
+ m_PrefabInstance: {fileID: 0} |
|
1266 |
+ m_PrefabAsset: {fileID: 0} |
|
1267 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
1268 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
1269 |
+ m_Parent: {fileID: 0} |
|
1270 |
+ m_ModifiedSerializedProperties: 0 |
|
1271 |
+ m_ValidKeywords: [] |
|
1272 |
+ m_InvalidKeywords: [] |
|
1273 |
+ m_LightmapFlags: 4 |
|
1274 |
+ m_EnableInstancingVariants: 0 |
|
1275 |
+ m_DoubleSidedGI: 0 |
|
1276 |
+ m_CustomRenderQueue: -1 |
|
1277 |
+ stringTagMap: {} |
|
1278 |
+ disabledShaderPasses: [] |
|
1279 |
+ m_LockedProperties: |
|
1280 |
+ m_SavedProperties: |
|
1281 |
+ serializedVersion: 3 |
|
1282 |
+ m_TexEnvs: |
|
1283 |
+ - _MainTex: |
|
1284 |
+ m_Texture: {fileID: 0} |
|
1285 |
+ m_Scale: {x: 1, y: 1} |
|
1286 |
+ m_Offset: {x: 0, y: 0} |
|
1287 |
+ m_Ints: [] |
|
1288 |
+ m_Floats: |
|
1289 |
+ - _ColorMask: 15 |
|
1290 |
+ - _Stencil: 0 |
|
1291 |
+ - _StencilComp: 8 |
|
1292 |
+ - _StencilOp: 0 |
|
1293 |
+ - _StencilReadMask: 255 |
|
1294 |
+ - _StencilWriteMask: 255 |
|
1295 |
+ - _UseUIAlphaClip: 0 |
|
1296 |
+ m_Colors: |
|
1297 |
+ - _WidthHeightRadius: {r: 24, g: 10, b: 4, a: 0} |
|
1298 |
+ m_BuildTextureStacks: [] |
|
829 | 1299 |
--- !u!1 &561969259 |
830 | 1300 |
GameObject: |
831 | 1301 |
m_ObjectHideFlags: 0 |
... | ... | @@ -1037,6 +1507,45 @@ |
1037 | 1507 |
m_Children: [] |
1038 | 1508 |
m_Father: {fileID: 0} |
1039 | 1509 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
1510 |
+--- !u!21 &655522345 |
|
1511 |
+Material: |
|
1512 |
+ serializedVersion: 8 |
|
1513 |
+ m_ObjectHideFlags: 0 |
|
1514 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
1515 |
+ m_PrefabInstance: {fileID: 0} |
|
1516 |
+ m_PrefabAsset: {fileID: 0} |
|
1517 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
1518 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
1519 |
+ m_Parent: {fileID: 0} |
|
1520 |
+ m_ModifiedSerializedProperties: 0 |
|
1521 |
+ m_ValidKeywords: [] |
|
1522 |
+ m_InvalidKeywords: [] |
|
1523 |
+ m_LightmapFlags: 4 |
|
1524 |
+ m_EnableInstancingVariants: 0 |
|
1525 |
+ m_DoubleSidedGI: 0 |
|
1526 |
+ m_CustomRenderQueue: -1 |
|
1527 |
+ stringTagMap: {} |
|
1528 |
+ disabledShaderPasses: [] |
|
1529 |
+ m_LockedProperties: |
|
1530 |
+ m_SavedProperties: |
|
1531 |
+ serializedVersion: 3 |
|
1532 |
+ m_TexEnvs: |
|
1533 |
+ - _MainTex: |
|
1534 |
+ m_Texture: {fileID: 0} |
|
1535 |
+ m_Scale: {x: 1, y: 1} |
|
1536 |
+ m_Offset: {x: 0, y: 0} |
|
1537 |
+ m_Ints: [] |
|
1538 |
+ m_Floats: |
|
1539 |
+ - _ColorMask: 15 |
|
1540 |
+ - _Stencil: 0 |
|
1541 |
+ - _StencilComp: 8 |
|
1542 |
+ - _StencilOp: 0 |
|
1543 |
+ - _StencilReadMask: 255 |
|
1544 |
+ - _StencilWriteMask: 255 |
|
1545 |
+ - _UseUIAlphaClip: 0 |
|
1546 |
+ m_Colors: |
|
1547 |
+ - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0} |
|
1548 |
+ m_BuildTextureStacks: [] |
|
1040 | 1549 |
--- !u!1 &686175806 |
1041 | 1550 |
GameObject: |
1042 | 1551 |
m_ObjectHideFlags: 0 |
... | ... | @@ -1068,6 +1577,45 @@ |
1068 | 1577 |
m_Children: [] |
1069 | 1578 |
m_Father: {fileID: 0} |
1070 | 1579 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
1580 |
+--- !u!21 &722981234 |
|
1581 |
+Material: |
|
1582 |
+ serializedVersion: 8 |
|
1583 |
+ m_ObjectHideFlags: 0 |
|
1584 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
1585 |
+ m_PrefabInstance: {fileID: 0} |
|
1586 |
+ m_PrefabAsset: {fileID: 0} |
|
1587 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
1588 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
1589 |
+ m_Parent: {fileID: 0} |
|
1590 |
+ m_ModifiedSerializedProperties: 0 |
|
1591 |
+ m_ValidKeywords: [] |
|
1592 |
+ m_InvalidKeywords: [] |
|
1593 |
+ m_LightmapFlags: 4 |
|
1594 |
+ m_EnableInstancingVariants: 0 |
|
1595 |
+ m_DoubleSidedGI: 0 |
|
1596 |
+ m_CustomRenderQueue: -1 |
|
1597 |
+ stringTagMap: {} |
|
1598 |
+ disabledShaderPasses: [] |
|
1599 |
+ m_LockedProperties: |
|
1600 |
+ m_SavedProperties: |
|
1601 |
+ serializedVersion: 3 |
|
1602 |
+ m_TexEnvs: |
|
1603 |
+ - _MainTex: |
|
1604 |
+ m_Texture: {fileID: 0} |
|
1605 |
+ m_Scale: {x: 1, y: 1} |
|
1606 |
+ m_Offset: {x: 0, y: 0} |
|
1607 |
+ m_Ints: [] |
|
1608 |
+ m_Floats: |
|
1609 |
+ - _ColorMask: 15 |
|
1610 |
+ - _Stencil: 0 |
|
1611 |
+ - _StencilComp: 8 |
|
1612 |
+ - _StencilOp: 0 |
|
1613 |
+ - _StencilReadMask: 255 |
|
1614 |
+ - _StencilWriteMask: 255 |
|
1615 |
+ - _UseUIAlphaClip: 0 |
|
1616 |
+ m_Colors: |
|
1617 |
+ - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0} |
|
1618 |
+ m_BuildTextureStacks: [] |
|
1071 | 1619 |
--- !u!1 &732364239 |
1072 | 1620 |
GameObject: |
1073 | 1621 |
m_ObjectHideFlags: 0 |
... | ... | @@ -1175,6 +1723,123 @@ |
1175 | 1723 |
m_PrefabAsset: {fileID: 0} |
1176 | 1724 |
m_GameObject: {fileID: 732364239} |
1177 | 1725 |
m_CullTransparentMesh: 1 |
1726 |
+--- !u!21 &736482562 |
|
1727 |
+Material: |
|
1728 |
+ serializedVersion: 8 |
|
1729 |
+ m_ObjectHideFlags: 0 |
|
1730 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
1731 |
+ m_PrefabInstance: {fileID: 0} |
|
1732 |
+ m_PrefabAsset: {fileID: 0} |
|
1733 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
1734 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
1735 |
+ m_Parent: {fileID: 0} |
|
1736 |
+ m_ModifiedSerializedProperties: 0 |
|
1737 |
+ m_ValidKeywords: [] |
|
1738 |
+ m_InvalidKeywords: [] |
|
1739 |
+ m_LightmapFlags: 4 |
|
1740 |
+ m_EnableInstancingVariants: 0 |
|
1741 |
+ m_DoubleSidedGI: 0 |
|
1742 |
+ m_CustomRenderQueue: -1 |
|
1743 |
+ stringTagMap: {} |
|
1744 |
+ disabledShaderPasses: [] |
|
1745 |
+ m_LockedProperties: |
|
1746 |
+ m_SavedProperties: |
|
1747 |
+ serializedVersion: 3 |
|
1748 |
+ m_TexEnvs: |
|
1749 |
+ - _MainTex: |
|
1750 |
+ m_Texture: {fileID: 0} |
|
1751 |
+ m_Scale: {x: 1, y: 1} |
|
1752 |
+ m_Offset: {x: 0, y: 0} |
|
1753 |
+ m_Ints: [] |
|
1754 |
+ m_Floats: |
|
1755 |
+ - _ColorMask: 15 |
|
1756 |
+ - _Stencil: 0 |
|
1757 |
+ - _StencilComp: 8 |
|
1758 |
+ - _StencilOp: 0 |
|
1759 |
+ - _StencilReadMask: 255 |
|
1760 |
+ - _StencilWriteMask: 255 |
|
1761 |
+ - _UseUIAlphaClip: 0 |
|
1762 |
+ m_Colors: |
|
1763 |
+ - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0} |
|
1764 |
+ m_BuildTextureStacks: [] |
|
1765 |
+--- !u!21 &753659250 |
|
1766 |
+Material: |
|
1767 |
+ serializedVersion: 8 |
|
1768 |
+ m_ObjectHideFlags: 0 |
|
1769 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
1770 |
+ m_PrefabInstance: {fileID: 0} |
|
1771 |
+ m_PrefabAsset: {fileID: 0} |
|
1772 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
1773 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
1774 |
+ m_Parent: {fileID: 0} |
|
1775 |
+ m_ModifiedSerializedProperties: 0 |
|
1776 |
+ m_ValidKeywords: [] |
|
1777 |
+ m_InvalidKeywords: [] |
|
1778 |
+ m_LightmapFlags: 4 |
|
1779 |
+ m_EnableInstancingVariants: 0 |
|
1780 |
+ m_DoubleSidedGI: 0 |
|
1781 |
+ m_CustomRenderQueue: -1 |
|
1782 |
+ stringTagMap: {} |
|
1783 |
+ disabledShaderPasses: [] |
|
1784 |
+ m_LockedProperties: |
|
1785 |
+ m_SavedProperties: |
|
1786 |
+ serializedVersion: 3 |
|
1787 |
+ m_TexEnvs: |
|
1788 |
+ - _MainTex: |
|
1789 |
+ m_Texture: {fileID: 0} |
|
1790 |
+ m_Scale: {x: 1, y: 1} |
|
1791 |
+ m_Offset: {x: 0, y: 0} |
|
1792 |
+ m_Ints: [] |
|
1793 |
+ m_Floats: |
|
1794 |
+ - _ColorMask: 15 |
|
1795 |
+ - _Stencil: 0 |
|
1796 |
+ - _StencilComp: 8 |
|
1797 |
+ - _StencilOp: 0 |
|
1798 |
+ - _StencilReadMask: 255 |
|
1799 |
+ - _StencilWriteMask: 255 |
|
1800 |
+ - _UseUIAlphaClip: 0 |
|
1801 |
+ m_Colors: |
|
1802 |
+ - _WidthHeightRadius: {r: 24, g: 10, b: 8, a: 0} |
|
1803 |
+ m_BuildTextureStacks: [] |
|
1804 |
+--- !u!21 &783264045 |
|
1805 |
+Material: |
|
1806 |
+ serializedVersion: 8 |
|
1807 |
+ m_ObjectHideFlags: 0 |
|
1808 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
1809 |
+ m_PrefabInstance: {fileID: 0} |
|
1810 |
+ m_PrefabAsset: {fileID: 0} |
|
1811 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
1812 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
1813 |
+ m_Parent: {fileID: 0} |
|
1814 |
+ m_ModifiedSerializedProperties: 0 |
|
1815 |
+ m_ValidKeywords: [] |
|
1816 |
+ m_InvalidKeywords: [] |
|
1817 |
+ m_LightmapFlags: 4 |
|
1818 |
+ m_EnableInstancingVariants: 0 |
|
1819 |
+ m_DoubleSidedGI: 0 |
|
1820 |
+ m_CustomRenderQueue: -1 |
|
1821 |
+ stringTagMap: {} |
|
1822 |
+ disabledShaderPasses: [] |
|
1823 |
+ m_LockedProperties: |
|
1824 |
+ m_SavedProperties: |
|
1825 |
+ serializedVersion: 3 |
|
1826 |
+ m_TexEnvs: |
|
1827 |
+ - _MainTex: |
|
1828 |
+ m_Texture: {fileID: 0} |
|
1829 |
+ m_Scale: {x: 1, y: 1} |
|
1830 |
+ m_Offset: {x: 0, y: 0} |
|
1831 |
+ m_Ints: [] |
|
1832 |
+ m_Floats: |
|
1833 |
+ - _ColorMask: 15 |
|
1834 |
+ - _Stencil: 0 |
|
1835 |
+ - _StencilComp: 8 |
|
1836 |
+ - _StencilOp: 0 |
|
1837 |
+ - _StencilReadMask: 255 |
|
1838 |
+ - _StencilWriteMask: 255 |
|
1839 |
+ - _UseUIAlphaClip: 0 |
|
1840 |
+ m_Colors: |
|
1841 |
+ - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0} |
|
1842 |
+ m_BuildTextureStacks: [] |
|
1178 | 1843 |
--- !u!1 &811718023 |
1179 | 1844 |
GameObject: |
1180 | 1845 |
m_ObjectHideFlags: 0 |
... | ... | @@ -1265,45 +1930,6 @@ |
1265 | 1930 |
m_PrefabAsset: {fileID: 0} |
1266 | 1931 |
m_GameObject: {fileID: 811718023} |
1267 | 1932 |
m_CullTransparentMesh: 1 |
1268 |
---- !u!21 &812064812 |
|
1269 |
-Material: |
|
1270 |
- serializedVersion: 8 |
|
1271 |
- m_ObjectHideFlags: 0 |
|
1272 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
1273 |
- m_PrefabInstance: {fileID: 0} |
|
1274 |
- m_PrefabAsset: {fileID: 0} |
|
1275 |
- m_Name: UI/RoundedCorners/RoundedCorners |
|
1276 |
- m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
1277 |
- m_Parent: {fileID: 0} |
|
1278 |
- m_ModifiedSerializedProperties: 0 |
|
1279 |
- m_ValidKeywords: [] |
|
1280 |
- m_InvalidKeywords: [] |
|
1281 |
- m_LightmapFlags: 4 |
|
1282 |
- m_EnableInstancingVariants: 0 |
|
1283 |
- m_DoubleSidedGI: 0 |
|
1284 |
- m_CustomRenderQueue: -1 |
|
1285 |
- stringTagMap: {} |
|
1286 |
- disabledShaderPasses: [] |
|
1287 |
- m_LockedProperties: |
|
1288 |
- m_SavedProperties: |
|
1289 |
- serializedVersion: 3 |
|
1290 |
- m_TexEnvs: |
|
1291 |
- - _MainTex: |
|
1292 |
- m_Texture: {fileID: 0} |
|
1293 |
- m_Scale: {x: 1, y: 1} |
|
1294 |
- m_Offset: {x: 0, y: 0} |
|
1295 |
- m_Ints: [] |
|
1296 |
- m_Floats: |
|
1297 |
- - _ColorMask: 15 |
|
1298 |
- - _Stencil: 0 |
|
1299 |
- - _StencilComp: 8 |
|
1300 |
- - _StencilOp: 0 |
|
1301 |
- - _StencilReadMask: 255 |
|
1302 |
- - _StencilWriteMask: 255 |
|
1303 |
- - _UseUIAlphaClip: 0 |
|
1304 |
- m_Colors: |
|
1305 |
- - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0} |
|
1306 |
- m_BuildTextureStacks: [] |
|
1307 | 1933 |
--- !u!1 &875615522 |
1308 | 1934 |
GameObject: |
1309 | 1935 |
m_ObjectHideFlags: 0 |
... | ... | @@ -1413,6 +2039,45 @@ |
1413 | 2039 |
m_EditorClassIdentifier: |
1414 | 2040 |
m_HorizontalFit: 0 |
1415 | 2041 |
m_VerticalFit: 2 |
2042 |
+--- !u!21 &969903528 |
|
2043 |
+Material: |
|
2044 |
+ serializedVersion: 8 |
|
2045 |
+ m_ObjectHideFlags: 0 |
|
2046 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
2047 |
+ m_PrefabInstance: {fileID: 0} |
|
2048 |
+ m_PrefabAsset: {fileID: 0} |
|
2049 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
2050 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
2051 |
+ m_Parent: {fileID: 0} |
|
2052 |
+ m_ModifiedSerializedProperties: 0 |
|
2053 |
+ m_ValidKeywords: [] |
|
2054 |
+ m_InvalidKeywords: [] |
|
2055 |
+ m_LightmapFlags: 4 |
|
2056 |
+ m_EnableInstancingVariants: 0 |
|
2057 |
+ m_DoubleSidedGI: 0 |
|
2058 |
+ m_CustomRenderQueue: -1 |
|
2059 |
+ stringTagMap: {} |
|
2060 |
+ disabledShaderPasses: [] |
|
2061 |
+ m_LockedProperties: |
|
2062 |
+ m_SavedProperties: |
|
2063 |
+ serializedVersion: 3 |
|
2064 |
+ m_TexEnvs: |
|
2065 |
+ - _MainTex: |
|
2066 |
+ m_Texture: {fileID: 0} |
|
2067 |
+ m_Scale: {x: 1, y: 1} |
|
2068 |
+ m_Offset: {x: 0, y: 0} |
|
2069 |
+ m_Ints: [] |
|
2070 |
+ m_Floats: |
|
2071 |
+ - _ColorMask: 15 |
|
2072 |
+ - _Stencil: 0 |
|
2073 |
+ - _StencilComp: 8 |
|
2074 |
+ - _StencilOp: 0 |
|
2075 |
+ - _StencilReadMask: 255 |
|
2076 |
+ - _StencilWriteMask: 255 |
|
2077 |
+ - _UseUIAlphaClip: 0 |
|
2078 |
+ m_Colors: |
|
2079 |
+ - _WidthHeightRadius: {r: 24, g: 10, b: 4, a: 0} |
|
2080 |
+ m_BuildTextureStacks: [] |
|
1416 | 2081 |
--- !u!1 &987763523 |
1417 | 2082 |
GameObject: |
1418 | 2083 |
m_ObjectHideFlags: 0 |
... | ... | @@ -1565,7 +2230,7 @@ |
1565 | 2230 |
m_PrefabAsset: {fileID: 0} |
1566 | 2231 |
m_GameObject: {fileID: 987763523} |
1567 | 2232 |
m_CullTransparentMesh: 1 |
1568 |
---- !u!21 &1027850072 |
|
2233 |
+--- !u!21 &1049602717 |
|
1569 | 2234 |
Material: |
1570 | 2235 |
serializedVersion: 8 |
1571 | 2236 |
m_ObjectHideFlags: 0 |
... | ... | @@ -1603,6 +2268,84 @@ |
1603 | 2268 |
- _UseUIAlphaClip: 0 |
1604 | 2269 |
m_Colors: |
1605 | 2270 |
- _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0} |
2271 |
+ m_BuildTextureStacks: [] |
|
2272 |
+--- !u!21 &1108239644 |
|
2273 |
+Material: |
|
2274 |
+ serializedVersion: 8 |
|
2275 |
+ m_ObjectHideFlags: 0 |
|
2276 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
2277 |
+ m_PrefabInstance: {fileID: 0} |
|
2278 |
+ m_PrefabAsset: {fileID: 0} |
|
2279 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
2280 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
2281 |
+ m_Parent: {fileID: 0} |
|
2282 |
+ m_ModifiedSerializedProperties: 0 |
|
2283 |
+ m_ValidKeywords: [] |
|
2284 |
+ m_InvalidKeywords: [] |
|
2285 |
+ m_LightmapFlags: 4 |
|
2286 |
+ m_EnableInstancingVariants: 0 |
|
2287 |
+ m_DoubleSidedGI: 0 |
|
2288 |
+ m_CustomRenderQueue: -1 |
|
2289 |
+ stringTagMap: {} |
|
2290 |
+ disabledShaderPasses: [] |
|
2291 |
+ m_LockedProperties: |
|
2292 |
+ m_SavedProperties: |
|
2293 |
+ serializedVersion: 3 |
|
2294 |
+ m_TexEnvs: |
|
2295 |
+ - _MainTex: |
|
2296 |
+ m_Texture: {fileID: 0} |
|
2297 |
+ m_Scale: {x: 1, y: 1} |
|
2298 |
+ m_Offset: {x: 0, y: 0} |
|
2299 |
+ m_Ints: [] |
|
2300 |
+ m_Floats: |
|
2301 |
+ - _ColorMask: 15 |
|
2302 |
+ - _Stencil: 0 |
|
2303 |
+ - _StencilComp: 8 |
|
2304 |
+ - _StencilOp: 0 |
|
2305 |
+ - _StencilReadMask: 255 |
|
2306 |
+ - _StencilWriteMask: 255 |
|
2307 |
+ - _UseUIAlphaClip: 0 |
|
2308 |
+ m_Colors: |
|
2309 |
+ - _WidthHeightRadius: {r: 50, g: 20, b: 8, a: 0} |
|
2310 |
+ m_BuildTextureStacks: [] |
|
2311 |
+--- !u!21 &1112221061 |
|
2312 |
+Material: |
|
2313 |
+ serializedVersion: 8 |
|
2314 |
+ m_ObjectHideFlags: 0 |
|
2315 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
2316 |
+ m_PrefabInstance: {fileID: 0} |
|
2317 |
+ m_PrefabAsset: {fileID: 0} |
|
2318 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
2319 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
2320 |
+ m_Parent: {fileID: 0} |
|
2321 |
+ m_ModifiedSerializedProperties: 0 |
|
2322 |
+ m_ValidKeywords: [] |
|
2323 |
+ m_InvalidKeywords: [] |
|
2324 |
+ m_LightmapFlags: 4 |
|
2325 |
+ m_EnableInstancingVariants: 0 |
|
2326 |
+ m_DoubleSidedGI: 0 |
|
2327 |
+ m_CustomRenderQueue: -1 |
|
2328 |
+ stringTagMap: {} |
|
2329 |
+ disabledShaderPasses: [] |
|
2330 |
+ m_LockedProperties: |
|
2331 |
+ m_SavedProperties: |
|
2332 |
+ serializedVersion: 3 |
|
2333 |
+ m_TexEnvs: |
|
2334 |
+ - _MainTex: |
|
2335 |
+ m_Texture: {fileID: 0} |
|
2336 |
+ m_Scale: {x: 1, y: 1} |
|
2337 |
+ m_Offset: {x: 0, y: 0} |
|
2338 |
+ m_Ints: [] |
|
2339 |
+ m_Floats: |
|
2340 |
+ - _ColorMask: 15 |
|
2341 |
+ - _Stencil: 0 |
|
2342 |
+ - _StencilComp: 8 |
|
2343 |
+ - _StencilOp: 0 |
|
2344 |
+ - _StencilReadMask: 255 |
|
2345 |
+ - _StencilWriteMask: 255 |
|
2346 |
+ - _UseUIAlphaClip: 0 |
|
2347 |
+ m_Colors: |
|
2348 |
+ - _WidthHeightRadius: {r: 50, g: 20, b: 8, a: 0} |
|
1606 | 2349 |
m_BuildTextureStacks: [] |
1607 | 2350 |
--- !u!1 &1134853653 |
1608 | 2351 |
GameObject: |
... | ... | @@ -1820,7 +2563,163 @@ |
1820 | 2563 |
m_AnchoredPosition: {x: 250, y: -43.755} |
1821 | 2564 |
m_SizeDelta: {x: 480, y: 67.51} |
1822 | 2565 |
m_Pivot: {x: 0.5, y: 0.5} |
1823 |
---- !u!21 &1338993131 |
|
2566 |
+--- !u!21 &1171794357 |
|
2567 |
+Material: |
|
2568 |
+ serializedVersion: 8 |
|
2569 |
+ m_ObjectHideFlags: 0 |
|
2570 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
2571 |
+ m_PrefabInstance: {fileID: 0} |
|
2572 |
+ m_PrefabAsset: {fileID: 0} |
|
2573 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
2574 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
2575 |
+ m_Parent: {fileID: 0} |
|
2576 |
+ m_ModifiedSerializedProperties: 0 |
|
2577 |
+ m_ValidKeywords: [] |
|
2578 |
+ m_InvalidKeywords: [] |
|
2579 |
+ m_LightmapFlags: 4 |
|
2580 |
+ m_EnableInstancingVariants: 0 |
|
2581 |
+ m_DoubleSidedGI: 0 |
|
2582 |
+ m_CustomRenderQueue: -1 |
|
2583 |
+ stringTagMap: {} |
|
2584 |
+ disabledShaderPasses: [] |
|
2585 |
+ m_LockedProperties: |
|
2586 |
+ m_SavedProperties: |
|
2587 |
+ serializedVersion: 3 |
|
2588 |
+ m_TexEnvs: |
|
2589 |
+ - _MainTex: |
|
2590 |
+ m_Texture: {fileID: 0} |
|
2591 |
+ m_Scale: {x: 1, y: 1} |
|
2592 |
+ m_Offset: {x: 0, y: 0} |
|
2593 |
+ m_Ints: [] |
|
2594 |
+ m_Floats: |
|
2595 |
+ - _ColorMask: 15 |
|
2596 |
+ - _Stencil: 0 |
|
2597 |
+ - _StencilComp: 8 |
|
2598 |
+ - _StencilOp: 0 |
|
2599 |
+ - _StencilReadMask: 255 |
|
2600 |
+ - _StencilWriteMask: 255 |
|
2601 |
+ - _UseUIAlphaClip: 0 |
|
2602 |
+ m_Colors: |
|
2603 |
+ - _WidthHeightRadius: {r: 50, g: 20, b: 8, a: 0} |
|
2604 |
+ m_BuildTextureStacks: [] |
|
2605 |
+--- !u!21 &1273514885 |
|
2606 |
+Material: |
|
2607 |
+ serializedVersion: 8 |
|
2608 |
+ m_ObjectHideFlags: 0 |
|
2609 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
2610 |
+ m_PrefabInstance: {fileID: 0} |
|
2611 |
+ m_PrefabAsset: {fileID: 0} |
|
2612 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
2613 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
2614 |
+ m_Parent: {fileID: 0} |
|
2615 |
+ m_ModifiedSerializedProperties: 0 |
|
2616 |
+ m_ValidKeywords: [] |
|
2617 |
+ m_InvalidKeywords: [] |
|
2618 |
+ m_LightmapFlags: 4 |
|
2619 |
+ m_EnableInstancingVariants: 0 |
|
2620 |
+ m_DoubleSidedGI: 0 |
|
2621 |
+ m_CustomRenderQueue: -1 |
|
2622 |
+ stringTagMap: {} |
|
2623 |
+ disabledShaderPasses: [] |
|
2624 |
+ m_LockedProperties: |
|
2625 |
+ m_SavedProperties: |
|
2626 |
+ serializedVersion: 3 |
|
2627 |
+ m_TexEnvs: |
|
2628 |
+ - _MainTex: |
|
2629 |
+ m_Texture: {fileID: 0} |
|
2630 |
+ m_Scale: {x: 1, y: 1} |
|
2631 |
+ m_Offset: {x: 0, y: 0} |
|
2632 |
+ m_Ints: [] |
|
2633 |
+ m_Floats: |
|
2634 |
+ - _ColorMask: 15 |
|
2635 |
+ - _Stencil: 0 |
|
2636 |
+ - _StencilComp: 8 |
|
2637 |
+ - _StencilOp: 0 |
|
2638 |
+ - _StencilReadMask: 255 |
|
2639 |
+ - _StencilWriteMask: 255 |
|
2640 |
+ - _UseUIAlphaClip: 0 |
|
2641 |
+ m_Colors: |
|
2642 |
+ - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0} |
|
2643 |
+ m_BuildTextureStacks: [] |
|
2644 |
+--- !u!21 &1281555230 |
|
2645 |
+Material: |
|
2646 |
+ serializedVersion: 8 |
|
2647 |
+ m_ObjectHideFlags: 0 |
|
2648 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
2649 |
+ m_PrefabInstance: {fileID: 0} |
|
2650 |
+ m_PrefabAsset: {fileID: 0} |
|
2651 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
2652 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
2653 |
+ m_Parent: {fileID: 0} |
|
2654 |
+ m_ModifiedSerializedProperties: 0 |
|
2655 |
+ m_ValidKeywords: [] |
|
2656 |
+ m_InvalidKeywords: [] |
|
2657 |
+ m_LightmapFlags: 4 |
|
2658 |
+ m_EnableInstancingVariants: 0 |
|
2659 |
+ m_DoubleSidedGI: 0 |
|
2660 |
+ m_CustomRenderQueue: -1 |
|
2661 |
+ stringTagMap: {} |
|
2662 |
+ disabledShaderPasses: [] |
|
2663 |
+ m_LockedProperties: |
|
2664 |
+ m_SavedProperties: |
|
2665 |
+ serializedVersion: 3 |
|
2666 |
+ m_TexEnvs: |
|
2667 |
+ - _MainTex: |
|
2668 |
+ m_Texture: {fileID: 0} |
|
2669 |
+ m_Scale: {x: 1, y: 1} |
|
2670 |
+ m_Offset: {x: 0, y: 0} |
|
2671 |
+ m_Ints: [] |
|
2672 |
+ m_Floats: |
|
2673 |
+ - _ColorMask: 15 |
|
2674 |
+ - _Stencil: 0 |
|
2675 |
+ - _StencilComp: 8 |
|
2676 |
+ - _StencilOp: 0 |
|
2677 |
+ - _StencilReadMask: 255 |
|
2678 |
+ - _StencilWriteMask: 255 |
|
2679 |
+ - _UseUIAlphaClip: 0 |
|
2680 |
+ m_Colors: |
|
2681 |
+ - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0} |
|
2682 |
+ m_BuildTextureStacks: [] |
|
2683 |
+--- !u!21 &1341740748 |
|
2684 |
+Material: |
|
2685 |
+ serializedVersion: 8 |
|
2686 |
+ m_ObjectHideFlags: 0 |
|
2687 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
2688 |
+ m_PrefabInstance: {fileID: 0} |
|
2689 |
+ m_PrefabAsset: {fileID: 0} |
|
2690 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
2691 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
2692 |
+ m_Parent: {fileID: 0} |
|
2693 |
+ m_ModifiedSerializedProperties: 0 |
|
2694 |
+ m_ValidKeywords: [] |
|
2695 |
+ m_InvalidKeywords: [] |
|
2696 |
+ m_LightmapFlags: 4 |
|
2697 |
+ m_EnableInstancingVariants: 0 |
|
2698 |
+ m_DoubleSidedGI: 0 |
|
2699 |
+ m_CustomRenderQueue: -1 |
|
2700 |
+ stringTagMap: {} |
|
2701 |
+ disabledShaderPasses: [] |
|
2702 |
+ m_LockedProperties: |
|
2703 |
+ m_SavedProperties: |
|
2704 |
+ serializedVersion: 3 |
|
2705 |
+ m_TexEnvs: |
|
2706 |
+ - _MainTex: |
|
2707 |
+ m_Texture: {fileID: 0} |
|
2708 |
+ m_Scale: {x: 1, y: 1} |
|
2709 |
+ m_Offset: {x: 0, y: 0} |
|
2710 |
+ m_Ints: [] |
|
2711 |
+ m_Floats: |
|
2712 |
+ - _ColorMask: 15 |
|
2713 |
+ - _Stencil: 0 |
|
2714 |
+ - _StencilComp: 8 |
|
2715 |
+ - _StencilOp: 0 |
|
2716 |
+ - _StencilReadMask: 255 |
|
2717 |
+ - _StencilWriteMask: 255 |
|
2718 |
+ - _UseUIAlphaClip: 0 |
|
2719 |
+ m_Colors: |
|
2720 |
+ - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0} |
|
2721 |
+ m_BuildTextureStacks: [] |
|
2722 |
+--- !u!21 &1445972438 |
|
1824 | 2723 |
Material: |
1825 | 2724 |
serializedVersion: 8 |
1826 | 2725 |
m_ObjectHideFlags: 0 |
... | ... | @@ -2114,6 +3013,162 @@ |
2114 | 3013 |
m_PrefabAsset: {fileID: 0} |
2115 | 3014 |
m_GameObject: {fileID: 1515185050} |
2116 | 3015 |
m_CullTransparentMesh: 1 |
3016 |
+--- !u!21 &1521551904 |
|
3017 |
+Material: |
|
3018 |
+ serializedVersion: 8 |
|
3019 |
+ m_ObjectHideFlags: 0 |
|
3020 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
3021 |
+ m_PrefabInstance: {fileID: 0} |
|
3022 |
+ m_PrefabAsset: {fileID: 0} |
|
3023 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
3024 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
3025 |
+ m_Parent: {fileID: 0} |
|
3026 |
+ m_ModifiedSerializedProperties: 0 |
|
3027 |
+ m_ValidKeywords: [] |
|
3028 |
+ m_InvalidKeywords: [] |
|
3029 |
+ m_LightmapFlags: 4 |
|
3030 |
+ m_EnableInstancingVariants: 0 |
|
3031 |
+ m_DoubleSidedGI: 0 |
|
3032 |
+ m_CustomRenderQueue: -1 |
|
3033 |
+ stringTagMap: {} |
|
3034 |
+ disabledShaderPasses: [] |
|
3035 |
+ m_LockedProperties: |
|
3036 |
+ m_SavedProperties: |
|
3037 |
+ serializedVersion: 3 |
|
3038 |
+ m_TexEnvs: |
|
3039 |
+ - _MainTex: |
|
3040 |
+ m_Texture: {fileID: 0} |
|
3041 |
+ m_Scale: {x: 1, y: 1} |
|
3042 |
+ m_Offset: {x: 0, y: 0} |
|
3043 |
+ m_Ints: [] |
|
3044 |
+ m_Floats: |
|
3045 |
+ - _ColorMask: 15 |
|
3046 |
+ - _Stencil: 0 |
|
3047 |
+ - _StencilComp: 8 |
|
3048 |
+ - _StencilOp: 0 |
|
3049 |
+ - _StencilReadMask: 255 |
|
3050 |
+ - _StencilWriteMask: 255 |
|
3051 |
+ - _UseUIAlphaClip: 0 |
|
3052 |
+ m_Colors: |
|
3053 |
+ - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0} |
|
3054 |
+ m_BuildTextureStacks: [] |
|
3055 |
+--- !u!21 &1522123162 |
|
3056 |
+Material: |
|
3057 |
+ serializedVersion: 8 |
|
3058 |
+ m_ObjectHideFlags: 0 |
|
3059 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
3060 |
+ m_PrefabInstance: {fileID: 0} |
|
3061 |
+ m_PrefabAsset: {fileID: 0} |
|
3062 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
3063 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
3064 |
+ m_Parent: {fileID: 0} |
|
3065 |
+ m_ModifiedSerializedProperties: 0 |
|
3066 |
+ m_ValidKeywords: [] |
|
3067 |
+ m_InvalidKeywords: [] |
|
3068 |
+ m_LightmapFlags: 4 |
|
3069 |
+ m_EnableInstancingVariants: 0 |
|
3070 |
+ m_DoubleSidedGI: 0 |
|
3071 |
+ m_CustomRenderQueue: -1 |
|
3072 |
+ stringTagMap: {} |
|
3073 |
+ disabledShaderPasses: [] |
|
3074 |
+ m_LockedProperties: |
|
3075 |
+ m_SavedProperties: |
|
3076 |
+ serializedVersion: 3 |
|
3077 |
+ m_TexEnvs: |
|
3078 |
+ - _MainTex: |
|
3079 |
+ m_Texture: {fileID: 0} |
|
3080 |
+ m_Scale: {x: 1, y: 1} |
|
3081 |
+ m_Offset: {x: 0, y: 0} |
|
3082 |
+ m_Ints: [] |
|
3083 |
+ m_Floats: |
|
3084 |
+ - _ColorMask: 15 |
|
3085 |
+ - _Stencil: 0 |
|
3086 |
+ - _StencilComp: 8 |
|
3087 |
+ - _StencilOp: 0 |
|
3088 |
+ - _StencilReadMask: 255 |
|
3089 |
+ - _StencilWriteMask: 255 |
|
3090 |
+ - _UseUIAlphaClip: 0 |
|
3091 |
+ m_Colors: |
|
3092 |
+ - _WidthHeightRadius: {r: 24, g: 10, b: 4, a: 0} |
|
3093 |
+ m_BuildTextureStacks: [] |
|
3094 |
+--- !u!21 &1530724336 |
|
3095 |
+Material: |
|
3096 |
+ serializedVersion: 8 |
|
3097 |
+ m_ObjectHideFlags: 0 |
|
3098 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
3099 |
+ m_PrefabInstance: {fileID: 0} |
|
3100 |
+ m_PrefabAsset: {fileID: 0} |
|
3101 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
3102 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
3103 |
+ m_Parent: {fileID: 0} |
|
3104 |
+ m_ModifiedSerializedProperties: 0 |
|
3105 |
+ m_ValidKeywords: [] |
|
3106 |
+ m_InvalidKeywords: [] |
|
3107 |
+ m_LightmapFlags: 4 |
|
3108 |
+ m_EnableInstancingVariants: 0 |
|
3109 |
+ m_DoubleSidedGI: 0 |
|
3110 |
+ m_CustomRenderQueue: -1 |
|
3111 |
+ stringTagMap: {} |
|
3112 |
+ disabledShaderPasses: [] |
|
3113 |
+ m_LockedProperties: |
|
3114 |
+ m_SavedProperties: |
|
3115 |
+ serializedVersion: 3 |
|
3116 |
+ m_TexEnvs: |
|
3117 |
+ - _MainTex: |
|
3118 |
+ m_Texture: {fileID: 0} |
|
3119 |
+ m_Scale: {x: 1, y: 1} |
|
3120 |
+ m_Offset: {x: 0, y: 0} |
|
3121 |
+ m_Ints: [] |
|
3122 |
+ m_Floats: |
|
3123 |
+ - _ColorMask: 15 |
|
3124 |
+ - _Stencil: 0 |
|
3125 |
+ - _StencilComp: 8 |
|
3126 |
+ - _StencilOp: 0 |
|
3127 |
+ - _StencilReadMask: 255 |
|
3128 |
+ - _StencilWriteMask: 255 |
|
3129 |
+ - _UseUIAlphaClip: 0 |
|
3130 |
+ m_Colors: |
|
3131 |
+ - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0} |
|
3132 |
+ m_BuildTextureStacks: [] |
|
3133 |
+--- !u!21 &1536530577 |
|
3134 |
+Material: |
|
3135 |
+ serializedVersion: 8 |
|
3136 |
+ m_ObjectHideFlags: 0 |
|
3137 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
3138 |
+ m_PrefabInstance: {fileID: 0} |
|
3139 |
+ m_PrefabAsset: {fileID: 0} |
|
3140 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
3141 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
3142 |
+ m_Parent: {fileID: 0} |
|
3143 |
+ m_ModifiedSerializedProperties: 0 |
|
3144 |
+ m_ValidKeywords: [] |
|
3145 |
+ m_InvalidKeywords: [] |
|
3146 |
+ m_LightmapFlags: 4 |
|
3147 |
+ m_EnableInstancingVariants: 0 |
|
3148 |
+ m_DoubleSidedGI: 0 |
|
3149 |
+ m_CustomRenderQueue: -1 |
|
3150 |
+ stringTagMap: {} |
|
3151 |
+ disabledShaderPasses: [] |
|
3152 |
+ m_LockedProperties: |
|
3153 |
+ m_SavedProperties: |
|
3154 |
+ serializedVersion: 3 |
|
3155 |
+ m_TexEnvs: |
|
3156 |
+ - _MainTex: |
|
3157 |
+ m_Texture: {fileID: 0} |
|
3158 |
+ m_Scale: {x: 1, y: 1} |
|
3159 |
+ m_Offset: {x: 0, y: 0} |
|
3160 |
+ m_Ints: [] |
|
3161 |
+ m_Floats: |
|
3162 |
+ - _ColorMask: 15 |
|
3163 |
+ - _Stencil: 0 |
|
3164 |
+ - _StencilComp: 8 |
|
3165 |
+ - _StencilOp: 0 |
|
3166 |
+ - _StencilReadMask: 255 |
|
3167 |
+ - _StencilWriteMask: 255 |
|
3168 |
+ - _UseUIAlphaClip: 0 |
|
3169 |
+ m_Colors: |
|
3170 |
+ - _WidthHeightRadius: {r: 24, g: 10, b: 4, a: 0} |
|
3171 |
+ m_BuildTextureStacks: [] |
|
2117 | 3172 |
--- !u!21 &1541378491 |
2118 | 3173 |
Material: |
2119 | 3174 |
serializedVersion: 8 |
... | ... | @@ -2152,6 +3207,45 @@ |
2152 | 3207 |
- _UseUIAlphaClip: 0 |
2153 | 3208 |
m_Colors: |
2154 | 3209 |
- _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0} |
3210 |
+ m_BuildTextureStacks: [] |
|
3211 |
+--- !u!21 &1600842103 |
|
3212 |
+Material: |
|
3213 |
+ serializedVersion: 8 |
|
3214 |
+ m_ObjectHideFlags: 0 |
|
3215 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
3216 |
+ m_PrefabInstance: {fileID: 0} |
|
3217 |
+ m_PrefabAsset: {fileID: 0} |
|
3218 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
3219 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
3220 |
+ m_Parent: {fileID: 0} |
|
3221 |
+ m_ModifiedSerializedProperties: 0 |
|
3222 |
+ m_ValidKeywords: [] |
|
3223 |
+ m_InvalidKeywords: [] |
|
3224 |
+ m_LightmapFlags: 4 |
|
3225 |
+ m_EnableInstancingVariants: 0 |
|
3226 |
+ m_DoubleSidedGI: 0 |
|
3227 |
+ m_CustomRenderQueue: -1 |
|
3228 |
+ stringTagMap: {} |
|
3229 |
+ disabledShaderPasses: [] |
|
3230 |
+ m_LockedProperties: |
|
3231 |
+ m_SavedProperties: |
|
3232 |
+ serializedVersion: 3 |
|
3233 |
+ m_TexEnvs: |
|
3234 |
+ - _MainTex: |
|
3235 |
+ m_Texture: {fileID: 0} |
|
3236 |
+ m_Scale: {x: 1, y: 1} |
|
3237 |
+ m_Offset: {x: 0, y: 0} |
|
3238 |
+ m_Ints: [] |
|
3239 |
+ m_Floats: |
|
3240 |
+ - _ColorMask: 15 |
|
3241 |
+ - _Stencil: 0 |
|
3242 |
+ - _StencilComp: 8 |
|
3243 |
+ - _StencilOp: 0 |
|
3244 |
+ - _StencilReadMask: 255 |
|
3245 |
+ - _StencilWriteMask: 255 |
|
3246 |
+ - _UseUIAlphaClip: 0 |
|
3247 |
+ m_Colors: |
|
3248 |
+ - _WidthHeightRadius: {r: 24, g: 10, b: 4, a: 0} |
|
2155 | 3249 |
m_BuildTextureStacks: [] |
2156 | 3250 |
--- !u!1 &1609611425 |
2157 | 3251 |
GameObject: |
... | ... | @@ -2287,11 +3381,50 @@ |
2287 | 3381 |
m_Children: [] |
2288 | 3382 |
m_Father: {fileID: 10513859} |
2289 | 3383 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
2290 |
- m_AnchorMin: {x: 0, y: 1} |
|
2291 |
- m_AnchorMax: {x: 0, y: 1} |
|
2292 |
- m_AnchoredPosition: {x: 515, y: -43.755} |
|
2293 |
- m_SizeDelta: {x: 1010, y: 67.51} |
|
3384 |
+ m_AnchorMin: {x: 0, y: 0} |
|
3385 |
+ m_AnchorMax: {x: 0, y: 0} |
|
3386 |
+ m_AnchoredPosition: {x: 0, y: 0} |
|
3387 |
+ m_SizeDelta: {x: 0, y: 0} |
|
2294 | 3388 |
m_Pivot: {x: 0.5, y: 0.5} |
3389 |
+--- !u!21 &1656449427 |
|
3390 |
+Material: |
|
3391 |
+ serializedVersion: 8 |
|
3392 |
+ m_ObjectHideFlags: 0 |
|
3393 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
3394 |
+ m_PrefabInstance: {fileID: 0} |
|
3395 |
+ m_PrefabAsset: {fileID: 0} |
|
3396 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
3397 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
3398 |
+ m_Parent: {fileID: 0} |
|
3399 |
+ m_ModifiedSerializedProperties: 0 |
|
3400 |
+ m_ValidKeywords: [] |
|
3401 |
+ m_InvalidKeywords: [] |
|
3402 |
+ m_LightmapFlags: 4 |
|
3403 |
+ m_EnableInstancingVariants: 0 |
|
3404 |
+ m_DoubleSidedGI: 0 |
|
3405 |
+ m_CustomRenderQueue: -1 |
|
3406 |
+ stringTagMap: {} |
|
3407 |
+ disabledShaderPasses: [] |
|
3408 |
+ m_LockedProperties: |
|
3409 |
+ m_SavedProperties: |
|
3410 |
+ serializedVersion: 3 |
|
3411 |
+ m_TexEnvs: |
|
3412 |
+ - _MainTex: |
|
3413 |
+ m_Texture: {fileID: 0} |
|
3414 |
+ m_Scale: {x: 1, y: 1} |
|
3415 |
+ m_Offset: {x: 0, y: 0} |
|
3416 |
+ m_Ints: [] |
|
3417 |
+ m_Floats: |
|
3418 |
+ - _ColorMask: 15 |
|
3419 |
+ - _Stencil: 0 |
|
3420 |
+ - _StencilComp: 8 |
|
3421 |
+ - _StencilOp: 0 |
|
3422 |
+ - _StencilReadMask: 255 |
|
3423 |
+ - _StencilWriteMask: 255 |
|
3424 |
+ - _UseUIAlphaClip: 0 |
|
3425 |
+ m_Colors: |
|
3426 |
+ - _WidthHeightRadius: {r: 55, g: 20, b: 8, a: 0} |
|
3427 |
+ m_BuildTextureStacks: [] |
|
2295 | 3428 |
--- !u!1 &1668214294 |
2296 | 3429 |
GameObject: |
2297 | 3430 |
m_ObjectHideFlags: 0 |
... | ... | @@ -2444,45 +3577,6 @@ |
2444 | 3577 |
m_Children: [] |
2445 | 3578 |
m_Father: {fileID: 0} |
2446 | 3579 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
2447 |
---- !u!21 &1836140802 |
|
2448 |
-Material: |
|
2449 |
- serializedVersion: 8 |
|
2450 |
- m_ObjectHideFlags: 0 |
|
2451 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
2452 |
- m_PrefabInstance: {fileID: 0} |
|
2453 |
- m_PrefabAsset: {fileID: 0} |
|
2454 |
- m_Name: UI/RoundedCorners/RoundedCorners |
|
2455 |
- m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
2456 |
- m_Parent: {fileID: 0} |
|
2457 |
- m_ModifiedSerializedProperties: 0 |
|
2458 |
- m_ValidKeywords: [] |
|
2459 |
- m_InvalidKeywords: [] |
|
2460 |
- m_LightmapFlags: 4 |
|
2461 |
- m_EnableInstancingVariants: 0 |
|
2462 |
- m_DoubleSidedGI: 0 |
|
2463 |
- m_CustomRenderQueue: -1 |
|
2464 |
- stringTagMap: {} |
|
2465 |
- disabledShaderPasses: [] |
|
2466 |
- m_LockedProperties: |
|
2467 |
- m_SavedProperties: |
|
2468 |
- serializedVersion: 3 |
|
2469 |
- m_TexEnvs: |
|
2470 |
- - _MainTex: |
|
2471 |
- m_Texture: {fileID: 0} |
|
2472 |
- m_Scale: {x: 1, y: 1} |
|
2473 |
- m_Offset: {x: 0, y: 0} |
|
2474 |
- m_Ints: [] |
|
2475 |
- m_Floats: |
|
2476 |
- - _ColorMask: 15 |
|
2477 |
- - _Stencil: 0 |
|
2478 |
- - _StencilComp: 8 |
|
2479 |
- - _StencilOp: 0 |
|
2480 |
- - _StencilReadMask: 255 |
|
2481 |
- - _StencilWriteMask: 255 |
|
2482 |
- - _UseUIAlphaClip: 0 |
|
2483 |
- m_Colors: |
|
2484 |
- - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0} |
|
2485 |
- m_BuildTextureStacks: [] |
|
2486 | 3580 |
--- !u!1 &1850408425 |
2487 | 3581 |
GameObject: |
2488 | 3582 |
m_ObjectHideFlags: 0 |
... | ... | @@ -2733,6 +3827,162 @@ |
2733 | 3827 |
m_AddedGameObjects: [] |
2734 | 3828 |
m_AddedComponents: [] |
2735 | 3829 |
m_SourcePrefab: {fileID: 100100000, guid: 19a55143adac5924ebdc980405705c4c, type: 3} |
3830 |
+--- !u!21 &1935445589 |
|
3831 |
+Material: |
|
3832 |
+ serializedVersion: 8 |
|
3833 |
+ m_ObjectHideFlags: 0 |
|
3834 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
3835 |
+ m_PrefabInstance: {fileID: 0} |
|
3836 |
+ m_PrefabAsset: {fileID: 0} |
|
3837 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
3838 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
3839 |
+ m_Parent: {fileID: 0} |
|
3840 |
+ m_ModifiedSerializedProperties: 0 |
|
3841 |
+ m_ValidKeywords: [] |
|
3842 |
+ m_InvalidKeywords: [] |
|
3843 |
+ m_LightmapFlags: 4 |
|
3844 |
+ m_EnableInstancingVariants: 0 |
|
3845 |
+ m_DoubleSidedGI: 0 |
|
3846 |
+ m_CustomRenderQueue: -1 |
|
3847 |
+ stringTagMap: {} |
|
3848 |
+ disabledShaderPasses: [] |
|
3849 |
+ m_LockedProperties: |
|
3850 |
+ m_SavedProperties: |
|
3851 |
+ serializedVersion: 3 |
|
3852 |
+ m_TexEnvs: |
|
3853 |
+ - _MainTex: |
|
3854 |
+ m_Texture: {fileID: 0} |
|
3855 |
+ m_Scale: {x: 1, y: 1} |
|
3856 |
+ m_Offset: {x: 0, y: 0} |
|
3857 |
+ m_Ints: [] |
|
3858 |
+ m_Floats: |
|
3859 |
+ - _ColorMask: 15 |
|
3860 |
+ - _Stencil: 0 |
|
3861 |
+ - _StencilComp: 8 |
|
3862 |
+ - _StencilOp: 0 |
|
3863 |
+ - _StencilReadMask: 255 |
|
3864 |
+ - _StencilWriteMask: 255 |
|
3865 |
+ - _UseUIAlphaClip: 0 |
|
3866 |
+ m_Colors: |
|
3867 |
+ - _WidthHeightRadius: {r: 24, g: 10, b: 4, a: 0} |
|
3868 |
+ m_BuildTextureStacks: [] |
|
3869 |
+--- !u!21 &1988859065 |
|
3870 |
+Material: |
|
3871 |
+ serializedVersion: 8 |
|
3872 |
+ m_ObjectHideFlags: 0 |
|
3873 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
3874 |
+ m_PrefabInstance: {fileID: 0} |
|
3875 |
+ m_PrefabAsset: {fileID: 0} |
|
3876 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
3877 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
3878 |
+ m_Parent: {fileID: 0} |
|
3879 |
+ m_ModifiedSerializedProperties: 0 |
|
3880 |
+ m_ValidKeywords: [] |
|
3881 |
+ m_InvalidKeywords: [] |
|
3882 |
+ m_LightmapFlags: 4 |
|
3883 |
+ m_EnableInstancingVariants: 0 |
|
3884 |
+ m_DoubleSidedGI: 0 |
|
3885 |
+ m_CustomRenderQueue: -1 |
|
3886 |
+ stringTagMap: {} |
|
3887 |
+ disabledShaderPasses: [] |
|
3888 |
+ m_LockedProperties: |
|
3889 |
+ m_SavedProperties: |
|
3890 |
+ serializedVersion: 3 |
|
3891 |
+ m_TexEnvs: |
|
3892 |
+ - _MainTex: |
|
3893 |
+ m_Texture: {fileID: 0} |
|
3894 |
+ m_Scale: {x: 1, y: 1} |
|
3895 |
+ m_Offset: {x: 0, y: 0} |
|
3896 |
+ m_Ints: [] |
|
3897 |
+ m_Floats: |
|
3898 |
+ - _ColorMask: 15 |
|
3899 |
+ - _Stencil: 0 |
|
3900 |
+ - _StencilComp: 8 |
|
3901 |
+ - _StencilOp: 0 |
|
3902 |
+ - _StencilReadMask: 255 |
|
3903 |
+ - _StencilWriteMask: 255 |
|
3904 |
+ - _UseUIAlphaClip: 0 |
|
3905 |
+ m_Colors: |
|
3906 |
+ - _WidthHeightRadius: {r: 40, g: 20, b: 8, a: 0} |
|
3907 |
+ m_BuildTextureStacks: [] |
|
3908 |
+--- !u!21 &2058290193 |
|
3909 |
+Material: |
|
3910 |
+ serializedVersion: 8 |
|
3911 |
+ m_ObjectHideFlags: 0 |
|
3912 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
3913 |
+ m_PrefabInstance: {fileID: 0} |
|
3914 |
+ m_PrefabAsset: {fileID: 0} |
|
3915 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
3916 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
3917 |
+ m_Parent: {fileID: 0} |
|
3918 |
+ m_ModifiedSerializedProperties: 0 |
|
3919 |
+ m_ValidKeywords: [] |
|
3920 |
+ m_InvalidKeywords: [] |
|
3921 |
+ m_LightmapFlags: 4 |
|
3922 |
+ m_EnableInstancingVariants: 0 |
|
3923 |
+ m_DoubleSidedGI: 0 |
|
3924 |
+ m_CustomRenderQueue: -1 |
|
3925 |
+ stringTagMap: {} |
|
3926 |
+ disabledShaderPasses: [] |
|
3927 |
+ m_LockedProperties: |
|
3928 |
+ m_SavedProperties: |
|
3929 |
+ serializedVersion: 3 |
|
3930 |
+ m_TexEnvs: |
|
3931 |
+ - _MainTex: |
|
3932 |
+ m_Texture: {fileID: 0} |
|
3933 |
+ m_Scale: {x: 1, y: 1} |
|
3934 |
+ m_Offset: {x: 0, y: 0} |
|
3935 |
+ m_Ints: [] |
|
3936 |
+ m_Floats: |
|
3937 |
+ - _ColorMask: 15 |
|
3938 |
+ - _Stencil: 0 |
|
3939 |
+ - _StencilComp: 8 |
|
3940 |
+ - _StencilOp: 0 |
|
3941 |
+ - _StencilReadMask: 255 |
|
3942 |
+ - _StencilWriteMask: 255 |
|
3943 |
+ - _UseUIAlphaClip: 0 |
|
3944 |
+ m_Colors: |
|
3945 |
+ - _WidthHeightRadius: {r: 24, g: 10, b: 4, a: 0} |
|
3946 |
+ m_BuildTextureStacks: [] |
|
3947 |
+--- !u!21 &2090217541 |
|
3948 |
+Material: |
|
3949 |
+ serializedVersion: 8 |
|
3950 |
+ m_ObjectHideFlags: 0 |
|
3951 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
3952 |
+ m_PrefabInstance: {fileID: 0} |
|
3953 |
+ m_PrefabAsset: {fileID: 0} |
|
3954 |
+ m_Name: UI/RoundedCorners/RoundedCorners |
|
3955 |
+ m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} |
|
3956 |
+ m_Parent: {fileID: 0} |
|
3957 |
+ m_ModifiedSerializedProperties: 0 |
|
3958 |
+ m_ValidKeywords: [] |
|
3959 |
+ m_InvalidKeywords: [] |
|
3960 |
+ m_LightmapFlags: 4 |
|
3961 |
+ m_EnableInstancingVariants: 0 |
|
3962 |
+ m_DoubleSidedGI: 0 |
|
3963 |
+ m_CustomRenderQueue: -1 |
|
3964 |
+ stringTagMap: {} |
|
3965 |
+ disabledShaderPasses: [] |
|
3966 |
+ m_LockedProperties: |
|
3967 |
+ m_SavedProperties: |
|
3968 |
+ serializedVersion: 3 |
|
3969 |
+ m_TexEnvs: |
|
3970 |
+ - _MainTex: |
|
3971 |
+ m_Texture: {fileID: 0} |
|
3972 |
+ m_Scale: {x: 1, y: 1} |
|
3973 |
+ m_Offset: {x: 0, y: 0} |
|
3974 |
+ m_Ints: [] |
|
3975 |
+ m_Floats: |
|
3976 |
+ - _ColorMask: 15 |
|
3977 |
+ - _Stencil: 0 |
|
3978 |
+ - _StencilComp: 8 |
|
3979 |
+ - _StencilOp: 0 |
|
3980 |
+ - _StencilReadMask: 255 |
|
3981 |
+ - _StencilWriteMask: 255 |
|
3982 |
+ - _UseUIAlphaClip: 0 |
|
3983 |
+ m_Colors: |
|
3984 |
+ - _WidthHeightRadius: {r: 55, g: 20, b: 8, a: 0} |
|
3985 |
+ m_BuildTextureStacks: [] |
|
2736 | 3986 |
--- !u!1 &2102875659 |
2737 | 3987 |
GameObject: |
2738 | 3988 |
m_ObjectHideFlags: 0 |
+++ VRTK/Assets/01.Junil/Script/ControllerExplan.cs
... | ... | @@ -0,0 +1,80 @@ |
1 | +using System.Collections; | |
2 | +using System.Collections.Generic; | |
3 | +using TMPro; | |
4 | +using UnityEngine; | |
5 | +using UnityEngine.InputSystem; | |
6 | + | |
7 | +public class ControllerExplan : MonoBehaviour | |
8 | +{ | |
9 | + public enum ControllerEnum | |
10 | + { | |
11 | + Left, | |
12 | + Right | |
13 | + } | |
14 | + | |
15 | + public ControllerEnum controller; | |
16 | + | |
17 | + | |
18 | + public InputActionProperty explanBtn; | |
19 | + | |
20 | + [SerializeField] | |
21 | + GameObject explanUIObj; | |
22 | + | |
23 | + [SerializeField] | |
24 | + TMP_Text explanTxt; | |
25 | + | |
26 | + | |
27 | + | |
28 | + // Start is called before the first frame update | |
29 | + void Start() | |
30 | + { | |
31 | + if (explanUIObj == null) | |
32 | + explanUIObj = gameObject.transform.Find("ExplanUI").gameObject; | |
33 | + | |
34 | + if (controller == ControllerEnum.Left) | |
35 | + { | |
36 | + Transform tempIndex_ = gameObject.transform.Find("ExplanUI_Index"); | |
37 | + Transform tempExplan_ = tempIndex_.Find("ExplanUI_Explan"); | |
38 | + Transform tempTmp_ = tempExplan_.Find("UITxt"); | |
39 | + | |
40 | + explanTxt = tempTmp_.GetComponent<TMP_Text>(); | |
41 | + } | |
42 | + | |
43 | + | |
44 | + if (explanUIObj.activeSelf) | |
45 | + { | |
46 | + OnOffExplan(); | |
47 | + } | |
48 | + } | |
49 | + | |
50 | + // Update is called once per frame | |
51 | + void Update() | |
52 | + { | |
53 | + if (explanBtn.action.WasPressedThisFrame()) | |
54 | + { | |
55 | + | |
56 | + OnOffExplan(); | |
57 | + } | |
58 | + } | |
59 | + | |
60 | + | |
61 | + private void OnOffExplan() | |
62 | + { | |
63 | + explanUIObj.SetActive(!explanUIObj.activeSelf); | |
64 | + | |
65 | + | |
66 | + if(controller == ControllerEnum.Left) | |
67 | + { | |
68 | + if (explanUIObj.activeSelf) | |
69 | + { | |
70 | + explanTxt.text = "설명 OFF"; | |
71 | + | |
72 | + } | |
73 | + else | |
74 | + { | |
75 | + explanTxt.text = "설명 ON"; | |
76 | + } | |
77 | + } | |
78 | + | |
79 | + } | |
80 | +} |
+++ VRTK/Assets/01.Junil/Script/ControllerExplan.cs.meta
... | ... | @@ -0,0 +1,11 @@ |
1 | +fileFormatVersion: 2 | |
2 | +guid: 935fd06a3b1dd0a4ea5b3e605fce4657 | |
3 | +MonoImporter: | |
4 | + externalObjects: {} | |
5 | + serializedVersion: 2 | |
6 | + defaultReferences: [] | |
7 | + executionOrder: 0 | |
8 | + icon: {instanceID: 0} | |
9 | + userData: | |
10 | + assetBundleName: | |
11 | + assetBundleVariant: |
--- VRTK/Assets/01.Junil/Script/Lobby/AssetBundleDownManager.cs
+++ VRTK/Assets/01.Junil/Script/Lobby/AssetBundleDownManager.cs
... | ... | @@ -21,6 +21,8 @@ |
21 | 21 |
|
22 | 22 |
private void Start() |
23 | 23 |
{ |
24 |
+ // Api 호출 |
|
25 |
+ |
|
24 | 26 |
#if UNITY_EDITOR // 에디터에서는 한국어를 기본으로 설정해준다. |
25 | 27 |
I2.Loc.LocalizationManager.CurrentLanguage = "Korean"; |
26 | 28 |
|
--- VRTK/Assets/01.Junil/Script/Manager/LoadManager.cs
+++ VRTK/Assets/01.Junil/Script/Manager/LoadManager.cs
... | ... | @@ -1,31 +1,57 @@ |
1 | 1 |
using System.Collections; |
2 | 2 |
using System.Collections.Generic; |
3 |
+using System.IO; |
|
4 |
+using TMPro; |
|
3 | 5 |
using UnityEngine; |
6 |
+using UnityEngine.InputSystem; |
|
4 | 7 |
|
8 |
+/* |
|
9 |
+ * Class Name: LoadManager |
|
10 |
+ * Description: 앱, 로고화면 display, 로딩 처리 (AseetBundle 정보 |
|
11 |
+ * Variables |
|
12 |
+ * |
|
13 |
+ * |
|
14 |
+ */ |
|
5 | 15 |
public class LoadManager : MonoBehaviour |
6 | 16 |
{ |
17 |
+ public GameObject metamotionUI; |
|
18 |
+ public GameObject appLoginUI; |
|
7 | 19 |
|
8 |
- // 체크할 파일을 넣는 큐 |
|
9 |
- public static Queue<string> checkQueue = new Queue<string>(); |
|
20 |
+ public GameObject pressTxtObj; |
|
10 | 21 |
|
11 |
- // 패치할 파일 넣는 큐 |
|
12 |
- public static Queue<string> patchQueue = new Queue<string>(); |
|
22 |
+ public bool isNoUpdate = false; |
|
23 |
+ public bool isOnClick = false; |
|
13 | 24 |
|
14 |
- // 로드할 파일을 넣는 큐 |
|
15 |
- public static Queue<string> loadAssetQueue = new Queue<string>(); |
|
25 |
+ public TMP_Text testTxt; |
|
16 | 26 |
|
17 |
- // 다음 씬을 넣는 큐 |
|
18 |
- public static Queue<string> loadingQueue = new Queue<string>(); |
|
27 |
+ public InputActionProperty anyKeyInput = new(); |
|
28 |
+ |
|
29 |
+ public LoadingManager loadingManager; |
|
30 |
+ |
|
31 |
+ public string obbFilePath = "/sdcard/Android/obb/com.MetaMotion.VRTk/mqdhtest"; |
|
19 | 32 |
|
20 | 33 |
// Start is called before the first frame update |
21 | 34 |
void Start() |
22 | 35 |
{ |
23 |
- |
|
36 |
+ obbFilePath = "/sdcard/Android/obb/com.MetaMotion.VRTk/mqdhtest"; |
|
37 |
+ |
|
38 |
+ //DebugTxtCall.Instance.CallDebug($"{File.Exists(obbFilePath)}"); |
|
39 |
+ testTxt.text += $"{File.Exists(obbFilePath)}\n"; |
|
40 |
+ |
|
41 |
+ |
|
42 |
+ AssetBundle req_ = AssetBundle.LoadFromFile(obbFilePath); |
|
43 |
+ |
|
44 |
+ testTxt.text += $"{req_} \n"; |
|
45 |
+ |
|
46 |
+ Object tempObj_ = req_.LoadAsset("MetaTestAsset"); |
|
47 |
+ testTxt.text += $"{tempObj_} \n"; |
|
48 |
+ |
|
49 |
+ |
|
50 |
+ GameObject tempTest_ = (GameObject)Instantiate(tempObj_); |
|
51 |
+ tempTest_.transform.position = new Vector3(0f, 1f, 2f); |
|
52 |
+ //AssetBundle.LoadAsset(req_); |
|
53 |
+ |
|
24 | 54 |
} |
25 | 55 |
|
26 |
- // Update is called once per frame |
|
27 |
- void Update() |
|
28 |
- { |
|
29 |
- |
|
30 |
- } |
|
56 |
+ |
|
31 | 57 |
} |
+++ VRTK/Assets/01.Junil/Script/StoreSellObj.cs
... | ... | @@ -0,0 +1,60 @@ |
1 | +using System.Collections; | |
2 | +using System.Collections.Generic; | |
3 | +using TMPro; | |
4 | +using UnityEngine; | |
5 | +using UnityEngine.UI; | |
6 | + | |
7 | + | |
8 | +/* | |
9 | + * 상점에서 파는 물품의 정보 및 관리하는 스크립트 | |
10 | + */ | |
11 | +public class StoreSellObj : MonoBehaviour | |
12 | +{ | |
13 | + | |
14 | + // 현재 필요한거? 상품 이미지와 글씨 넣는 곳 + 버튼 | |
15 | + | |
16 | + // 이 오브젝트의 판매 상품 | |
17 | + public enum StoreSell | |
18 | + { | |
19 | + Instructor, // 강사 | |
20 | + Style, // 스타일 | |
21 | + Map, // 맵 | |
22 | + Gold // 골드 / 패키지 | |
23 | + } | |
24 | + | |
25 | + public StoreSell sellType; | |
26 | + | |
27 | + public Button sellBtn; // 판매 버튼 | |
28 | + public Image sellImage; // 판매 이미지 | |
29 | + public TMP_Text sellTxt; // 판매 텍스트 | |
30 | + | |
31 | + | |
32 | + // Start is called before the first frame update | |
33 | + void Start() | |
34 | + { | |
35 | + SetUpStoreSell(); | |
36 | + } | |
37 | + | |
38 | + | |
39 | + | |
40 | + private void SetUpStoreSell() | |
41 | + { | |
42 | + | |
43 | + if (sellBtn == null) | |
44 | + sellBtn = transform.GetComponentInChildren<Button>(); | |
45 | + | |
46 | + if (sellImage == null) | |
47 | + { | |
48 | + Transform tempImgTrans_ = sellBtn.transform.GetChild(0); | |
49 | + sellImage = tempImgTrans_.GetComponent<Image>(); | |
50 | + } | |
51 | + | |
52 | + if (sellTxt == null) | |
53 | + { | |
54 | + Transform tempLineTrans_ = transform.Find("LineImage"); | |
55 | + sellTxt = tempLineTrans_.GetComponentInChildren<TMP_Text>(); | |
56 | + } | |
57 | + | |
58 | + } | |
59 | + | |
60 | +} |
+++ VRTK/Assets/01.Junil/Script/StoreSellObj.cs.meta
... | ... | @@ -0,0 +1,11 @@ |
1 | +fileFormatVersion: 2 | |
2 | +guid: a77f56b1a963a45469cb670fd1679c24 | |
3 | +MonoImporter: | |
4 | + externalObjects: {} | |
5 | + serializedVersion: 2 | |
6 | + defaultReferences: [] | |
7 | + executionOrder: 0 | |
8 | + icon: {instanceID: 0} | |
9 | + userData: | |
10 | + assetBundleName: | |
11 | + assetBundleVariant: |
+++ VRTK/Assets/01.Junil/Script/StoreUIManager.cs
... | ... | @@ -0,0 +1,175 @@ |
1 | +using System.Collections; | |
2 | +using System.Collections.Generic; | |
3 | +using UnityEngine; | |
4 | +using UnityEngine.UI; | |
5 | + | |
6 | +public class StoreUIManager : MonoBehaviour | |
7 | +{ | |
8 | + public GameObject storeUIObj; | |
9 | + | |
10 | + private GameObject tabMenuObj; // 상단 버튼들 오브젝트 | |
11 | + private GameObject instructorListObj; // 강사 리스트 오브젝트 | |
12 | + private GameObject instructorDetailObj; // 강사 디테일 오브젝트 | |
13 | + private GameObject styleListObj; // 스타일 리스트 오브젝트 | |
14 | + private GameObject styleDetailObj; // 스타일 디테일 오브젝트 | |
15 | + private GameObject mapListObj; // 맵 리스트 오브젝트 | |
16 | + private GameObject mapDetailObj; // 맵 디테일 오브젝트 | |
17 | + private GameObject goldListObj; // 골드 디테일 오브젝트 | |
18 | + | |
19 | + | |
20 | + public Button[] tabMenuBtns; // 강사, 스타일, 맵, 골드 순 | |
21 | + | |
22 | + | |
23 | + #region Instructor | |
24 | + private StoreSellObj instructorSell; // instructor의 판매 스크립트 | |
25 | + | |
26 | + private Transform instructorContentObj; // instructor의 콘텐츠 오브젝트 | |
27 | + | |
28 | + public List<StoreSellObj> instructorList = new List<StoreSellObj>(); | |
29 | + #endregion | |
30 | + | |
31 | + | |
32 | + public enum StoreMenu | |
33 | + { | |
34 | + Instructor, // 강사 | |
35 | + Style, // 스타일 | |
36 | + Map, // 맵 | |
37 | + Gold // 골드 / 패키지 | |
38 | + } | |
39 | + | |
40 | + public StoreMenu storeMenu; // 현재 상점 상태 표시 | |
41 | + | |
42 | + | |
43 | + // Start is called before the first frame update | |
44 | + void Start() | |
45 | + { | |
46 | + | |
47 | + SetUpStoreUI(); | |
48 | + | |
49 | + } | |
50 | + | |
51 | + // Update is called once per frame | |
52 | + void Update() | |
53 | + { | |
54 | + | |
55 | + } | |
56 | + | |
57 | + | |
58 | + // 강사 메뉴 클릭시 호출 | |
59 | + public void ClickInstructorMenu() | |
60 | + { | |
61 | + storeMenu = StoreMenu.Instructor; | |
62 | + | |
63 | + ViewStoreMenuUI(); | |
64 | + | |
65 | + instructorSell.gameObject.SetActive(true); | |
66 | + | |
67 | + // 판매 강사 리스트 같은 걸 받고 표시 | |
68 | + // 임시로 8 지정 | |
69 | + for (int i = 0; i < 8; i++) | |
70 | + { | |
71 | + if(instructorList.Count < i) | |
72 | + { | |
73 | + instructorList.Add(Instantiate(instructorSell, instructorContentObj)); | |
74 | + | |
75 | + } | |
76 | + | |
77 | + //instructorList[i]. | |
78 | + } | |
79 | + | |
80 | + instructorSell.gameObject.SetActive(false); | |
81 | + | |
82 | + } | |
83 | + | |
84 | + // 각 메뉴에 맞는 UI를 표시한다 | |
85 | + private void ViewStoreMenuUI() | |
86 | + { | |
87 | + OffAllUI(); | |
88 | + | |
89 | + tabMenuObj.SetActive(true); | |
90 | + | |
91 | + switch (storeMenu) | |
92 | + { | |
93 | + case StoreMenu.Instructor: | |
94 | + instructorListObj.SetActive(true); | |
95 | + | |
96 | + break; | |
97 | + | |
98 | + case StoreMenu.Style: | |
99 | + styleListObj.SetActive(false); | |
100 | + | |
101 | + break; | |
102 | + | |
103 | + case StoreMenu.Map: | |
104 | + mapListObj.SetActive(false); | |
105 | + | |
106 | + break; | |
107 | + | |
108 | + case StoreMenu.Gold: | |
109 | + goldListObj.SetActive(false); | |
110 | + | |
111 | + break; | |
112 | + } | |
113 | + } | |
114 | + | |
115 | + | |
116 | + private void OffAllUI() | |
117 | + { | |
118 | + tabMenuObj.SetActive(false); | |
119 | + instructorListObj.SetActive(false); | |
120 | + instructorDetailObj.SetActive(false); | |
121 | + styleListObj.SetActive(false); | |
122 | + styleDetailObj.SetActive(false); | |
123 | + mapListObj.SetActive(false); | |
124 | + mapDetailObj.SetActive(false); | |
125 | + goldListObj.SetActive(false); | |
126 | + } | |
127 | + | |
128 | + | |
129 | + private void SetUpStoreUI() | |
130 | + { | |
131 | + | |
132 | + if (storeUIObj == null) | |
133 | + storeUIObj = transform.Find("StoreObj").gameObject; | |
134 | + | |
135 | + if (tabMenuObj == null) | |
136 | + tabMenuObj = storeUIObj.transform.Find("TabMenu").gameObject; | |
137 | + | |
138 | + if (instructorListObj == null) | |
139 | + instructorListObj = storeUIObj.transform.Find("InstructorList").gameObject; | |
140 | + | |
141 | + if (instructorDetailObj == null) | |
142 | + instructorDetailObj = storeUIObj.transform.Find("InstructorDetail").gameObject; | |
143 | + | |
144 | + if (styleListObj == null) | |
145 | + styleListObj = storeUIObj.transform.Find("StyleList").gameObject; | |
146 | + | |
147 | + if (styleDetailObj == null) | |
148 | + styleDetailObj = storeUIObj.transform.Find("StyleDetail").gameObject; | |
149 | + | |
150 | + if (mapListObj == null) | |
151 | + mapListObj = storeUIObj.transform.Find("MapList").gameObject; | |
152 | + | |
153 | + if (mapDetailObj == null) | |
154 | + mapDetailObj = storeUIObj.transform.Find("MapDetail").gameObject; | |
155 | + | |
156 | + if (goldListObj == null) | |
157 | + goldListObj = storeUIObj.transform.Find("GoldList").gameObject; | |
158 | + | |
159 | + // 상단 탭의 버튼 개수 배열 지정 | |
160 | + tabMenuBtns = new Button[tabMenuObj.transform.childCount]; | |
161 | + | |
162 | + for (int i = 0; i < tabMenuBtns.Length; i++) | |
163 | + { | |
164 | + Transform temp_ = tabMenuObj.transform.GetChild(i); | |
165 | + | |
166 | + tabMenuBtns[i] = temp_.GetComponentInChildren<Button>(); | |
167 | + } | |
168 | + | |
169 | + instructorSell = instructorListObj.transform.GetComponentInChildren<StoreSellObj>(); | |
170 | + instructorContentObj = instructorSell.transform.parent; | |
171 | + | |
172 | + instructorSell.gameObject.SetActive(false); | |
173 | + | |
174 | + } | |
175 | +} |
+++ VRTK/Assets/01.Junil/Script/StoreUIManager.cs.meta
... | ... | @@ -0,0 +1,11 @@ |
1 | +fileFormatVersion: 2 | |
2 | +guid: 6ee7f28776d7854438d509570e80e775 | |
3 | +MonoImporter: | |
4 | + externalObjects: {} | |
5 | + serializedVersion: 2 | |
6 | + defaultReferences: [] | |
7 | + executionOrder: 0 | |
8 | + icon: {instanceID: 0} | |
9 | + userData: | |
10 | + assetBundleName: | |
11 | + assetBundleVariant: |
--- VRTK/Assets/01.Junil/Script/Test/TestVRIKRig.cs
+++ VRTK/Assets/01.Junil/Script/Test/TestVRIKRig.cs
... | ... | @@ -19,6 +19,9 @@ |
19 | 19 |
public InputActionProperty rePlay; |
20 | 20 |
public InputActionProperty reset; |
21 | 21 |
|
22 |
+ public InputActionProperty rtesteset; |
|
23 |
+ |
|
24 |
+ |
|
22 | 25 |
private bool isPlay = false; |
23 | 26 |
|
24 | 27 |
// Start is called before the first frame update |
... | ... | @@ -60,6 +63,12 @@ |
60 | 63 |
isPlay = true; |
61 | 64 |
} |
62 | 65 |
} |
66 |
+ |
|
67 |
+ |
|
68 |
+ if (rtesteset.action.WasPressedThisFrame()) |
|
69 |
+ { |
|
70 |
+ Debug.Log("클릭맞아유"); |
|
71 |
+ } |
|
63 | 72 |
} |
64 | 73 |
|
65 | 74 |
// 선택된 애니메이션 클립 시c간의 현재 시간을 표기한다 |
--- VRTK/Assets/01.Junil/Script/UI/MirrorMenuManager.cs
+++ VRTK/Assets/01.Junil/Script/UI/MirrorMenuManager.cs
... | ... | @@ -52,8 +52,8 @@ |
52 | 52 |
|
53 | 53 |
public void OpenGuide() |
54 | 54 |
{ |
55 |
- OnOffMenuBtn(); |
|
56 |
- nowVRUI.vrInforPopup.SetActive(true); |
|
55 |
+ //OnOffMenuBtn(); |
|
56 |
+ //nowVRUI.vrInforPopup.SetActive(true); |
|
57 | 57 |
} |
58 | 58 |
|
59 | 59 |
//public void OpenMenu() |
... | ... | @@ -117,7 +117,7 @@ |
117 | 117 |
} |
118 | 118 |
// 메뉴 버튼 연결 |
119 | 119 |
menuBtn.onClick.AddListener(() => OnOffMenuBtn()); |
120 |
- guideBtn.onClick.AddListener(() => OpenGuide()); |
|
120 |
+ //guideBtn.onClick.AddListener(() => OpenGuide()); |
|
121 | 121 |
replayBtn.onClick.AddListener(() => OnOffRePlayBtn()); |
122 | 122 |
|
123 | 123 |
nickNameTxt.text = AssetBundleDataManager.Instance.udUserList.list.Find(x => x.sNo == searchSno).nickname; |
--- VRTK/Assets/01.Junil/Script/UI/MovementManager.cs
+++ VRTK/Assets/01.Junil/Script/UI/MovementManager.cs
... | ... | @@ -13,7 +13,10 @@ |
13 | 13 |
public PoseManager poseManager; |
14 | 14 |
|
15 | 15 |
public Slider sliderPlay; |
16 |
- public TMP_Text userPoseTxt; |
|
16 |
+ |
|
17 |
+ public TMP_Text nowProgramInfoTxt; |
|
18 |
+ public TMP_Text nowAnimInfoTxt; |
|
19 |
+ |
|
17 | 20 |
public TMP_Text animTimeTxt; |
18 | 21 |
|
19 | 22 |
public Image sliderFill; |
... | ... | @@ -55,10 +58,15 @@ |
55 | 58 |
// uiManager = tempUIManager_.GetComponent<UIManager>(); |
56 | 59 |
//} |
57 | 60 |
|
61 |
+ |
|
62 |
+ |
|
58 | 63 |
UIManager.Instance.movementManager = this; |
59 | 64 |
//uiManager.movementManager = this; |
60 | 65 |
|
61 | 66 |
anyKetStartButton = UIManager.Instance.animKeySetting.Find(x => x.action.name == "Start"); |
67 |
+ |
|
68 |
+ SetUpMovementUI(); |
|
69 |
+ |
|
62 | 70 |
} |
63 | 71 |
|
64 | 72 |
// Start is called before the first frame update |
... | ... | @@ -66,7 +74,7 @@ |
66 | 74 |
{ |
67 | 75 |
//UIManager.Instance.movementManager = this; |
68 | 76 |
|
69 |
- SetUpMovementUI(); |
|
77 |
+ //SetUpMovementUI(); |
|
70 | 78 |
} |
71 | 79 |
|
72 | 80 |
private void Update() |
... | ... | @@ -152,7 +160,7 @@ |
152 | 160 |
} |
153 | 161 |
|
154 | 162 |
|
155 |
- public void StartMoveMentCheck() |
|
163 |
+ public void StartMoveMentCheck(string nowProgramName, string nowAnimName) |
|
156 | 164 |
{ |
157 | 165 |
if (SceneManager.GetActiveScene().name != Define.VR_SCENE_FOUR) |
158 | 166 |
{ |
... | ... | @@ -220,6 +228,12 @@ |
220 | 228 |
tempDummy_.poseManager = poseManager; |
221 | 229 |
tempDummy_.isMatchCharacter = true; |
222 | 230 |
|
231 |
+ SetNowInfoTxt(nowProgramName, nowAnimName); |
|
232 |
+ |
|
233 |
+ |
|
234 |
+ if (UIManager.Instance.createUI.activeSelf == true) |
|
235 |
+ UIManager.Instance.OnOffMainUI(); |
|
236 |
+ |
|
223 | 237 |
} |
224 | 238 |
|
225 | 239 |
public void StartPlayMode() |
... | ... | @@ -283,6 +297,39 @@ |
283 | 297 |
//poseManager.enabled = false; |
284 | 298 |
} |
285 | 299 |
|
300 |
+ public void SetNowInfoTxt(string nowProgram, string nowAnim) |
|
301 |
+ { |
|
302 |
+ //I2.Loc.LocalizationManager.GetTranslation($"coach(gdStage)/{name}"); |
|
303 |
+ // 추후 동작평가를 위처럼 현지화 해서 사용해야? |
|
304 |
+ |
|
305 |
+ string tempStr_ = string.Empty; |
|
306 |
+ |
|
307 |
+ switch (nowProgram) |
|
308 |
+ { |
|
309 |
+ case "Basic": |
|
310 |
+ tempStr_ = "기본 동작 중"; |
|
311 |
+ |
|
312 |
+ break; |
|
313 |
+ |
|
314 |
+ case "Poomsae": |
|
315 |
+ tempStr_ = "동작 평가 중"; |
|
316 |
+ |
|
317 |
+ break; |
|
318 |
+ |
|
319 |
+ case "Olympic": |
|
320 |
+ tempStr_ = "동작 평가 중"; |
|
321 |
+ |
|
322 |
+ break; |
|
323 |
+ } |
|
324 |
+ |
|
325 |
+ string nowAnimTxt_ = I2.Loc.LocalizationManager.GetTranslation($"animationClip(gdQuest)/{nowAnim}"); |
|
326 |
+ |
|
327 |
+ nowProgramInfoTxt.text = tempStr_; |
|
328 |
+ |
|
329 |
+ |
|
330 |
+ nowAnimInfoTxt.text = nowAnimTxt_; |
|
331 |
+ } |
|
332 |
+ |
|
286 | 333 |
public void SetUpMovementUI() |
287 | 334 |
{ |
288 | 335 |
if(SceneManager.GetActiveScene().name != Define.VR_SCENE_FOUR) |
... | ... | @@ -322,6 +369,25 @@ |
322 | 369 |
GameObject tempAnimTxt_ = tempSilder_.transform.Find("AnimTimeTxt").gameObject; |
323 | 370 |
animTimeTxt = tempAnimTxt_.GetComponent<TMP_Text>(); |
324 | 371 |
} |
372 |
+ |
|
373 |
+ Transform tempNowInfo_ = movementInfo_.transform.Find("NowInfoObj"); |
|
374 |
+ |
|
375 |
+ if (nowProgramInfoTxt == null) |
|
376 |
+ { |
|
377 |
+ Transform tempProgramInfo_ = tempNowInfo_.transform.Find("NowProgramInfoTxt"); |
|
378 |
+ |
|
379 |
+ nowProgramInfoTxt = tempProgramInfo_.GetComponent<TMP_Text>(); |
|
380 |
+ } |
|
381 |
+ |
|
382 |
+ if (nowAnimInfoTxt == null) |
|
383 |
+ { |
|
384 |
+ Transform tempAnimInfo_ = tempNowInfo_.transform.Find("NowAnimInfoTxt"); |
|
385 |
+ |
|
386 |
+ nowAnimInfoTxt = tempAnimInfo_.GetComponent<TMP_Text>(); |
|
387 |
+ } |
|
388 |
+ |
|
389 |
+ nowProgramInfoTxt.text = ""; |
|
390 |
+ nowAnimInfoTxt.text = ""; |
|
325 | 391 |
|
326 | 392 |
//poseManager.sliderPlay = sliderPlay; |
327 | 393 |
//poseManager.sliderBG = sliderFill; |
--- VRTK/Assets/01.Junil/Script/UI/ResultUIManager.cs
+++ VRTK/Assets/01.Junil/Script/UI/ResultUIManager.cs
... | ... | @@ -3,27 +3,33 @@ |
3 | 3 |
using UnityEngine; |
4 | 4 |
using TMPro; |
5 | 5 |
using UnityEngine.UI; |
6 |
+using I2.Loc; |
|
6 | 7 |
|
7 | 8 |
public class ResultUIManager : MonoBehaviour |
8 | 9 |
{ |
9 | 10 |
public GameObject resultUI; |
10 | 11 |
|
11 |
- public TMP_Text scoreVal; |
|
12 |
- public TMP_Text evaluationTxt; |
|
12 |
+ |
|
13 |
+ public TMP_Text currentScoreVal; // 현재 점수 |
|
14 |
+ public TMP_Text bestScoreVal; // 최고 점수 |
|
15 |
+ |
|
16 |
+ public TMP_Text evaluationTxt; // 평가 |
|
13 | 17 |
|
14 | 18 |
|
15 |
- public TMP_Text moveCount; |
|
16 |
- public TMP_Text greatCount; |
|
17 |
- public TMP_Text goodCount; |
|
18 |
- public TMP_Text missCount; |
|
19 |
- public TMP_Text accuracyCount; |
|
19 |
+ public TMP_Text moveCount; // 총 행동 값 |
|
20 |
+ public TMP_Text greatCount; // great 값 |
|
21 |
+ public TMP_Text goodCount; // good 값 |
|
22 |
+ public TMP_Text missCount; // miss 값 |
|
23 |
+ public TMP_Text accuracyCount; // 정확도 값 |
|
24 |
+ public TMP_Text instructorNameTxt; |
|
25 |
+ //public Localize tkCoachkLocalize; |
|
20 | 26 |
|
21 |
- public TMP_Text heartCount; |
|
22 |
- public TMP_Text BestCount; |
|
27 |
+ public TMP_Text goldCount; // 골드 값 |
|
28 |
+ |
|
23 | 29 |
|
24 |
- public Button homeBtn; |
|
25 |
- public Button closeBtn; |
|
26 |
- public Button continueBtn; |
|
30 |
+ public Button rankingBtn; // 랭킹 버튼 |
|
31 |
+ public Button lobbyBtn; // 로비 버튼 |
|
32 |
+ public Button continueBtn; // 게속 버튼 |
|
27 | 33 |
|
28 | 34 |
|
29 | 35 |
|
... | ... | @@ -74,12 +80,26 @@ |
74 | 80 |
tempAccuracy_ = 0; |
75 | 81 |
|
76 | 82 |
evaluationTxt.text = SwitchResultStr(tempAccuracy_); |
77 |
- scoreVal.text = tempScore_.ToString(); |
|
83 |
+ |
|
84 |
+ |
|
85 |
+ currentScoreVal.text = tempScore_.ToString(); |
|
86 |
+ bestScoreVal.text = ""; |
|
87 |
+ |
|
78 | 88 |
moveCount.text = total_.ToString(); |
79 | 89 |
greatCount.text = great.ToString(); |
80 | 90 |
goodCount.text = good.ToString(); |
81 | 91 |
missCount.text = miss.ToString(); |
82 | 92 |
accuracyCount.text = $"{tempAccuracy_} %"; |
93 |
+ |
|
94 |
+ |
|
95 |
+ //UIManager.Instance.vrTkUIManager.nowSelectCoachName; |
|
96 |
+ |
|
97 |
+ string tempStr_ = I2.Loc.LocalizationManager.GetTranslation( |
|
98 |
+ $"coach(gdStage)/{UIManager.Instance.vrTkUIManager.nowSelectCoachName}"); |
|
99 |
+ // 강사 이름 어떻게 가져오지? |
|
100 |
+ instructorNameTxt.text = $"{tempStr_} 강사"; |
|
101 |
+ |
|
102 |
+ |
|
83 | 103 |
} |
84 | 104 |
|
85 | 105 |
// 정확도 점수에 따라 판정 표시 |
... | ... | @@ -131,65 +151,83 @@ |
131 | 151 |
|
132 | 152 |
GameObject tempInfo_ = resultUI.transform.GetChild(1).gameObject; |
133 | 153 |
GameObject tempBtns_ = resultUI.transform.GetChild(2).gameObject; |
154 |
+ |
|
155 |
+ GameObject tempScoreInfo_ = tempInfo_.transform.GetChild(0).gameObject; |
|
134 | 156 |
GameObject tempTotalInfo_ = tempInfo_.transform.GetChild(1).gameObject; |
135 | 157 |
|
136 | 158 |
|
137 |
- if (scoreVal == null) |
|
159 |
+ //Transform tempTrans_ = null; |
|
160 |
+ |
|
161 |
+ if (currentScoreVal == null) |
|
138 | 162 |
{ |
139 |
- GameObject tempScoreInfo_ = tempInfo_.transform.GetChild(0).gameObject; |
|
140 |
- scoreVal = tempScoreInfo_.transform.Find("ScoreNum").GetComponent<TMP_Text>(); |
|
163 |
+ Transform tempCurrentScore_ = tempScoreInfo_.transform.Find("CurrnetScoreObj"); |
|
164 |
+ |
|
165 |
+ currentScoreVal = tempCurrentScore_.Find("CurrentScoreVal").GetComponent<TMP_Text>(); |
|
141 | 166 |
} |
142 | 167 |
|
143 |
- if(evaluationTxt == null) |
|
168 |
+ if (bestScoreVal == null) |
|
169 |
+ { |
|
170 |
+ Transform tempBestScore_ = tempScoreInfo_.transform.Find("BestScoreObj"); |
|
171 |
+ |
|
172 |
+ bestScoreVal = tempBestScore_.Find("BestScoreVal").GetComponent<TMP_Text>(); |
|
173 |
+ } |
|
174 |
+ |
|
175 |
+ |
|
176 |
+ if (evaluationTxt == null) |
|
144 | 177 |
{ |
145 | 178 |
evaluationTxt = tempTotalInfo_.transform.Find("Evaluation").GetComponent<TMP_Text>(); |
146 | 179 |
} |
147 | 180 |
|
148 | 181 |
if (moveCount == null) |
149 | 182 |
{ |
150 |
- moveCount = tempTotalInfo_.transform.Find("MoveCount").GetComponent<TMP_Text>(); |
|
183 |
+ Transform tempMoveCount_ = tempTotalInfo_.transform.Find("TotalMove"); |
|
184 |
+ moveCount = tempMoveCount_.Find("MoveCount").GetComponent<TMP_Text>(); |
|
151 | 185 |
} |
152 | 186 |
|
153 | 187 |
if (greatCount == null) |
154 | 188 |
{ |
155 |
- greatCount = tempTotalInfo_.transform.Find("GreatCount").GetComponent<TMP_Text>(); |
|
189 |
+ Transform tempGreatCount_ = tempTotalInfo_.transform.Find("GreatVal"); |
|
190 |
+ greatCount = tempGreatCount_.Find("GreatCount").GetComponent<TMP_Text>(); |
|
156 | 191 |
} |
157 | 192 |
|
158 | 193 |
if (goodCount == null) |
159 | 194 |
{ |
160 |
- goodCount = tempTotalInfo_.transform.Find("GoodCount").GetComponent<TMP_Text>(); |
|
195 |
+ Transform tempGood_ = tempTotalInfo_.transform.Find("GoodVal"); |
|
196 |
+ |
|
197 |
+ goodCount = tempGood_.Find("GoodCount").GetComponent<TMP_Text>(); |
|
161 | 198 |
} |
162 | 199 |
|
163 | 200 |
if (missCount == null) |
164 | 201 |
{ |
165 |
- missCount = tempTotalInfo_.transform.Find("MissCount").GetComponent<TMP_Text>(); |
|
202 |
+ Transform tempMiss_ = tempTotalInfo_.transform.Find("MissVal"); |
|
203 |
+ |
|
204 |
+ missCount = tempMiss_.Find("MissCount").GetComponent<TMP_Text>(); |
|
166 | 205 |
} |
167 | 206 |
|
168 |
- if (accuracyCount == null) |
|
207 |
+ if (accuracyCount == null || instructorNameTxt == null) |
|
169 | 208 |
{ |
170 |
- accuracyCount = tempTotalInfo_.transform.Find("AccuracyCount").GetComponent<TMP_Text>(); |
|
209 |
+ Transform tempAccuracy_ = tempTotalInfo_.transform.Find("AccuracyVal"); |
|
210 |
+ accuracyCount = tempAccuracy_.Find("AccuracyCount").GetComponent<TMP_Text>(); |
|
211 |
+ |
|
212 |
+ Transform tempInstructo_ = tempAccuracy_.Find("InstructorObj"); |
|
213 |
+ instructorNameTxt = tempInstructo_.Find("InstructorNameTxt").GetComponent<TMP_Text>(); |
|
171 | 214 |
} |
172 | 215 |
|
173 |
- if (heartCount == null) |
|
216 |
+ if (goldCount == null) |
|
174 | 217 |
{ |
175 |
- heartCount = tempTotalInfo_.transform.Find("HeartCount").GetComponent<TMP_Text>(); |
|
218 |
+ Transform tempGold_ = tempTotalInfo_.transform.Find("Gold_Count"); |
|
219 |
+ goldCount = tempGold_.Find("GoldCount").GetComponent<TMP_Text>(); |
|
176 | 220 |
|
177 | 221 |
} |
178 | 222 |
|
179 |
- if (BestCount == null) |
|
223 |
+ if(rankingBtn == null) |
|
180 | 224 |
{ |
181 |
- BestCount = tempTotalInfo_.transform.Find("BestCount").GetComponent<TMP_Text>(); |
|
182 |
- |
|
225 |
+ rankingBtn = tempBtns_.transform.Find("RankingBtn").GetComponent<Button>(); |
|
183 | 226 |
} |
184 | 227 |
|
185 |
- if(homeBtn == null) |
|
228 |
+ if (lobbyBtn == null) |
|
186 | 229 |
{ |
187 |
- homeBtn = tempBtns_.transform.Find("HomeBtn").GetComponent<Button>(); |
|
188 |
- } |
|
189 |
- |
|
190 |
- if (closeBtn == null) |
|
191 |
- { |
|
192 |
- closeBtn = tempBtns_.transform.Find("CloseBtn").GetComponent<Button>(); |
|
230 |
+ lobbyBtn = tempBtns_.transform.Find("LobbyBtn").GetComponent<Button>(); |
|
193 | 231 |
} |
194 | 232 |
|
195 | 233 |
if (continueBtn == null) |
... | ... | @@ -203,9 +241,9 @@ |
203 | 241 |
// uiManager = tempObj_.GetComponent<UIManager>(); |
204 | 242 |
//} |
205 | 243 |
|
206 |
- |
|
207 |
- homeBtn.onClick.AddListener(() => CloseResultUI()); |
|
208 |
- closeBtn.onClick.AddListener(() => CloseResultUI()); |
|
244 |
+ // 랭킹은 잠시 끄기 |
|
245 |
+ //rankingBtn.onClick.AddListener(() => CloseResultUI()); |
|
246 |
+ lobbyBtn.onClick.AddListener(() => CloseResultUI()); |
|
209 | 247 |
continueBtn.onClick.AddListener(() => UIManager.Instance.movementManager.StartPlayMode()); |
210 | 248 |
|
211 | 249 |
if (resultUI.activeSelf == true) |
+++ VRTK/Assets/01.Junil/Script/UI/SwitchToggle.cs
... | ... | @@ -0,0 +1,66 @@ |
1 | + | |
2 | +using System.Collections; | |
3 | +using System.Collections.Generic; | |
4 | +using UnityEngine; | |
5 | +using UnityEngine.UI; | |
6 | + | |
7 | + | |
8 | +public class SwitchToggle : MonoBehaviour | |
9 | +{ | |
10 | + [SerializeField] | |
11 | + RectTransform uiHandleRectTransform; | |
12 | + | |
13 | + [SerializeField] | |
14 | + Color bgActiveColor; | |
15 | + | |
16 | + [SerializeField] | |
17 | + Color handleActiveColor; | |
18 | + | |
19 | + [SerializeField] | |
20 | + Color bgDefaultColor; | |
21 | + | |
22 | + [SerializeField] | |
23 | + Color handleDefaultColor; | |
24 | + | |
25 | + public Image bgImg; | |
26 | + public Image handleImg; | |
27 | + | |
28 | + | |
29 | + Toggle toggle; | |
30 | + | |
31 | + Vector2 handlePosition; | |
32 | + | |
33 | + private void Awake() | |
34 | + { | |
35 | + toggle = GetComponent<Toggle>(); | |
36 | + | |
37 | + handlePosition = uiHandleRectTransform.anchoredPosition; | |
38 | + | |
39 | + bgImg = uiHandleRectTransform.parent.GetComponent<Image>(); | |
40 | + handleImg = uiHandleRectTransform.GetComponent<Image>(); | |
41 | + | |
42 | + bgDefaultColor = bgImg.color; | |
43 | + handleDefaultColor = handleImg.color; | |
44 | + | |
45 | + | |
46 | + toggle.onValueChanged.AddListener(OnSwitch); | |
47 | + | |
48 | + if (toggle.isOn) | |
49 | + OnSwitch(true); | |
50 | + } | |
51 | + | |
52 | + private void OnSwitch(bool isOn) | |
53 | + { | |
54 | + Debug.LogError(isOn); | |
55 | + uiHandleRectTransform.anchoredPosition = isOn ? handlePosition * -1 : handlePosition; | |
56 | + | |
57 | + bgImg.color = isOn ? bgActiveColor : bgDefaultColor; | |
58 | + //handleImg.color = isOn ? handleActiveColor : handleDefaultColor; | |
59 | + } | |
60 | + | |
61 | + private void OnDestroy() | |
62 | + { | |
63 | + toggle.onValueChanged.AddListener(OnSwitch); | |
64 | + | |
65 | + } | |
66 | +} |
+++ VRTK/Assets/01.Junil/Script/UI/SwitchToggle.cs.meta
... | ... | @@ -0,0 +1,11 @@ |
1 | +fileFormatVersion: 2 | |
2 | +guid: 35363e11b7f24264f877f3a11215e1c7 | |
3 | +MonoImporter: | |
4 | + externalObjects: {} | |
5 | + serializedVersion: 2 | |
6 | + defaultReferences: [] | |
7 | + executionOrder: 0 | |
8 | + icon: {instanceID: 0} | |
9 | + userData: | |
10 | + assetBundleName: | |
11 | + assetBundleVariant: |
--- VRTK/Assets/01.Junil/Script/UI/TK/TkCoachInfo.cs
+++ VRTK/Assets/01.Junil/Script/UI/TK/TkCoachInfo.cs
... | ... | @@ -82,7 +82,9 @@ |
82 | 82 |
else |
83 | 83 |
{ |
84 | 84 |
vrTkUIManager.nowSelectCoachId = tkCoachId; |
85 |
- vrTkUIManager.nowSelectCoachName = tkCoachName; |
|
85 |
+ vrTkUIManager.nowSelectCoachFileName = tkCoachName; |
|
86 |
+ vrTkUIManager.nowSelectCoachName = tkStageName; |
|
87 |
+ |
|
86 | 88 |
vrTkUIManager.ViewNextSelect("TkSelect"); |
87 | 89 |
} |
88 | 90 |
} |
--- VRTK/Assets/01.Junil/Script/UI/TK/VRTkUIManager.cs
+++ VRTK/Assets/01.Junil/Script/UI/TK/VRTkUIManager.cs
... | ... | @@ -83,12 +83,18 @@ |
83 | 83 |
public PopupDetailManager popupDetailManager; |
84 | 84 |
public PopupBuyManager popupBuyManager; |
85 | 85 |
|
86 |
+ // 현재 선택된 프로그램 |
|
87 |
+ public string nowProgram; |
|
86 | 88 |
// 현재 선택된 태권도 애니메이션 |
87 | 89 |
public string nowSelectAnim; |
88 | 90 |
// 현재 선택된 코치 id |
89 | 91 |
public int nowSelectCoachId; |
92 |
+ // 현재 선택된 코치 파일 이름 |
|
93 |
+ public string nowSelectCoachFileName; |
|
90 | 94 |
// 현재 선택된 코치 이름 |
91 | 95 |
public string nowSelectCoachName; |
96 |
+ |
|
97 |
+ |
|
92 | 98 |
|
93 | 99 |
|
94 | 100 |
// 품새 관련 리스트 |
... | ... | @@ -165,8 +171,8 @@ |
165 | 171 |
if (grandSelectBg.activeSelf) |
166 | 172 |
grandSelectBg.SetActive(false); |
167 | 173 |
|
168 |
- poomsaeBtn.onClick.AddListener(() => ViewNextSelect("TkCoachSelect")); |
|
169 |
- homeBtn.onClick.AddListener(() => UIManager.Instance.OnOffMainUI()); |
|
174 |
+ poomsaeBtn.onClick.AddListener(() => SelectPoomsae()); |
|
175 |
+ //homeBtn.onClick.AddListener(() => UIManager.Instance.OnOffMainUI()); |
|
170 | 176 |
exitBtn.onClick.AddListener(() => UIManager.Instance.ExitApp()); |
171 | 177 |
ViewBuyList(); |
172 | 178 |
|
... | ... | @@ -322,6 +328,31 @@ |
322 | 328 |
|
323 | 329 |
|
324 | 330 |
// } |
331 |
+ |
|
332 |
+ // 기본 동작 선택 |
|
333 |
+ public void SelectBasic() |
|
334 |
+ { |
|
335 |
+ nowProgram = "Basic"; |
|
336 |
+ ViewNextSelect("TkCoachSelect"); |
|
337 |
+ |
|
338 |
+ } |
|
339 |
+ |
|
340 |
+ // 품새 선택 |
|
341 |
+ public void SelectPoomsae() |
|
342 |
+ { |
|
343 |
+ nowProgram = "Poomsae"; |
|
344 |
+ |
|
345 |
+ ViewNextSelect("TkCoachSelect"); |
|
346 |
+ |
|
347 |
+ } |
|
348 |
+ |
|
349 |
+ // 올림픽 강화 훈련 선택 |
|
350 |
+ public void SelectOlympic() |
|
351 |
+ { |
|
352 |
+ nowProgram = "Olympic"; |
|
353 |
+ ViewNextSelect("TkCoachSelect"); |
|
354 |
+ |
|
355 |
+ } |
|
325 | 356 |
|
326 | 357 |
public void OnClickScrollBtn(string scrollName) |
327 | 358 |
{ |
... | ... | @@ -582,7 +613,7 @@ |
582 | 613 |
{ |
583 | 614 |
animController.SelectModeState(selectMode); |
584 | 615 |
animController.isFirstEffect = false; |
585 |
- StartCoroutine(GetVRTkAsset(nowSelectCoachName, nowSelectAnim)); |
|
616 |
+ StartCoroutine(GetVRTkAsset(nowSelectCoachFileName, nowSelectAnim)); |
|
586 | 617 |
} |
587 | 618 |
else |
588 | 619 |
{ |
... | ... | @@ -782,11 +813,11 @@ |
782 | 813 |
animController.RePlayAnim(false); |
783 | 814 |
|
784 | 815 |
|
785 |
- vrInforPopup.SetActive(true); |
|
816 |
+ //vrInforPopup.SetActive(true); |
|
786 | 817 |
|
787 | 818 |
uiManager.movementManager.gameObject.SetActive(true); |
788 |
- |
|
789 |
- uiManager.movementManager.StartMoveMentCheck(); |
|
819 |
+ |
|
820 |
+ uiManager.movementManager.StartMoveMentCheck(nowProgram, nowSelectAnim); |
|
790 | 821 |
} // ShowTkModel |
791 | 822 |
|
792 | 823 |
} |
--- VRTK/Assets/01.Junil/Script/UI/VRUIBasic.cs
+++ VRTK/Assets/01.Junil/Script/UI/VRUIBasic.cs
... | ... | @@ -10,7 +10,7 @@ |
10 | 10 |
|
11 | 11 |
// 팝업창 |
12 | 12 |
public GameObject popUp; |
13 |
- public GameObject vrInforPopup; |
|
13 |
+ //public GameObject vrInforPopup; |
|
14 | 14 |
public ResultUIManager resultUIManager; |
15 | 15 |
|
16 | 16 |
public virtual void SetUIInfo() |
... | ... | @@ -27,25 +27,25 @@ |
27 | 27 |
|
28 | 28 |
//animController.closeBtn.onClick.AddListener(() => CloseAnim()); |
29 | 29 |
|
30 |
- if(vrInforPopup == null) |
|
31 |
- { |
|
32 |
- vrInforPopup = transform.Find("VR_InforPopup").gameObject; |
|
33 |
- } |
|
30 |
+ //if(vrInforPopup == null) |
|
31 |
+ //{ |
|
32 |
+ // //vrInforPopup = transform.Find("VR_InforPopup").gameObject; |
|
33 |
+ //} |
|
34 | 34 |
|
35 |
- vrInforPopup.SetActive(false); |
|
35 |
+ //vrInforPopup.SetActive(false); |
|
36 | 36 |
|
37 | 37 |
} |
38 | 38 |
|
39 | 39 |
private void OnDisable() |
40 | 40 |
{ |
41 |
- if(vrInforPopup.activeSelf) |
|
42 |
- vrInforPopup.SetActive(false); |
|
41 |
+ //if(vrInforPopup.activeSelf) |
|
42 |
+ //vrInforPopup.SetActive(false); |
|
43 | 43 |
|
44 | 44 |
} |
45 | 45 |
|
46 | 46 |
public void OnOffVRInforPopup() |
47 | 47 |
{ |
48 |
- vrInforPopup.SetActive(!vrInforPopup.activeSelf); |
|
48 |
+ //vrInforPopup.SetActive(!vrInforPopup.activeSelf); |
|
49 | 49 |
} |
50 | 50 |
|
51 | 51 |
|
--- VRTK/Assets/@LobbyRes/Prefab/MirrorCustom.prefab
+++ VRTK/Assets/@LobbyRes/Prefab/MirrorCustom.prefab
... | ... | @@ -193,7 +193,7 @@ |
193 | 193 |
m_Icon: {fileID: 0} |
194 | 194 |
m_NavMeshLayer: 0 |
195 | 195 |
m_StaticEditorFlags: 0 |
196 |
- m_IsActive: 1 |
|
196 |
+ m_IsActive: 0 |
|
197 | 197 |
--- !u!224 &6537107147257564876 |
198 | 198 |
RectTransform: |
199 | 199 |
m_ObjectHideFlags: 0 |
... | ... | @@ -208,9 +208,9 @@ |
208 | 208 |
m_Children: [] |
209 | 209 |
m_Father: {fileID: 5413964571021927917} |
210 | 210 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
211 |
- m_AnchorMin: {x: 0, y: 0} |
|
212 |
- m_AnchorMax: {x: 0, y: 0} |
|
213 |
- m_AnchoredPosition: {x: 0, y: 0} |
|
211 |
+ m_AnchorMin: {x: 0, y: 1} |
|
212 |
+ m_AnchorMax: {x: 0, y: 1} |
|
213 |
+ m_AnchoredPosition: {x: 15, y: -52.75} |
|
214 | 214 |
m_SizeDelta: {x: 30, y: 4} |
215 | 215 |
m_Pivot: {x: 0.5, y: 0.5} |
216 | 216 |
--- !u!222 &3826220429120189721 |
... | ... | @@ -381,7 +381,7 @@ |
381 | 381 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
382 | 382 |
m_AnchorMin: {x: 1, y: 1} |
383 | 383 |
m_AnchorMax: {x: 1, y: 1} |
384 |
- m_AnchoredPosition: {x: -55, y: -18} |
|
384 |
+ m_AnchoredPosition: {x: -20, y: -62} |
|
385 | 385 |
m_SizeDelta: {x: 30, y: 26} |
386 | 386 |
m_Pivot: {x: 0.5, y: 0.5} |
387 | 387 |
--- !u!1 &346541454764884968 |
... | ... | @@ -1256,6 +1256,96 @@ |
1256 | 1256 |
m_ChildScaleWidth: 0 |
1257 | 1257 |
m_ChildScaleHeight: 0 |
1258 | 1258 |
m_ReverseArrangement: 0 |
1259 |
+--- !u!1 &1291695221928379747 |
|
1260 |
+GameObject: |
|
1261 |
+ m_ObjectHideFlags: 0 |
|
1262 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
1263 |
+ m_PrefabInstance: {fileID: 0} |
|
1264 |
+ m_PrefabAsset: {fileID: 0} |
|
1265 |
+ serializedVersion: 6 |
|
1266 |
+ m_Component: |
|
1267 |
+ - component: {fileID: 104951364572014884} |
|
1268 |
+ - component: {fileID: 4448042390145655669} |
|
1269 |
+ - component: {fileID: 1527864746613113775} |
|
1270 |
+ - component: {fileID: 435109888658840164} |
|
1271 |
+ m_Layer: 5 |
|
1272 |
+ m_Name: NowInfoBg |
|
1273 |
+ m_TagString: Untagged |
|
1274 |
+ m_Icon: {fileID: 0} |
|
1275 |
+ m_NavMeshLayer: 0 |
|
1276 |
+ m_StaticEditorFlags: 0 |
|
1277 |
+ m_IsActive: 1 |
|
1278 |
+--- !u!224 &104951364572014884 |
|
1279 |
+RectTransform: |
|
1280 |
+ m_ObjectHideFlags: 0 |
|
1281 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
1282 |
+ m_PrefabInstance: {fileID: 0} |
|
1283 |
+ m_PrefabAsset: {fileID: 0} |
|
1284 |
+ m_GameObject: {fileID: 1291695221928379747} |
|
1285 |
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} |
|
1286 |
+ m_LocalPosition: {x: 0, y: 0, z: -2} |
|
1287 |
+ m_LocalScale: {x: 1, y: 1, z: 1} |
|
1288 |
+ m_ConstrainProportionsScale: 0 |
|
1289 |
+ m_Children: [] |
|
1290 |
+ m_Father: {fileID: 4917089996595784714} |
|
1291 |
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
|
1292 |
+ m_AnchorMin: {x: 0, y: 0} |
|
1293 |
+ m_AnchorMax: {x: 1, y: 1} |
|
1294 |
+ m_AnchoredPosition: {x: 0, y: 0} |
|
1295 |
+ m_SizeDelta: {x: 0, y: 0} |
|
1296 |
+ m_Pivot: {x: 0, y: 0.5} |
|
1297 |
+--- !u!222 &4448042390145655669 |
|
1298 |
+CanvasRenderer: |
|
1299 |
+ m_ObjectHideFlags: 0 |
|
1300 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
1301 |
+ m_PrefabInstance: {fileID: 0} |
|
1302 |
+ m_PrefabAsset: {fileID: 0} |
|
1303 |
+ m_GameObject: {fileID: 1291695221928379747} |
|
1304 |
+ m_CullTransparentMesh: 1 |
|
1305 |
+--- !u!114 &1527864746613113775 |
|
1306 |
+MonoBehaviour: |
|
1307 |
+ m_ObjectHideFlags: 0 |
|
1308 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
1309 |
+ m_PrefabInstance: {fileID: 0} |
|
1310 |
+ m_PrefabAsset: {fileID: 0} |
|
1311 |
+ m_GameObject: {fileID: 1291695221928379747} |
|
1312 |
+ m_Enabled: 1 |
|
1313 |
+ m_EditorHideFlags: 0 |
|
1314 |
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} |
|
1315 |
+ m_Name: |
|
1316 |
+ m_EditorClassIdentifier: |
|
1317 |
+ m_Material: {fileID: 0} |
|
1318 |
+ m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} |
|
1319 |
+ m_RaycastTarget: 1 |
|
1320 |
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} |
|
1321 |
+ m_Maskable: 1 |
|
1322 |
+ m_OnCullStateChanged: |
|
1323 |
+ m_PersistentCalls: |
|
1324 |
+ m_Calls: [] |
|
1325 |
+ m_Sprite: {fileID: 0} |
|
1326 |
+ m_Type: 0 |
|
1327 |
+ m_PreserveAspect: 0 |
|
1328 |
+ m_FillCenter: 1 |
|
1329 |
+ m_FillMethod: 4 |
|
1330 |
+ m_FillAmount: 1 |
|
1331 |
+ m_FillClockwise: 1 |
|
1332 |
+ m_FillOrigin: 0 |
|
1333 |
+ m_UseSpriteMesh: 0 |
|
1334 |
+ m_PixelsPerUnitMultiplier: 1 |
|
1335 |
+--- !u!114 &435109888658840164 |
|
1336 |
+MonoBehaviour: |
|
1337 |
+ m_ObjectHideFlags: 0 |
|
1338 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
1339 |
+ m_PrefabInstance: {fileID: 0} |
|
1340 |
+ m_PrefabAsset: {fileID: 0} |
|
1341 |
+ m_GameObject: {fileID: 1291695221928379747} |
|
1342 |
+ m_Enabled: 1 |
|
1343 |
+ m_EditorHideFlags: 0 |
|
1344 |
+ m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} |
|
1345 |
+ m_Name: |
|
1346 |
+ m_EditorClassIdentifier: |
|
1347 |
+ radius: 4 |
|
1348 |
+ image: {fileID: 1527864746613113775} |
|
1259 | 1349 |
--- !u!1 &1343445139511313444 |
1260 | 1350 |
GameObject: |
1261 | 1351 |
m_ObjectHideFlags: 0 |
... | ... | @@ -1381,7 +1471,7 @@ |
1381 | 1471 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
1382 | 1472 |
m_AnchorMin: {x: 0, y: 0.5} |
1383 | 1473 |
m_AnchorMax: {x: 0, y: 0.5} |
1384 |
- m_AnchoredPosition: {x: 10, y: 0} |
|
1474 |
+ m_AnchoredPosition: {x: 12, y: 0} |
|
1385 | 1475 |
m_SizeDelta: {x: 14, y: 14} |
1386 | 1476 |
m_Pivot: {x: 0.5, y: 0.5} |
1387 | 1477 |
--- !u!1 &1395804503778193411 |
... | ... | @@ -1619,7 +1709,7 @@ |
1619 | 1709 |
m_Name: |
1620 | 1710 |
m_EditorClassIdentifier: |
1621 | 1711 |
m_Material: {fileID: 0} |
1622 |
- m_Color: {r: 0.8352942, g: 0.854902, b: 0.8705883, a: 1} |
|
1712 |
+ m_Color: {r: 0.6509804, g: 0.6509804, b: 0.6509804, a: 1} |
|
1623 | 1713 |
m_RaycastTarget: 1 |
1624 | 1714 |
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} |
1625 | 1715 |
m_Maskable: 1 |
... | ... | @@ -1661,14 +1751,13 @@ |
1661 | 1751 |
- component: {fileID: 2856564986223396255} |
1662 | 1752 |
- component: {fileID: 7597920505578004818} |
1663 | 1753 |
- component: {fileID: 4463253529431627180} |
1664 |
- - component: {fileID: 8876995894326144196} |
|
1665 | 1754 |
m_Layer: 5 |
1666 | 1755 |
m_Name: Shadow |
1667 | 1756 |
m_TagString: Untagged |
1668 | 1757 |
m_Icon: {fileID: 0} |
1669 | 1758 |
m_NavMeshLayer: 0 |
1670 | 1759 |
m_StaticEditorFlags: 0 |
1671 |
- m_IsActive: 1 |
|
1760 |
+ m_IsActive: 0 |
|
1672 | 1761 |
--- !u!224 &2856564986223396255 |
1673 | 1762 |
RectTransform: |
1674 | 1763 |
m_ObjectHideFlags: 0 |
... | ... | @@ -1726,20 +1815,6 @@ |
1726 | 1815 |
m_FillOrigin: 0 |
1727 | 1816 |
m_UseSpriteMesh: 0 |
1728 | 1817 |
m_PixelsPerUnitMultiplier: 1 |
1729 |
---- !u!114 &8876995894326144196 |
|
1730 |
-MonoBehaviour: |
|
1731 |
- m_ObjectHideFlags: 0 |
|
1732 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
1733 |
- m_PrefabInstance: {fileID: 0} |
|
1734 |
- m_PrefabAsset: {fileID: 0} |
|
1735 |
- m_GameObject: {fileID: 1774996862351498265} |
|
1736 |
- m_Enabled: 1 |
|
1737 |
- m_EditorHideFlags: 0 |
|
1738 |
- m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} |
|
1739 |
- m_Name: |
|
1740 |
- m_EditorClassIdentifier: |
|
1741 |
- radius: 7 |
|
1742 |
- image: {fileID: 4463253529431627180} |
|
1743 | 1818 |
--- !u!1 &1817625673465099553 |
1744 | 1819 |
GameObject: |
1745 | 1820 |
m_ObjectHideFlags: 0 |
... | ... | @@ -1926,7 +2001,7 @@ |
1926 | 2001 |
m_Icon: {fileID: 0} |
1927 | 2002 |
m_NavMeshLayer: 0 |
1928 | 2003 |
m_StaticEditorFlags: 0 |
1929 |
- m_IsActive: 1 |
|
2004 |
+ m_IsActive: 0 |
|
1930 | 2005 |
--- !u!224 &5289992013698230387 |
1931 | 2006 |
RectTransform: |
1932 | 2007 |
m_ObjectHideFlags: 0 |
... | ... | @@ -1943,9 +2018,9 @@ |
1943 | 2018 |
- {fileID: 7093262274242409335} |
1944 | 2019 |
m_Father: {fileID: 5413964571021927917} |
1945 | 2020 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
1946 |
- m_AnchorMin: {x: 0, y: 0} |
|
1947 |
- m_AnchorMax: {x: 0, y: 0} |
|
1948 |
- m_AnchoredPosition: {x: 0, y: 0} |
|
2021 |
+ m_AnchorMin: {x: 0, y: 1} |
|
2022 |
+ m_AnchorMax: {x: 0, y: 1} |
|
2023 |
+ m_AnchoredPosition: {x: 15, y: -49.25} |
|
1949 | 2024 |
m_SizeDelta: {x: 14, y: 14} |
1950 | 2025 |
m_Pivot: {x: 0.5, y: 0.5} |
1951 | 2026 |
--- !u!1 &2180071461253483884 |
... | ... | @@ -2143,7 +2218,7 @@ |
2143 | 2218 |
depth: 10 |
2144 | 2219 |
flipNormal: 0 |
2145 | 2220 |
inverse: 1 |
2146 |
- fillAmount: 0.464 |
|
2221 |
+ fillAmount: 0.23 |
|
2147 | 2222 |
xAlign: 0 |
2148 | 2223 |
yAlign: 0 |
2149 | 2224 |
radius: 34 |
... | ... | @@ -2611,7 +2686,7 @@ |
2611 | 2686 |
m_PrefabAsset: {fileID: 0} |
2612 | 2687 |
m_GameObject: {fileID: 2745330273665342457} |
2613 | 2688 |
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} |
2614 |
- m_LocalPosition: {x: 0, y: 0, z: 0} |
|
2689 |
+ m_LocalPosition: {x: 0, y: 0, z: -2} |
|
2615 | 2690 |
m_LocalScale: {x: 1, y: 1, z: 1} |
2616 | 2691 |
m_ConstrainProportionsScale: 0 |
2617 | 2692 |
m_Children: [] |
... | ... | @@ -3042,8 +3117,8 @@ |
3042 | 3117 |
m_faceColor: |
3043 | 3118 |
serializedVersion: 2 |
3044 | 3119 |
rgba: 4294967295 |
3045 |
- m_fontSize: 4 |
|
3046 |
- m_fontSizeBase: 4 |
|
3120 |
+ m_fontSize: 3 |
|
3121 |
+ m_fontSizeBase: 3 |
|
3047 | 3122 |
m_fontWeight: 400 |
3048 | 3123 |
m_enableAutoSizing: 0 |
3049 | 3124 |
m_fontSizeMin: 18 |
... | ... | @@ -3655,8 +3730,8 @@ |
3655 | 3730 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
3656 | 3731 |
m_AnchorMin: {x: 1, y: 1} |
3657 | 3732 |
m_AnchorMax: {x: 1, y: 1} |
3658 |
- m_AnchoredPosition: {x: -20, y: -40} |
|
3659 |
- m_SizeDelta: {x: 30, y: 70} |
|
3733 |
+ m_AnchoredPosition: {x: -20, y: -25} |
|
3734 |
+ m_SizeDelta: {x: 30, y: 40} |
|
3660 | 3735 |
m_Pivot: {x: 0.5, y: 0.5} |
3661 | 3736 |
--- !u!1 &4109626924723994998 |
3662 | 3737 |
GameObject: |
... | ... | @@ -3670,7 +3745,6 @@ |
3670 | 3745 |
- component: {fileID: 5167899340211109153} |
3671 | 3746 |
- component: {fileID: 6021083225102807115} |
3672 | 3747 |
- component: {fileID: 5505440165778540337} |
3673 |
- - component: {fileID: 2585558004867371274} |
|
3674 | 3748 |
m_Layer: 5 |
3675 | 3749 |
m_Name: UserImg |
3676 | 3750 |
m_TagString: Untagged |
... | ... | @@ -3719,7 +3793,7 @@ |
3719 | 3793 |
m_Name: |
3720 | 3794 |
m_EditorClassIdentifier: |
3721 | 3795 |
m_Material: {fileID: 0} |
3722 |
- m_Color: {r: 0.59607846, g: 0.7411765, b: 0.8745099, a: 1} |
|
3796 |
+ m_Color: {r: 1, g: 1, b: 1, a: 0.003921569} |
|
3723 | 3797 |
m_RaycastTarget: 1 |
3724 | 3798 |
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} |
3725 | 3799 |
m_Maskable: 1 |
... | ... | @@ -3749,20 +3823,6 @@ |
3749 | 3823 |
m_Name: |
3750 | 3824 |
m_EditorClassIdentifier: |
3751 | 3825 |
m_ShowMaskGraphic: 1 |
3752 |
---- !u!114 &2585558004867371274 |
|
3753 |
-MonoBehaviour: |
|
3754 |
- m_ObjectHideFlags: 0 |
|
3755 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
3756 |
- m_PrefabInstance: {fileID: 0} |
|
3757 |
- m_PrefabAsset: {fileID: 0} |
|
3758 |
- m_GameObject: {fileID: 4109626924723994998} |
|
3759 |
- m_Enabled: 1 |
|
3760 |
- m_EditorHideFlags: 0 |
|
3761 |
- m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} |
|
3762 |
- m_Name: |
|
3763 |
- m_EditorClassIdentifier: |
|
3764 |
- radius: 7 |
|
3765 |
- image: {fileID: 6021083225102807115} |
|
3766 | 3826 |
--- !u!1 &4119227314915520682 |
3767 | 3827 |
GameObject: |
3768 | 3828 |
m_ObjectHideFlags: 0 |
... | ... | @@ -4062,7 +4122,7 @@ |
4062 | 4122 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
4063 | 4123 |
m_AnchorMin: {x: 0, y: 0} |
4064 | 4124 |
m_AnchorMax: {x: 1, y: 1} |
4065 |
- m_AnchoredPosition: {x: 1, y: -1} |
|
4125 |
+ m_AnchoredPosition: {x: 1, y: -1.0000019} |
|
4066 | 4126 |
m_SizeDelta: {x: 0, y: 0} |
4067 | 4127 |
m_Pivot: {x: 0.5, y: 0.5} |
4068 | 4128 |
--- !u!222 &1724657083025941234 |
... | ... | @@ -4143,6 +4203,141 @@ |
4143 | 4203 |
m_ChildScaleWidth: 0 |
4144 | 4204 |
m_ChildScaleHeight: 0 |
4145 | 4205 |
m_ReverseArrangement: 0 |
4206 |
+--- !u!1 &4432472382111169127 |
|
4207 |
+GameObject: |
|
4208 |
+ m_ObjectHideFlags: 0 |
|
4209 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
4210 |
+ m_PrefabInstance: {fileID: 0} |
|
4211 |
+ m_PrefabAsset: {fileID: 0} |
|
4212 |
+ serializedVersion: 6 |
|
4213 |
+ m_Component: |
|
4214 |
+ - component: {fileID: 4783819721224876288} |
|
4215 |
+ - component: {fileID: 8523202347170650060} |
|
4216 |
+ - component: {fileID: 2668914988405658714} |
|
4217 |
+ m_Layer: 5 |
|
4218 |
+ m_Name: NowAnimInfoTxt |
|
4219 |
+ m_TagString: Untagged |
|
4220 |
+ m_Icon: {fileID: 0} |
|
4221 |
+ m_NavMeshLayer: 0 |
|
4222 |
+ m_StaticEditorFlags: 0 |
|
4223 |
+ m_IsActive: 1 |
|
4224 |
+--- !u!224 &4783819721224876288 |
|
4225 |
+RectTransform: |
|
4226 |
+ m_ObjectHideFlags: 0 |
|
4227 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
4228 |
+ m_PrefabInstance: {fileID: 0} |
|
4229 |
+ m_PrefabAsset: {fileID: 0} |
|
4230 |
+ m_GameObject: {fileID: 4432472382111169127} |
|
4231 |
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} |
|
4232 |
+ m_LocalPosition: {x: 0, y: 0, z: -4} |
|
4233 |
+ m_LocalScale: {x: 1, y: 1, z: 1} |
|
4234 |
+ m_ConstrainProportionsScale: 0 |
|
4235 |
+ m_Children: [] |
|
4236 |
+ m_Father: {fileID: 4917089996595784714} |
|
4237 |
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
|
4238 |
+ m_AnchorMin: {x: 0, y: 0.5} |
|
4239 |
+ m_AnchorMax: {x: 1, y: 0.5} |
|
4240 |
+ m_AnchoredPosition: {x: 20, y: 0} |
|
4241 |
+ m_SizeDelta: {x: -40, y: 14} |
|
4242 |
+ m_Pivot: {x: 0.5, y: 0.5} |
|
4243 |
+--- !u!222 &8523202347170650060 |
|
4244 |
+CanvasRenderer: |
|
4245 |
+ m_ObjectHideFlags: 0 |
|
4246 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
4247 |
+ m_PrefabInstance: {fileID: 0} |
|
4248 |
+ m_PrefabAsset: {fileID: 0} |
|
4249 |
+ m_GameObject: {fileID: 4432472382111169127} |
|
4250 |
+ m_CullTransparentMesh: 1 |
|
4251 |
+--- !u!114 &2668914988405658714 |
|
4252 |
+MonoBehaviour: |
|
4253 |
+ m_ObjectHideFlags: 0 |
|
4254 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
4255 |
+ m_PrefabInstance: {fileID: 0} |
|
4256 |
+ m_PrefabAsset: {fileID: 0} |
|
4257 |
+ m_GameObject: {fileID: 4432472382111169127} |
|
4258 |
+ m_Enabled: 1 |
|
4259 |
+ m_EditorHideFlags: 0 |
|
4260 |
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} |
|
4261 |
+ m_Name: |
|
4262 |
+ m_EditorClassIdentifier: |
|
4263 |
+ m_Material: {fileID: 0} |
|
4264 |
+ m_Color: {r: 1, g: 1, b: 1, a: 1} |
|
4265 |
+ m_RaycastTarget: 0 |
|
4266 |
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} |
|
4267 |
+ m_Maskable: 1 |
|
4268 |
+ m_OnCullStateChanged: |
|
4269 |
+ m_PersistentCalls: |
|
4270 |
+ m_Calls: [] |
|
4271 |
+ m_text: "\uD0DC\uADF9 1\uC7A5" |
|
4272 |
+ m_isRightToLeft: 0 |
|
4273 |
+ m_fontAsset: {fileID: 11400000, guid: dbde3ec474936cd4c8ec331379d16e94, type: 2} |
|
4274 |
+ m_sharedMaterial: {fileID: 3420232619700612365, guid: dbde3ec474936cd4c8ec331379d16e94, |
|
4275 |
+ type: 2} |
|
4276 |
+ m_fontSharedMaterials: [] |
|
4277 |
+ m_fontMaterial: {fileID: 0} |
|
4278 |
+ m_fontMaterials: [] |
|
4279 |
+ m_fontColor32: |
|
4280 |
+ serializedVersion: 2 |
|
4281 |
+ rgba: 4294468864 |
|
4282 |
+ m_fontColor: {r: 0, g: 0.39607847, b: 0.9725491, a: 1} |
|
4283 |
+ m_enableVertexGradient: 0 |
|
4284 |
+ m_colorMode: 3 |
|
4285 |
+ m_fontColorGradient: |
|
4286 |
+ topLeft: {r: 1, g: 1, b: 1, a: 1} |
|
4287 |
+ topRight: {r: 1, g: 1, b: 1, a: 1} |
|
4288 |
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1} |
|
4289 |
+ bottomRight: {r: 1, g: 1, b: 1, a: 1} |
|
4290 |
+ m_fontColorGradientPreset: {fileID: 0} |
|
4291 |
+ m_spriteAsset: {fileID: 0} |
|
4292 |
+ m_tintAllSprites: 0 |
|
4293 |
+ m_StyleSheet: {fileID: 0} |
|
4294 |
+ m_TextStyleHashCode: -1183493901 |
|
4295 |
+ m_overrideHtmlColors: 0 |
|
4296 |
+ m_faceColor: |
|
4297 |
+ serializedVersion: 2 |
|
4298 |
+ rgba: 4294967295 |
|
4299 |
+ m_fontSize: 6.5 |
|
4300 |
+ m_fontSizeBase: 6.5 |
|
4301 |
+ m_fontWeight: 400 |
|
4302 |
+ m_enableAutoSizing: 0 |
|
4303 |
+ m_fontSizeMin: 18 |
|
4304 |
+ m_fontSizeMax: 72 |
|
4305 |
+ m_fontStyle: 0 |
|
4306 |
+ m_HorizontalAlignment: 2 |
|
4307 |
+ m_VerticalAlignment: 512 |
|
4308 |
+ m_textAlignment: 65535 |
|
4309 |
+ m_characterSpacing: 0 |
|
4310 |
+ m_wordSpacing: 0 |
|
4311 |
+ m_lineSpacing: 0 |
|
4312 |
+ m_lineSpacingMax: 0 |
|
4313 |
+ m_paragraphSpacing: 0 |
|
4314 |
+ m_charWidthMaxAdj: 0 |
|
4315 |
+ m_enableWordWrapping: 1 |
|
4316 |
+ m_wordWrappingRatios: 0.4 |
|
4317 |
+ m_overflowMode: 0 |
|
4318 |
+ m_linkedTextComponent: {fileID: 0} |
|
4319 |
+ parentLinkedComponent: {fileID: 0} |
|
4320 |
+ m_enableKerning: 1 |
|
4321 |
+ m_enableExtraPadding: 0 |
|
4322 |
+ checkPaddingRequired: 0 |
|
4323 |
+ m_isRichText: 1 |
|
4324 |
+ m_parseCtrlCharacters: 1 |
|
4325 |
+ m_isOrthographic: 1 |
|
4326 |
+ m_isCullingEnabled: 0 |
|
4327 |
+ m_horizontalMapping: 0 |
|
4328 |
+ m_verticalMapping: 0 |
|
4329 |
+ m_uvLineOffset: 0 |
|
4330 |
+ m_geometrySortingOrder: 0 |
|
4331 |
+ m_IsTextObjectScaleStatic: 0 |
|
4332 |
+ m_VertexBufferAutoSizeReduction: 0 |
|
4333 |
+ m_useMaxVisibleDescender: 1 |
|
4334 |
+ m_pageToDisplay: 1 |
|
4335 |
+ m_margin: {x: 0, y: 0, z: 0, w: 0} |
|
4336 |
+ m_isUsingLegacyAnimationComponent: 0 |
|
4337 |
+ m_isVolumetricText: 0 |
|
4338 |
+ m_hasFontAssetChanged: 0 |
|
4339 |
+ m_baseMaterial: {fileID: 0} |
|
4340 |
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0} |
|
4146 | 4341 |
--- !u!1 &4500695146288802483 |
4147 | 4342 |
GameObject: |
4148 | 4343 |
m_ObjectHideFlags: 0 |
... | ... | @@ -4811,7 +5006,8 @@ |
4811 | 5006 |
m_EditorClassIdentifier: |
4812 | 5007 |
poseManager: {fileID: 0} |
4813 | 5008 |
sliderPlay: {fileID: 0} |
4814 |
- userPoseTxt: {fileID: 0} |
|
5009 |
+ nowProgramInfoTxt: {fileID: 0} |
|
5010 |
+ nowAnimInfoTxt: {fileID: 0} |
|
4815 | 5011 |
animTimeTxt: {fileID: 3105393116448346129} |
4816 | 5012 |
sliderFill: {fileID: 0} |
4817 | 5013 |
inputPoseModel: {fileID: 0} |
... | ... | @@ -4989,6 +5185,45 @@ |
4989 | 5185 |
m_FillOrigin: 0 |
4990 | 5186 |
m_UseSpriteMesh: 0 |
4991 | 5187 |
m_PixelsPerUnitMultiplier: 1 |
5188 |
+--- !u!1 &5610279463895800260 |
|
5189 |
+GameObject: |
|
5190 |
+ m_ObjectHideFlags: 0 |
|
5191 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
5192 |
+ m_PrefabInstance: {fileID: 0} |
|
5193 |
+ m_PrefabAsset: {fileID: 0} |
|
5194 |
+ serializedVersion: 6 |
|
5195 |
+ m_Component: |
|
5196 |
+ - component: {fileID: 4917089996595784714} |
|
5197 |
+ m_Layer: 5 |
|
5198 |
+ m_Name: NowInfoObj |
|
5199 |
+ m_TagString: Untagged |
|
5200 |
+ m_Icon: {fileID: 0} |
|
5201 |
+ m_NavMeshLayer: 0 |
|
5202 |
+ m_StaticEditorFlags: 0 |
|
5203 |
+ m_IsActive: 1 |
|
5204 |
+--- !u!224 &4917089996595784714 |
|
5205 |
+RectTransform: |
|
5206 |
+ m_ObjectHideFlags: 0 |
|
5207 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
5208 |
+ m_PrefabInstance: {fileID: 0} |
|
5209 |
+ m_PrefabAsset: {fileID: 0} |
|
5210 |
+ m_GameObject: {fileID: 5610279463895800260} |
|
5211 |
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} |
|
5212 |
+ m_LocalPosition: {x: 0, y: 0, z: 0} |
|
5213 |
+ m_LocalScale: {x: 1, y: 1, z: 1} |
|
5214 |
+ m_ConstrainProportionsScale: 0 |
|
5215 |
+ m_Children: |
|
5216 |
+ - {fileID: 1349778383421094027} |
|
5217 |
+ - {fileID: 104951364572014884} |
|
5218 |
+ - {fileID: 5352970928991637589} |
|
5219 |
+ - {fileID: 4783819721224876288} |
|
5220 |
+ m_Father: {fileID: 2728409903476339175} |
|
5221 |
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
|
5222 |
+ m_AnchorMin: {x: 0.5, y: 0.5} |
|
5223 |
+ m_AnchorMax: {x: 0.5, y: 0.5} |
|
5224 |
+ m_AnchoredPosition: {x: -170, y: 20} |
|
5225 |
+ m_SizeDelta: {x: 80, y: 14} |
|
5226 |
+ m_Pivot: {x: 0, y: 0.5} |
|
4992 | 5227 |
--- !u!1 &5627703287335153228 |
4993 | 5228 |
GameObject: |
4994 | 5229 |
m_ObjectHideFlags: 0 |
... | ... | @@ -5098,8 +5333,8 @@ |
5098 | 5333 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
5099 | 5334 |
m_AnchorMin: {x: 0.5, y: 1} |
5100 | 5335 |
m_AnchorMax: {x: 0.5, y: 1} |
5101 |
- m_AnchoredPosition: {x: 0, y: -15} |
|
5102 |
- m_SizeDelta: {x: 30, y: 30} |
|
5336 |
+ m_AnchoredPosition: {x: 0, y: -17.8} |
|
5337 |
+ m_SizeDelta: {x: 32, y: 40} |
|
5103 | 5338 |
m_Pivot: {x: 0.5, y: 0.5} |
5104 | 5339 |
--- !u!222 &2525803387713127235 |
5105 | 5340 |
CanvasRenderer: |
... | ... | @@ -6043,6 +6278,96 @@ |
6043 | 6278 |
m_OnClick: |
6044 | 6279 |
m_PersistentCalls: |
6045 | 6280 |
m_Calls: [] |
6281 |
+--- !u!1 &6745237133140040120 |
|
6282 |
+GameObject: |
|
6283 |
+ m_ObjectHideFlags: 0 |
|
6284 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
6285 |
+ m_PrefabInstance: {fileID: 0} |
|
6286 |
+ m_PrefabAsset: {fileID: 0} |
|
6287 |
+ serializedVersion: 6 |
|
6288 |
+ m_Component: |
|
6289 |
+ - component: {fileID: 1349778383421094027} |
|
6290 |
+ - component: {fileID: 5720289317562550110} |
|
6291 |
+ - component: {fileID: 8662533178791816042} |
|
6292 |
+ - component: {fileID: 3768159483173687869} |
|
6293 |
+ m_Layer: 5 |
|
6294 |
+ m_Name: Shadow |
|
6295 |
+ m_TagString: Untagged |
|
6296 |
+ m_Icon: {fileID: 0} |
|
6297 |
+ m_NavMeshLayer: 0 |
|
6298 |
+ m_StaticEditorFlags: 0 |
|
6299 |
+ m_IsActive: 1 |
|
6300 |
+--- !u!224 &1349778383421094027 |
|
6301 |
+RectTransform: |
|
6302 |
+ m_ObjectHideFlags: 0 |
|
6303 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
6304 |
+ m_PrefabInstance: {fileID: 0} |
|
6305 |
+ m_PrefabAsset: {fileID: 0} |
|
6306 |
+ m_GameObject: {fileID: 6745237133140040120} |
|
6307 |
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} |
|
6308 |
+ m_LocalPosition: {x: 0, y: 0, z: 0} |
|
6309 |
+ m_LocalScale: {x: 1, y: 1, z: 1} |
|
6310 |
+ m_ConstrainProportionsScale: 0 |
|
6311 |
+ m_Children: [] |
|
6312 |
+ m_Father: {fileID: 4917089996595784714} |
|
6313 |
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
|
6314 |
+ m_AnchorMin: {x: 0, y: 0} |
|
6315 |
+ m_AnchorMax: {x: 1, y: 1} |
|
6316 |
+ m_AnchoredPosition: {x: 1, y: -1} |
|
6317 |
+ m_SizeDelta: {x: 0, y: 0} |
|
6318 |
+ m_Pivot: {x: 0.5, y: 0.5} |
|
6319 |
+--- !u!222 &5720289317562550110 |
|
6320 |
+CanvasRenderer: |
|
6321 |
+ m_ObjectHideFlags: 0 |
|
6322 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
6323 |
+ m_PrefabInstance: {fileID: 0} |
|
6324 |
+ m_PrefabAsset: {fileID: 0} |
|
6325 |
+ m_GameObject: {fileID: 6745237133140040120} |
|
6326 |
+ m_CullTransparentMesh: 1 |
|
6327 |
+--- !u!114 &8662533178791816042 |
|
6328 |
+MonoBehaviour: |
|
6329 |
+ m_ObjectHideFlags: 0 |
|
6330 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
6331 |
+ m_PrefabInstance: {fileID: 0} |
|
6332 |
+ m_PrefabAsset: {fileID: 0} |
|
6333 |
+ m_GameObject: {fileID: 6745237133140040120} |
|
6334 |
+ m_Enabled: 1 |
|
6335 |
+ m_EditorHideFlags: 0 |
|
6336 |
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} |
|
6337 |
+ m_Name: |
|
6338 |
+ m_EditorClassIdentifier: |
|
6339 |
+ m_Material: {fileID: 0} |
|
6340 |
+ m_Color: {r: 0, g: 0, b: 0, a: 0.78431374} |
|
6341 |
+ m_RaycastTarget: 1 |
|
6342 |
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} |
|
6343 |
+ m_Maskable: 1 |
|
6344 |
+ m_OnCullStateChanged: |
|
6345 |
+ m_PersistentCalls: |
|
6346 |
+ m_Calls: [] |
|
6347 |
+ m_Sprite: {fileID: 0} |
|
6348 |
+ m_Type: 0 |
|
6349 |
+ m_PreserveAspect: 0 |
|
6350 |
+ m_FillCenter: 1 |
|
6351 |
+ m_FillMethod: 4 |
|
6352 |
+ m_FillAmount: 1 |
|
6353 |
+ m_FillClockwise: 1 |
|
6354 |
+ m_FillOrigin: 0 |
|
6355 |
+ m_UseSpriteMesh: 0 |
|
6356 |
+ m_PixelsPerUnitMultiplier: 1 |
|
6357 |
+--- !u!114 &3768159483173687869 |
|
6358 |
+MonoBehaviour: |
|
6359 |
+ m_ObjectHideFlags: 0 |
|
6360 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
6361 |
+ m_PrefabInstance: {fileID: 0} |
|
6362 |
+ m_PrefabAsset: {fileID: 0} |
|
6363 |
+ m_GameObject: {fileID: 6745237133140040120} |
|
6364 |
+ m_Enabled: 1 |
|
6365 |
+ m_EditorHideFlags: 0 |
|
6366 |
+ m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} |
|
6367 |
+ m_Name: |
|
6368 |
+ m_EditorClassIdentifier: |
|
6369 |
+ radius: 4 |
|
6370 |
+ image: {fileID: 8662533178791816042} |
|
6046 | 6371 |
--- !u!1 &6780258972347021901 |
6047 | 6372 |
GameObject: |
6048 | 6373 |
m_ObjectHideFlags: 0 |
... | ... | @@ -6320,7 +6645,7 @@ |
6320 | 6645 |
m_Icon: {fileID: 0} |
6321 | 6646 |
m_NavMeshLayer: 0 |
6322 | 6647 |
m_StaticEditorFlags: 0 |
6323 |
- m_IsActive: 1 |
|
6648 |
+ m_IsActive: 0 |
|
6324 | 6649 |
--- !u!224 &1424335134405278369 |
6325 | 6650 |
RectTransform: |
6326 | 6651 |
m_ObjectHideFlags: 0 |
... | ... | @@ -6465,7 +6790,7 @@ |
6465 | 6790 |
- component: {fileID: 938112955608218044} |
6466 | 6791 |
- component: {fileID: 4639534222575486762} |
6467 | 6792 |
m_Layer: 5 |
6468 |
- m_Name: NowInfoTxt |
|
6793 |
+ m_Name: NowProgramInfoTxt |
|
6469 | 6794 |
m_TagString: Untagged |
6470 | 6795 |
m_Icon: {fileID: 0} |
6471 | 6796 |
m_NavMeshLayer: 0 |
... | ... | @@ -6478,17 +6803,17 @@ |
6478 | 6803 |
m_PrefabInstance: {fileID: 0} |
6479 | 6804 |
m_PrefabAsset: {fileID: 0} |
6480 | 6805 |
m_GameObject: {fileID: 7892395535591131096} |
6481 |
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} |
|
6806 |
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} |
|
6482 | 6807 |
m_LocalPosition: {x: 0, y: 0, z: -2} |
6483 | 6808 |
m_LocalScale: {x: 1, y: 1, z: 1} |
6484 | 6809 |
m_ConstrainProportionsScale: 0 |
6485 | 6810 |
m_Children: [] |
6486 |
- m_Father: {fileID: 2728409903476339175} |
|
6811 |
+ m_Father: {fileID: 4917089996595784714} |
|
6487 | 6812 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
6488 | 6813 |
m_AnchorMin: {x: 0, y: 0.5} |
6489 | 6814 |
m_AnchorMax: {x: 1, y: 0.5} |
6490 |
- m_AnchoredPosition: {x: -122.5, y: 15.4} |
|
6491 |
- m_SizeDelta: {x: -255, y: 15} |
|
6815 |
+ m_AnchoredPosition: {x: -20, y: 0} |
|
6816 |
+ m_SizeDelta: {x: -40, y: 14} |
|
6492 | 6817 |
m_Pivot: {x: 0.5, y: 0.5} |
6493 | 6818 |
--- !u!222 &938112955608218044 |
6494 | 6819 |
CanvasRenderer: |
... | ... | @@ -6518,7 +6843,7 @@ |
6518 | 6843 |
m_OnCullStateChanged: |
6519 | 6844 |
m_PersistentCalls: |
6520 | 6845 |
m_Calls: [] |
6521 |
- m_text: "\uB3D9\uC791 \uD3C9\uAC00 \uC911 : \uD0DC\uADF9 1\uC7A5" |
|
6846 |
+ m_text: "\uB3D9\uC791 \uD3C9\uAC00 \uC911" |
|
6522 | 6847 |
m_isRightToLeft: 0 |
6523 | 6848 |
m_fontAsset: {fileID: 11400000, guid: dbde3ec474936cd4c8ec331379d16e94, type: 2} |
6524 | 6849 |
m_sharedMaterial: {fileID: 3420232619700612365, guid: dbde3ec474936cd4c8ec331379d16e94, |
... | ... | @@ -6546,14 +6871,14 @@ |
6546 | 6871 |
m_faceColor: |
6547 | 6872 |
serializedVersion: 2 |
6548 | 6873 |
rgba: 4294967295 |
6549 |
- m_fontSize: 8 |
|
6550 |
- m_fontSizeBase: 8 |
|
6874 |
+ m_fontSize: 6 |
|
6875 |
+ m_fontSizeBase: 6 |
|
6551 | 6876 |
m_fontWeight: 400 |
6552 | 6877 |
m_enableAutoSizing: 0 |
6553 | 6878 |
m_fontSizeMin: 18 |
6554 | 6879 |
m_fontSizeMax: 72 |
6555 | 6880 |
m_fontStyle: 0 |
6556 |
- m_HorizontalAlignment: 1 |
|
6881 |
+ m_HorizontalAlignment: 2 |
|
6557 | 6882 |
m_VerticalAlignment: 512 |
6558 | 6883 |
m_textAlignment: 65535 |
6559 | 6884 |
m_characterSpacing: 0 |
... | ... | @@ -7095,7 +7420,7 @@ |
7095 | 7420 |
m_ConstrainProportionsScale: 0 |
7096 | 7421 |
m_Children: |
7097 | 7422 |
- {fileID: 790506508802322709} |
7098 |
- - {fileID: 5352970928991637589} |
|
7423 |
+ - {fileID: 4917089996595784714} |
|
7099 | 7424 |
- {fileID: 3472798280564867737} |
7100 | 7425 |
- {fileID: 1446359268715761088} |
7101 | 7426 |
- {fileID: 5781291789219915483} |
--- VRTK/Assets/BNG Framework/Input/VRIF Default Input Actions.inputactions
+++ VRTK/Assets/BNG Framework/Input/VRIF Default Input Actions.inputactions
... | ... | @@ -241,6 +241,15 @@ |
241 | 241 |
"processors": "", |
242 | 242 |
"interactions": "", |
243 | 243 |
"initialStateCheck": false |
244 |
+ }, |
|
245 |
+ { |
|
246 |
+ "name": "Explan", |
|
247 |
+ "type": "Button", |
|
248 |
+ "id": "ccbf5a7b-da4b-467f-b15a-dec0b01645f9", |
|
249 |
+ "expectedControlType": "Button", |
|
250 |
+ "processors": "", |
|
251 |
+ "interactions": "", |
|
252 |
+ "initialStateCheck": false |
|
244 | 253 |
} |
245 | 254 |
], |
246 | 255 |
"bindings": [ |
... | ... | @@ -738,6 +747,17 @@ |
738 | 747 |
"action": "MenuStart", |
739 | 748 |
"isComposite": false, |
740 | 749 |
"isPartOfComposite": false |
750 |
+ }, |
|
751 |
+ { |
|
752 |
+ "name": "", |
|
753 |
+ "id": "baab9898-2021-429c-9055-d5a74a48d091", |
|
754 |
+ "path": "<XRController>{LeftHand}/{Primary2DAxisClick}", |
|
755 |
+ "interactions": "", |
|
756 |
+ "processors": "", |
|
757 |
+ "groups": "", |
|
758 |
+ "action": "Explan", |
|
759 |
+ "isComposite": false, |
|
760 |
+ "isPartOfComposite": false |
|
741 | 761 |
} |
742 | 762 |
] |
743 | 763 |
}, |
+++ VRTK/Assets/Plugins/Android/AndroidManifest.xml
... | ... | @@ -0,0 +1,19 @@ |
1 | +<?xml version="1.0" encoding="utf-8" standalone="no"?> | |
2 | +<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:installLocation="auto"> | |
3 | + <application android:label="@string/app_name" android:icon="@mipmap/app_icon" android:allowBackup="false"> | |
4 | + <activity android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen" android:configChanges="locale|fontScale|keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode" android:launchMode="singleTask" android:name="com.unity3d.player.UnityPlayerActivity" android:excludeFromRecents="true" android:exported="true"> | |
5 | + <intent-filter> | |
6 | + <action android:name="android.intent.action.MAIN" /> | |
7 | + <category android:name="android.intent.category.LAUNCHER" /> | |
8 | + <category android:name="com.oculus.intent.category.VR" /> | |
9 | + </intent-filter> | |
10 | + <meta-data android:name="com.oculus.vr.focusaware" android:value="true" /> | |
11 | + </activity> | |
12 | + <meta-data android:name="unityplayer.SkipPermissionsDialog" android:value="false" /> | |
13 | + <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only" /> | |
14 | + <meta-data android:name="com.oculus.ossplash.background" android:value="black" /> | |
15 | + <meta-data android:name="com.oculus.supportedDevices" android:value="quest2|questpro|eureka" /> | |
16 | + </application> | |
17 | + <uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" /> | |
18 | + <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> | |
19 | +</manifest>(파일 끝에 줄바꿈 문자 없음) |
--- VRTK/Assets/Plugins/Android/AndroidManifest.xml.DISABLED
+++ VRTK/Assets/Plugins/Android/AndroidManifest.xml.DISABLED
... | ... | @@ -1,4 +1,4 @@ |
1 |
-<?xml version="1.0" encoding="utf-8" standalone="no"?> |
|
1 |
+<?xml version="1.0" encoding="utf-8" standalone="no"?> |
|
2 | 2 |
<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:installLocation="auto"> |
3 | 3 |
<application android:label="@string/app_name" android:icon="@mipmap/app_icon" android:allowBackup="false"> |
4 | 4 |
<activity android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen" android:configChanges="locale|fontScale|keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode" android:launchMode="singleTask" android:name="com.unity3d.player.UnityPlayerActivity" android:excludeFromRecents="true" android:exported="true"> |
... | ... | @@ -15,4 +15,7 @@ |
15 | 15 |
<meta-data android:name="com.oculus.supportedDevices" android:value="quest|quest2|questpro" /> |
16 | 16 |
</application> |
17 | 17 |
<uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" /> |
18 |
+ <uses-permission android:name="android.permission.RECORD_AUDIO" tools:node="remove"/> |
|
19 |
+ <uses-permission android:name="android.permission.MODIFI_AUDIO_Settings" tools:node="remove"/> |
|
20 |
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> |
|
18 | 21 |
</manifest>(파일 끝에 줄바꿈 문자 없음) |
+++ VRTK/Assets/Plugins/Android/AndroidManifest.xml.meta
... | ... | @@ -0,0 +1,7 @@ |
1 | +fileFormatVersion: 2 | |
2 | +guid: 77b0ab4faf2212446b81895b919677a0 | |
3 | +TextScriptImporter: | |
4 | + externalObjects: {} | |
5 | + userData: | |
6 | + assetBundleName: | |
7 | + assetBundleVariant: |
--- VRTK/Assets/VRRes/Atlas/VRSpriteAtlas.spriteatlas
+++ VRTK/Assets/VRRes/Atlas/VRSpriteAtlas.spriteatlas
... | ... | @@ -44,14 +44,273 @@ |
44 | 44 |
enableAlphaDilation: 0 |
45 | 45 |
secondaryTextureSettings: {} |
46 | 46 |
variantMultiplier: 1 |
47 |
- packables: [] |
|
47 |
+ packables: |
|
48 |
+ - {fileID: 102900000, guid: b3b4286fa7666c84caea1a5d7b544552, type: 3} |
|
48 | 49 |
bindAsDefault: 1 |
49 | 50 |
isAtlasV2: 0 |
50 | 51 |
cachedData: {fileID: 0} |
51 |
- packedSpriteRenderDataKeys: [] |
|
52 |
+ packedSpriteRenderDataKeys: |
|
53 |
+ - 3a2880205a643274c8c536987d6b50f7: 21300000 |
|
54 |
+ - 2e1f176096a5b2e41ac5d7b9791c9410: 21300000 |
|
55 |
+ - ce66bd6089d521f4e9c3207964cd4041: 21300000 |
|
56 |
+ - a0fe43a07dba77c4d8b7d7d14c673710: 21300000 |
|
57 |
+ - b987bad09854ddd4383563bf8291ac7e: 21300000 |
|
58 |
+ - ab061121b5ed8fe4495b55462f51ec0e: 1595832350 |
|
59 |
+ - 868574b16cf112948aecfb6651ae8a89: 21300000 |
|
60 |
+ - a096fbc14ad4b5c45a6f729a7fde1dd9: 21300000 |
|
61 |
+ - 37e65bd189966674aa6cac1b4f8b87b0: 21300000 |
|
62 |
+ - fc2a8702bc453964eaa5cda1d27e6650: 21300000 |
|
63 |
+ - 784671128da8be74e87cfd039a68c197: 21300000 |
|
64 |
+ - 81980932464735344a073da2fbfd7710: 21300000 |
|
65 |
+ - ac0a5ea264ff89749af6b9ebd820ed3b: 21300000 |
|
66 |
+ - e2c477b216bcdf549a39cb2e95674504: 21300000 |
|
67 |
+ - b335c9e22ebf13340bcd5c406dae4240: 21300000 |
|
68 |
+ - 6bd9f8f261f1c9c4789f73d97499ba0d: 21300000 |
|
69 |
+ - 2a8772130a6398746ad7dadd93653cd6: 21300000 |
|
70 |
+ - 9887c2632d8e9854bb28a2bb8dbc80dc: 21300000 |
|
71 |
+ - c3631b739f9608548860b5d0cbdfbfb1: 21300000 |
|
72 |
+ - b8e7e6937f8996042ac331b255967ba4: 21300000 |
|
73 |
+ - 603cdcb38f19e0542ba6fc6bddffd2af: 21300000 |
|
74 |
+ - ba7263048090e994785b0c679af1b380: 21300000 |
|
75 |
+ - 00e8b3244dd79574aaaaf66caa752e3b: 21300000 |
|
76 |
+ - 5677c3a4013b14d4a9c15f0be01e91ac: 21300000 |
|
77 |
+ - 8f59ceb4669bfff43ac7671f162eea5d: 21300000 |
|
78 |
+ - 59578815a2cafeb419968d3d06606ac1: 21300000 |
|
79 |
+ - 992e034573db2f542abce1b852f04941: 21300000 |
|
80 |
+ - 0436c4f5601f7b143af5e12b695000ff: 21300000 |
|
81 |
+ - 172ee706019d2a240bc591e4e9afe252: 21300000 |
|
82 |
+ - c1022a065a2b2c24e80ac4d60e650894: 21300000 |
|
83 |
+ - 1885c726dda819a44a79a968bb739ea4: 21300000 |
|
84 |
+ - d7891e364602248408e9af5c2ffe3eb6: 21300000 |
|
85 |
+ - 14f1ab569eac81d49af4eef42e7b996b: 21300000 |
|
86 |
+ - f3bb9d86b5bf33b46899e2c33a29bb19: 21300000 |
|
87 |
+ - eb38def641ba2bb4ca0db74959523579: 21300000 |
|
88 |
+ - a8e3d7279e2230c4db0cb4e56f2e0acb: 21300000 |
|
89 |
+ - 39f6a84754d63924eb6feb72a3a76ac2: 21300000 |
|
90 |
+ - 31fbd9578c80c2f4f8e069d72fb08e88: 21300000 |
|
91 |
+ - d77073771d5dff1469aada9465594f0a: 21300000 |
|
92 |
+ - e087f1c773c8d5b46abe1dc946d45bbb: 21300000 |
|
93 |
+ - 0ac738282878559498cd222173a65821: 21300000 |
|
94 |
+ - 3a08ce38985bd3a44a9cf9ea7a357644: 21300000 |
|
95 |
+ - 330eba6891f5fba42b5efa55ac75180b: 21300000 |
|
96 |
+ - 0ae09d68ad9a03047b1930e759b76ea0: 21300000 |
|
97 |
+ - 11bc4c8845c553544b64f535ad663458: 21300000 |
|
98 |
+ - 839bba39f4d53914799aed19adf9653a: 21300000 |
|
99 |
+ - 55ea29593ca52d042a792e2194e0ab98: 21300000 |
|
100 |
+ - 002b8a995e9c5bc4b847a9e565925d75: 21300000 |
|
101 |
+ - f5d0b4b929ac0194e8b848b93de5d2d5: 21300000 |
|
102 |
+ - 2c50d3c954f041d4e8d16a38d135404c: 21300000 |
|
103 |
+ - fe61c32aa02506a46b59646deb9d71c7: 21300000 |
|
104 |
+ - bb078a3a41dd8a3419c1f54ae8b94682: 21300000 |
|
105 |
+ - 39b6724a750d69649ae204e9cbb510b4: 21300000 |
|
106 |
+ - dad3bf4aff6428848b40cf8f0ef27c1a: 21300000 |
|
107 |
+ - e520637aa7a468849b65d3a4be933a50: 21300000 |
|
108 |
+ - faafb68a220259a45b460b790c406993: 21300000 |
|
109 |
+ - 47d4a4aa90facda4192af25eeb223911: 21300000 |
|
110 |
+ - 7b9314dab54308243a809baa47b1dec8: 21300000 |
|
111 |
+ - 52804bea393e6054d81c99eaef349f35: 21300000 |
|
112 |
+ - 681baf0bb84178a428b5ab348d3f661f: 21300000 |
|
113 |
+ - e53d663be1ce7dc4097d93a2604eb1da: 21300000 |
|
114 |
+ - 51fa387b5689c9d46aa3073685104c7f: 21300000 |
|
115 |
+ - bd2c4c8b7be5bef4494649f92a18dedd: 21300000 |
|
116 |
+ - 0b060fab57bfa8749a7ebc13c2e2aa79: 21300000 |
|
117 |
+ - c5d169cbe06d42641a8d35920b1c79ba: 1381294662 |
|
118 |
+ - 780d95eb6a95ace458d8a8402aa4cd31: 21300000 |
|
119 |
+ - dd6bff1cecddb8c45a0795eeb802cf86: 21300000 |
|
120 |
+ - ac276b7cab7b2644eb6c058b721ebb4f: 21300000 |
|
121 |
+ - a6dba48c4e4187847b6b04c7f3f758ed: 21300000 |
|
122 |
+ - 1338e89cf14f01a4d929fc9fa8719bd7: 21300000 |
|
123 |
+ - 0956ddbc4100339429904958e71e83b9: 21300000 |
|
124 |
+ - d53fb38db547e364aa0fc081fbd6ffd2: 21300000 |
|
125 |
+ - 53e972bdf7ea07944bcc3d8df0d00377: 2052842539 |
|
126 |
+ - 775ebadd770b1e0478b976f0f2ef259c: 21300000 |
|
127 |
+ - b408913e7cf814247b8f8cdb1972bcbd: 21300000 |
|
128 |
+ - 9485e56edc803d04f90e3aa30414e6ec: 21300000 |
|
129 |
+ - 629674ae1c280da40be60da9d2ad2e50: 21300000 |
|
130 |
+ - c7bc41beee388f244beb6a170884708c: 21300000 |
|
131 |
+ - dc4fe6ce3a44c0f479be0c054079af78: 21300000 |
|
132 |
+ - 980b17de2c47d1444adfaa624c954308: 21300000 |
|
133 |
+ - 9878651f1ce43b6438a1c2747a10a322: 21300000 |
|
134 |
+ - df67592fbf79cb34dbbbbb8150a26e39: 21300000 |
|
135 |
+ - 1470ac2f4a1ed6c41b824fc5c96f2fd8: 21300000 |
|
136 |
+ - 72ad6a5f74c2d2b458f2bf1826c71fc4: 21300000 |
|
137 |
+ - 4aef3e5f541134a4e85788645c3eebfe: 21300000 |
|
138 |
+ - 52b1dacf85a60394cbf70dfa4c6c6f7d: 21300000 |
|
52 | 139 |
m_MasterAtlas: {fileID: 0} |
53 |
- m_PackedSprites: [] |
|
54 |
- m_PackedSpriteNamesToIndex: [] |
|
140 |
+ m_PackedSprites: |
|
141 |
+ - {fileID: 21300000, guid: 3a2880205a643274c8c536987d6b50f7, type: 3} |
|
142 |
+ - {fileID: 21300000, guid: 2e1f176096a5b2e41ac5d7b9791c9410, type: 3} |
|
143 |
+ - {fileID: 21300000, guid: ce66bd6089d521f4e9c3207964cd4041, type: 3} |
|
144 |
+ - {fileID: 21300000, guid: a0fe43a07dba77c4d8b7d7d14c673710, type: 3} |
|
145 |
+ - {fileID: 21300000, guid: b987bad09854ddd4383563bf8291ac7e, type: 3} |
|
146 |
+ - {fileID: 1595832350, guid: ab061121b5ed8fe4495b55462f51ec0e, type: 3} |
|
147 |
+ - {fileID: 21300000, guid: 868574b16cf112948aecfb6651ae8a89, type: 3} |
|
148 |
+ - {fileID: 21300000, guid: a096fbc14ad4b5c45a6f729a7fde1dd9, type: 3} |
|
149 |
+ - {fileID: 21300000, guid: 37e65bd189966674aa6cac1b4f8b87b0, type: 3} |
|
150 |
+ - {fileID: 21300000, guid: fc2a8702bc453964eaa5cda1d27e6650, type: 3} |
|
151 |
+ - {fileID: 21300000, guid: 784671128da8be74e87cfd039a68c197, type: 3} |
|
152 |
+ - {fileID: 21300000, guid: 81980932464735344a073da2fbfd7710, type: 3} |
|
153 |
+ - {fileID: 21300000, guid: ac0a5ea264ff89749af6b9ebd820ed3b, type: 3} |
|
154 |
+ - {fileID: 21300000, guid: e2c477b216bcdf549a39cb2e95674504, type: 3} |
|
155 |
+ - {fileID: 21300000, guid: b335c9e22ebf13340bcd5c406dae4240, type: 3} |
|
156 |
+ - {fileID: 21300000, guid: 6bd9f8f261f1c9c4789f73d97499ba0d, type: 3} |
|
157 |
+ - {fileID: 21300000, guid: 2a8772130a6398746ad7dadd93653cd6, type: 3} |
|
158 |
+ - {fileID: 21300000, guid: 9887c2632d8e9854bb28a2bb8dbc80dc, type: 3} |
|
159 |
+ - {fileID: 21300000, guid: c3631b739f9608548860b5d0cbdfbfb1, type: 3} |
|
160 |
+ - {fileID: 21300000, guid: b8e7e6937f8996042ac331b255967ba4, type: 3} |
|
161 |
+ - {fileID: 21300000, guid: 603cdcb38f19e0542ba6fc6bddffd2af, type: 3} |
|
162 |
+ - {fileID: 21300000, guid: ba7263048090e994785b0c679af1b380, type: 3} |
|
163 |
+ - {fileID: 21300000, guid: 00e8b3244dd79574aaaaf66caa752e3b, type: 3} |
|
164 |
+ - {fileID: 21300000, guid: 5677c3a4013b14d4a9c15f0be01e91ac, type: 3} |
|
165 |
+ - {fileID: 21300000, guid: 8f59ceb4669bfff43ac7671f162eea5d, type: 3} |
|
166 |
+ - {fileID: 21300000, guid: 59578815a2cafeb419968d3d06606ac1, type: 3} |
|
167 |
+ - {fileID: 21300000, guid: 992e034573db2f542abce1b852f04941, type: 3} |
|
168 |
+ - {fileID: 21300000, guid: 0436c4f5601f7b143af5e12b695000ff, type: 3} |
|
169 |
+ - {fileID: 21300000, guid: 172ee706019d2a240bc591e4e9afe252, type: 3} |
|
170 |
+ - {fileID: 21300000, guid: c1022a065a2b2c24e80ac4d60e650894, type: 3} |
|
171 |
+ - {fileID: 21300000, guid: 1885c726dda819a44a79a968bb739ea4, type: 3} |
|
172 |
+ - {fileID: 21300000, guid: d7891e364602248408e9af5c2ffe3eb6, type: 3} |
|
173 |
+ - {fileID: 21300000, guid: 14f1ab569eac81d49af4eef42e7b996b, type: 3} |
|
174 |
+ - {fileID: 21300000, guid: f3bb9d86b5bf33b46899e2c33a29bb19, type: 3} |
|
175 |
+ - {fileID: 21300000, guid: eb38def641ba2bb4ca0db74959523579, type: 3} |
|
176 |
+ - {fileID: 21300000, guid: a8e3d7279e2230c4db0cb4e56f2e0acb, type: 3} |
|
177 |
+ - {fileID: 21300000, guid: 39f6a84754d63924eb6feb72a3a76ac2, type: 3} |
|
178 |
+ - {fileID: 21300000, guid: 31fbd9578c80c2f4f8e069d72fb08e88, type: 3} |
|
179 |
+ - {fileID: 21300000, guid: d77073771d5dff1469aada9465594f0a, type: 3} |
|
180 |
+ - {fileID: 21300000, guid: e087f1c773c8d5b46abe1dc946d45bbb, type: 3} |
|
181 |
+ - {fileID: 21300000, guid: 0ac738282878559498cd222173a65821, type: 3} |
|
182 |
+ - {fileID: 21300000, guid: 3a08ce38985bd3a44a9cf9ea7a357644, type: 3} |
|
183 |
+ - {fileID: 21300000, guid: 330eba6891f5fba42b5efa55ac75180b, type: 3} |
|
184 |
+ - {fileID: 21300000, guid: 0ae09d68ad9a03047b1930e759b76ea0, type: 3} |
|
185 |
+ - {fileID: 21300000, guid: 11bc4c8845c553544b64f535ad663458, type: 3} |
|
186 |
+ - {fileID: 21300000, guid: 839bba39f4d53914799aed19adf9653a, type: 3} |
|
187 |
+ - {fileID: 21300000, guid: 55ea29593ca52d042a792e2194e0ab98, type: 3} |
|
188 |
+ - {fileID: 21300000, guid: 002b8a995e9c5bc4b847a9e565925d75, type: 3} |
|
189 |
+ - {fileID: 21300000, guid: f5d0b4b929ac0194e8b848b93de5d2d5, type: 3} |
|
190 |
+ - {fileID: 21300000, guid: 2c50d3c954f041d4e8d16a38d135404c, type: 3} |
|
191 |
+ - {fileID: 21300000, guid: fe61c32aa02506a46b59646deb9d71c7, type: 3} |
|
192 |
+ - {fileID: 21300000, guid: bb078a3a41dd8a3419c1f54ae8b94682, type: 3} |
|
193 |
+ - {fileID: 21300000, guid: 39b6724a750d69649ae204e9cbb510b4, type: 3} |
|
194 |
+ - {fileID: 21300000, guid: dad3bf4aff6428848b40cf8f0ef27c1a, type: 3} |
|
195 |
+ - {fileID: 21300000, guid: e520637aa7a468849b65d3a4be933a50, type: 3} |
|
196 |
+ - {fileID: 21300000, guid: faafb68a220259a45b460b790c406993, type: 3} |
|
197 |
+ - {fileID: 21300000, guid: 47d4a4aa90facda4192af25eeb223911, type: 3} |
|
198 |
+ - {fileID: 21300000, guid: 7b9314dab54308243a809baa47b1dec8, type: 3} |
|
199 |
+ - {fileID: 21300000, guid: 52804bea393e6054d81c99eaef349f35, type: 3} |
|
200 |
+ - {fileID: 21300000, guid: 681baf0bb84178a428b5ab348d3f661f, type: 3} |
|
201 |
+ - {fileID: 21300000, guid: e53d663be1ce7dc4097d93a2604eb1da, type: 3} |
|
202 |
+ - {fileID: 21300000, guid: 51fa387b5689c9d46aa3073685104c7f, type: 3} |
|
203 |
+ - {fileID: 21300000, guid: bd2c4c8b7be5bef4494649f92a18dedd, type: 3} |
|
204 |
+ - {fileID: 21300000, guid: 0b060fab57bfa8749a7ebc13c2e2aa79, type: 3} |
|
205 |
+ - {fileID: 1381294662, guid: c5d169cbe06d42641a8d35920b1c79ba, type: 3} |
|
206 |
+ - {fileID: 21300000, guid: 780d95eb6a95ace458d8a8402aa4cd31, type: 3} |
|
207 |
+ - {fileID: 21300000, guid: dd6bff1cecddb8c45a0795eeb802cf86, type: 3} |
|
208 |
+ - {fileID: 21300000, guid: ac276b7cab7b2644eb6c058b721ebb4f, type: 3} |
|
209 |
+ - {fileID: 21300000, guid: a6dba48c4e4187847b6b04c7f3f758ed, type: 3} |
|
210 |
+ - {fileID: 21300000, guid: 1338e89cf14f01a4d929fc9fa8719bd7, type: 3} |
|
211 |
+ - {fileID: 21300000, guid: 0956ddbc4100339429904958e71e83b9, type: 3} |
|
212 |
+ - {fileID: 21300000, guid: d53fb38db547e364aa0fc081fbd6ffd2, type: 3} |
|
213 |
+ - {fileID: 2052842539, guid: 53e972bdf7ea07944bcc3d8df0d00377, type: 3} |
|
214 |
+ - {fileID: 21300000, guid: 775ebadd770b1e0478b976f0f2ef259c, type: 3} |
|
215 |
+ - {fileID: 21300000, guid: b408913e7cf814247b8f8cdb1972bcbd, type: 3} |
|
216 |
+ - {fileID: 21300000, guid: 9485e56edc803d04f90e3aa30414e6ec, type: 3} |
|
217 |
+ - {fileID: 21300000, guid: 629674ae1c280da40be60da9d2ad2e50, type: 3} |
|
218 |
+ - {fileID: 21300000, guid: c7bc41beee388f244beb6a170884708c, type: 3} |
|
219 |
+ - {fileID: 21300000, guid: dc4fe6ce3a44c0f479be0c054079af78, type: 3} |
|
220 |
+ - {fileID: 21300000, guid: 980b17de2c47d1444adfaa624c954308, type: 3} |
|
221 |
+ - {fileID: 21300000, guid: 9878651f1ce43b6438a1c2747a10a322, type: 3} |
|
222 |
+ - {fileID: 21300000, guid: df67592fbf79cb34dbbbbb8150a26e39, type: 3} |
|
223 |
+ - {fileID: 21300000, guid: 1470ac2f4a1ed6c41b824fc5c96f2fd8, type: 3} |
|
224 |
+ - {fileID: 21300000, guid: 72ad6a5f74c2d2b458f2bf1826c71fc4, type: 3} |
|
225 |
+ - {fileID: 21300000, guid: 4aef3e5f541134a4e85788645c3eebfe, type: 3} |
|
226 |
+ - {fileID: 21300000, guid: 52b1dacf85a60394cbf70dfa4c6c6f7d, type: 3} |
|
227 |
+ m_PackedSpriteNamesToIndex: |
|
228 |
+ - Basic01 |
|
229 |
+ - Rectangle 5949 |
|
230 |
+ - Ellipse 775 |
|
231 |
+ - Ranking_guage2 |
|
232 |
+ - 16_setting |
|
233 |
+ - Home_icon_0 |
|
234 |
+ - Img_icon_open_lock |
|
235 |
+ - UIbottom |
|
236 |
+ - btn_dropbox |
|
237 |
+ - ribbon_sold out |
|
238 |
+ - UIbackimage4 |
|
239 |
+ - bell-plus |
|
240 |
+ - poomsae3 |
|
241 |
+ - SnowMountain |
|
242 |
+ - btn_buy |
|
243 |
+ - Coach2 |
|
244 |
+ - Coach3 |
|
245 |
+ - Rectangle 5947 |
|
246 |
+ - ribbon_Soldout |
|
247 |
+ - poomsae4 |
|
248 |
+ - UIbackimage3 |
|
249 |
+ - poomsae6 |
|
250 |
+ - ribbon_Event |
|
251 |
+ - Basic02 |
|
252 |
+ - ribbon_Sale |
|
253 |
+ - RankBg |
|
254 |
+ - AIevaluation |
|
255 |
+ - Icon_diamond |
|
256 |
+ - UIbackimage2 |
|
257 |
+ - Img_Icon_lock |
|
258 |
+ - Poomsae |
|
259 |
+ - coin_Big |
|
260 |
+ - Rectangle 5927 |
|
261 |
+ - Icon_arena_ticket |
|
262 |
+ - bell-minus |
|
263 |
+ - Round_Rect_UI |
|
264 |
+ - Icon_friend_point |
|
265 |
+ - tab_on |
|
266 |
+ - Exit_icon |
|
267 |
+ - Btn_next |
|
268 |
+ - coin_Middle |
|
269 |
+ - Basic03 |
|
270 |
+ - poomsae1 |
|
271 |
+ - UIbackimage |
|
272 |
+ - ranking_guage |
|
273 |
+ - coin_Small |
|
274 |
+ - Basic04 |
|
275 |
+ - logo |
|
276 |
+ - tkMap_Jpg |
|
277 |
+ - Metamotion_mainLogo |
|
278 |
+ - Coach4 |
|
279 |
+ - ribbon_new |
|
280 |
+ - Icon_arena_tier01 |
|
281 |
+ - Icon_arena_tier04 |
|
282 |
+ - TestModeImg |
|
283 |
+ - Img_unit_slot_checked |
|
284 |
+ - Icon_arena_tier03 |
|
285 |
+ - poomsae8 |
|
286 |
+ - Coach5 |
|
287 |
+ - UImetamotion |
|
288 |
+ - poomsae2 |
|
289 |
+ - tkMap |
|
290 |
+ - tab_off |
|
291 |
+ - coin_Huge |
|
292 |
+ - UIbackbuttonimage_0 |
|
293 |
+ - Coach1 |
|
294 |
+ - poomsae7 |
|
295 |
+ - Icon_arena_tier08 |
|
296 |
+ - Basic |
|
297 |
+ - TkUniform |
|
298 |
+ - Img_loading_circle |
|
299 |
+ - UIbackimage5 |
|
300 |
+ - tkTitle_0 |
|
301 |
+ - GuroGym |
|
302 |
+ - CheckModeImg |
|
303 |
+ - TKequipment |
|
304 |
+ - Ellipse 776 |
|
305 |
+ - ribbon_Best |
|
306 |
+ - Icon_arena_tier05 |
|
307 |
+ - Olympic |
|
308 |
+ - UIbackimage6 |
|
309 |
+ - Ellipse 779 |
|
310 |
+ - Icon_arena_tier02 |
|
311 |
+ - poomsae5 |
|
312 |
+ - belt |
|
313 |
+ - Icon_arena_tier07 |
|
55 | 314 |
m_RenderDataMap: {} |
56 | 315 |
m_Tag: VRSpriteAtlas |
57 | 316 |
m_IsVariant: 0 |
--- VRTK/Assets/VRRes/Font/ShadowNanumSquareB SDF.asset
+++ VRTK/Assets/VRRes/Font/ShadowNanumSquareB SDF.asset
This diff is too big to display. |
+++ VRTK/Assets/VRRes/MetaQuestTouchPlus/Materials/AlphaGlow.mat
... | ... | @@ -0,0 +1,137 @@ |
1 | +%YAML 1.1 | |
2 | +%TAG !u! tag:unity3d.com,2011: | |
3 | +--- !u!21 &2100000 | |
4 | +Material: | |
5 | + serializedVersion: 8 | |
6 | + m_ObjectHideFlags: 0 | |
7 | + m_CorrespondingSourceObject: {fileID: 0} | |
8 | + m_PrefabInstance: {fileID: 0} | |
9 | + m_PrefabAsset: {fileID: 0} | |
10 | + m_Name: AlphaGlow | |
11 | + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} | |
12 | + m_Parent: {fileID: 0} | |
13 | + m_ModifiedSerializedProperties: 0 | |
14 | + m_ValidKeywords: | |
15 | + - _ALPHAPREMULTIPLY_ON | |
16 | + - _SURFACE_TYPE_TRANSPARENT | |
17 | + m_InvalidKeywords: [] | |
18 | + m_LightmapFlags: 4 | |
19 | + m_EnableInstancingVariants: 0 | |
20 | + m_DoubleSidedGI: 0 | |
21 | + m_CustomRenderQueue: 3000 | |
22 | + stringTagMap: | |
23 | + RenderType: Transparent | |
24 | + disabledShaderPasses: | |
25 | + - DepthOnly | |
26 | + - SHADOWCASTER | |
27 | + m_LockedProperties: | |
28 | + m_SavedProperties: | |
29 | + serializedVersion: 3 | |
30 | + m_TexEnvs: | |
31 | + - _BaseMap: | |
32 | + m_Texture: {fileID: 0} | |
33 | + m_Scale: {x: 1, y: 1} | |
34 | + m_Offset: {x: 0, y: 0} | |
35 | + - _BumpMap: | |
36 | + m_Texture: {fileID: 0} | |
37 | + m_Scale: {x: 1, y: 1} | |
38 | + m_Offset: {x: 0, y: 0} | |
39 | + - _DetailAlbedoMap: | |
40 | + m_Texture: {fileID: 0} | |
41 | + m_Scale: {x: 1, y: 1} | |
42 | + m_Offset: {x: 0, y: 0} | |
43 | + - _DetailMask: | |
44 | + m_Texture: {fileID: 0} | |
45 | + m_Scale: {x: 1, y: 1} | |
46 | + m_Offset: {x: 0, y: 0} | |
47 | + - _DetailNormalMap: | |
48 | + m_Texture: {fileID: 0} | |
49 | + m_Scale: {x: 1, y: 1} | |
50 | + m_Offset: {x: 0, y: 0} | |
51 | + - _EmissionMap: | |
52 | + m_Texture: {fileID: 0} | |
53 | + m_Scale: {x: 1, y: 1} | |
54 | + m_Offset: {x: 0, y: 0} | |
55 | + - _MainTex: | |
56 | + m_Texture: {fileID: 0} | |
57 | + m_Scale: {x: 1, y: 1} | |
58 | + m_Offset: {x: 0, y: 0} | |
59 | + - _MetallicGlossMap: | |
60 | + m_Texture: {fileID: 0} | |
61 | + m_Scale: {x: 1, y: 1} | |
62 | + m_Offset: {x: 0, y: 0} | |
63 | + - _OcclusionMap: | |
64 | + m_Texture: {fileID: 0} | |
65 | + m_Scale: {x: 1, y: 1} | |
66 | + m_Offset: {x: 0, y: 0} | |
67 | + - _ParallaxMap: | |
68 | + m_Texture: {fileID: 0} | |
69 | + m_Scale: {x: 1, y: 1} | |
70 | + m_Offset: {x: 0, y: 0} | |
71 | + - _SpecGlossMap: | |
72 | + m_Texture: {fileID: 0} | |
73 | + m_Scale: {x: 1, y: 1} | |
74 | + m_Offset: {x: 0, y: 0} | |
75 | + - unity_Lightmaps: | |
76 | + m_Texture: {fileID: 0} | |
77 | + m_Scale: {x: 1, y: 1} | |
78 | + m_Offset: {x: 0, y: 0} | |
79 | + - unity_LightmapsInd: | |
80 | + m_Texture: {fileID: 0} | |
81 | + m_Scale: {x: 1, y: 1} | |
82 | + m_Offset: {x: 0, y: 0} | |
83 | + - unity_ShadowMasks: | |
84 | + m_Texture: {fileID: 0} | |
85 | + m_Scale: {x: 1, y: 1} | |
86 | + m_Offset: {x: 0, y: 0} | |
87 | + m_Ints: [] | |
88 | + m_Floats: | |
89 | + - _AlphaClip: 0 | |
90 | + - _AlphaToMask: 0 | |
91 | + - _Blend: 0 | |
92 | + - _BlendModePreserveSpecular: 1 | |
93 | + - _BumpScale: 1 | |
94 | + - _ClearCoatMask: 0 | |
95 | + - _ClearCoatSmoothness: 0 | |
96 | + - _Cull: 2 | |
97 | + - _Cutoff: 0.5 | |
98 | + - _DetailAlbedoMapScale: 1 | |
99 | + - _DetailNormalMapScale: 1 | |
100 | + - _DstBlend: 10 | |
101 | + - _DstBlendAlpha: 10 | |
102 | + - _EnvironmentReflections: 1 | |
103 | + - _GlossMapScale: 0 | |
104 | + - _Glossiness: 0 | |
105 | + - _GlossyReflections: 0 | |
106 | + - _Metallic: 0 | |
107 | + - _OcclusionStrength: 1 | |
108 | + - _Parallax: 0.005 | |
109 | + - _QueueOffset: 0 | |
110 | + - _ReceiveShadows: 1 | |
111 | + - _Smoothness: 0.5 | |
112 | + - _SmoothnessTextureChannel: 0 | |
113 | + - _SpecularHighlights: 1 | |
114 | + - _SrcBlend: 1 | |
115 | + - _SrcBlendAlpha: 1 | |
116 | + - _Surface: 1 | |
117 | + - _WorkflowMode: 1 | |
118 | + - _ZWrite: 0 | |
119 | + m_Colors: | |
120 | + - _BaseColor: {r: 0.024995618, g: 0.764151, b: 0, a: 0.23529412} | |
121 | + - _Color: {r: 0.024995618, g: 0.764151, b: 0, a: 0.23529412} | |
122 | + - _EmissionColor: {r: 24.094114, g: 766.996, b: 0, a: 1} | |
123 | + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} | |
124 | + m_BuildTextureStacks: [] | |
125 | +--- !u!114 &4593561838491940514 | |
126 | +MonoBehaviour: | |
127 | + m_ObjectHideFlags: 11 | |
128 | + m_CorrespondingSourceObject: {fileID: 0} | |
129 | + m_PrefabInstance: {fileID: 0} | |
130 | + m_PrefabAsset: {fileID: 0} | |
131 | + m_GameObject: {fileID: 0} | |
132 | + m_Enabled: 1 | |
133 | + m_EditorHideFlags: 0 | |
134 | + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} | |
135 | + m_Name: | |
136 | + m_EditorClassIdentifier: | |
137 | + version: 7 |
--- VRTK/Assets/VRRes/Shader/New Material.mat.meta
+++ VRTK/Assets/VRRes/MetaQuestTouchPlus/Materials/AlphaGlow.mat.meta
... | ... | @@ -0,0 +1,8 @@ |
1 | +fileFormatVersion: 2 | |
2 | +guid: c72bc4ac10c6e6746b692f423daae8b2 | |
3 | +NativeFormatImporter: | |
4 | + externalObjects: {} | |
5 | + mainObjectFileID: 2100000 | |
6 | + userData: | |
7 | + assetBundleName: | |
8 | + assetBundleVariant: |
--- VRTK/Assets/VRRes/MetaQuestTouchPlus/Materials/LineGreen.mat
+++ VRTK/Assets/VRRes/MetaQuestTouchPlus/Materials/LineGreen.mat
... | ... | @@ -25,15 +25,19 @@ |
25 | 25 |
m_Parent: {fileID: 0} |
26 | 26 |
m_ModifiedSerializedProperties: 0 |
27 | 27 |
m_ValidKeywords: |
28 |
+ - _ALPHAPREMULTIPLY_ON |
|
28 | 29 |
- _EMISSION |
30 |
+ - _SURFACE_TYPE_TRANSPARENT |
|
29 | 31 |
m_InvalidKeywords: [] |
30 | 32 |
m_LightmapFlags: 1 |
31 | 33 |
m_EnableInstancingVariants: 0 |
32 | 34 |
m_DoubleSidedGI: 0 |
33 |
- m_CustomRenderQueue: -1 |
|
35 |
+ m_CustomRenderQueue: 3000 |
|
34 | 36 |
stringTagMap: |
35 |
- RenderType: Opaque |
|
36 |
- disabledShaderPasses: [] |
|
37 |
+ RenderType: Transparent |
|
38 |
+ disabledShaderPasses: |
|
39 |
+ - DepthOnly |
|
40 |
+ - SHADOWCASTER |
|
37 | 41 |
m_LockedProperties: |
38 | 42 |
m_SavedProperties: |
39 | 43 |
serializedVersion: 3 |
... | ... | @@ -107,30 +111,30 @@ |
107 | 111 |
- _Cutoff: 0.5 |
108 | 112 |
- _DetailAlbedoMapScale: 1 |
109 | 113 |
- _DetailNormalMapScale: 1 |
110 |
- - _DstBlend: 0 |
|
111 |
- - _DstBlendAlpha: 0 |
|
114 |
+ - _DstBlend: 10 |
|
115 |
+ - _DstBlendAlpha: 10 |
|
112 | 116 |
- _EnvironmentReflections: 1 |
113 | 117 |
- _GlossMapScale: 1 |
114 | 118 |
- _Glossiness: 0.5 |
115 | 119 |
- _GlossyReflections: 1 |
116 |
- - _Metallic: 0.067 |
|
120 |
+ - _Metallic: 0 |
|
117 | 121 |
- _Mode: 0 |
118 | 122 |
- _OcclusionStrength: 1 |
119 | 123 |
- _Parallax: 0.02 |
120 | 124 |
- _QueueOffset: 0 |
121 | 125 |
- _ReceiveShadows: 1 |
122 |
- - _Smoothness: 0.5 |
|
126 |
+ - _Smoothness: 0 |
|
123 | 127 |
- _SmoothnessTextureChannel: 0 |
124 | 128 |
- _SpecularHighlights: 1 |
125 | 129 |
- _SrcBlend: 1 |
126 | 130 |
- _SrcBlendAlpha: 1 |
127 |
- - _Surface: 0 |
|
131 |
+ - _Surface: 1 |
|
128 | 132 |
- _UVSec: 0 |
129 | 133 |
- _WorkflowMode: 1 |
130 |
- - _ZWrite: 1 |
|
134 |
+ - _ZWrite: 0 |
|
131 | 135 |
m_Colors: |
132 |
- - _BaseColor: {r: 0.33333334, g: 1, b: 0, a: 1} |
|
133 |
- - _Color: {r: 0.3333333, g: 1, b: 0, a: 1} |
|
136 |
+ - _BaseColor: {r: 0, g: 1, b: 0.12363622, a: 0.78431374} |
|
137 |
+ - _Color: {r: 0, g: 1, b: 0.12363619, a: 0.78431374} |
|
134 | 138 |
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} |
135 | 139 |
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} |
136 | 140 |
m_BuildTextureStacks: [] |
--- VRTK/Assets/VRRes/MetaQuestTouchPro/Materials/batteryIndicator_mat.mat
+++ VRTK/Assets/VRRes/MetaQuestTouchPro/Materials/batteryIndicator_mat.mat
... | ... | @@ -21,10 +21,11 @@ |
21 | 21 |
m_PrefabInstance: {fileID: 0} |
22 | 22 |
m_PrefabAsset: {fileID: 0} |
23 | 23 |
m_Name: batteryIndicator_mat |
24 |
- m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} |
|
24 |
+ m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} |
|
25 | 25 |
m_Parent: {fileID: 0} |
26 | 26 |
m_ModifiedSerializedProperties: 0 |
27 | 27 |
m_ValidKeywords: |
28 |
+ - _ALPHAPREMULTIPLY_ON |
|
28 | 29 |
- _SURFACE_TYPE_TRANSPARENT |
29 | 30 |
m_InvalidKeywords: [] |
30 | 31 |
m_LightmapFlags: 4 |
... | ... | @@ -80,18 +81,39 @@ |
80 | 81 |
m_Texture: {fileID: 0} |
81 | 82 |
m_Scale: {x: 1, y: 1} |
82 | 83 |
m_Offset: {x: 0, y: 0} |
84 |
+ - _SpecGlossMap: |
|
85 |
+ m_Texture: {fileID: 0} |
|
86 |
+ m_Scale: {x: 1, y: 1} |
|
87 |
+ m_Offset: {x: 0, y: 0} |
|
88 |
+ - unity_Lightmaps: |
|
89 |
+ m_Texture: {fileID: 0} |
|
90 |
+ m_Scale: {x: 1, y: 1} |
|
91 |
+ m_Offset: {x: 0, y: 0} |
|
92 |
+ - unity_LightmapsInd: |
|
93 |
+ m_Texture: {fileID: 0} |
|
94 |
+ m_Scale: {x: 1, y: 1} |
|
95 |
+ m_Offset: {x: 0, y: 0} |
|
96 |
+ - unity_ShadowMasks: |
|
97 |
+ m_Texture: {fileID: 0} |
|
98 |
+ m_Scale: {x: 1, y: 1} |
|
99 |
+ m_Offset: {x: 0, y: 0} |
|
83 | 100 |
m_Ints: [] |
84 | 101 |
m_Floats: |
85 | 102 |
- _AlphaClip: 0 |
86 | 103 |
- _AlphaToMask: 0 |
87 | 104 |
- _Blend: 0 |
105 |
+ - _BlendModePreserveSpecular: 1 |
|
88 | 106 |
- _BlendOp: 0 |
89 | 107 |
- _BumpScale: 1 |
108 |
+ - _ClearCoatMask: 0 |
|
109 |
+ - _ClearCoatSmoothness: 0 |
|
90 | 110 |
- _Cull: 2 |
91 | 111 |
- _Cutoff: 0.5 |
112 |
+ - _DetailAlbedoMapScale: 1 |
|
92 | 113 |
- _DetailNormalMapScale: 1 |
93 | 114 |
- _DstBlend: 10 |
94 | 115 |
- _DstBlendAlpha: 10 |
116 |
+ - _EnvironmentReflections: 1 |
|
95 | 117 |
- _GlossMapScale: 1 |
96 | 118 |
- _Glossiness: 0 |
97 | 119 |
- _GlossyReflections: 1 |
... | ... | @@ -100,16 +122,20 @@ |
100 | 122 |
- _OcclusionStrength: 1 |
101 | 123 |
- _Parallax: 0.02 |
102 | 124 |
- _QueueOffset: 0 |
125 |
+ - _ReceiveShadows: 1 |
|
103 | 126 |
- _SampleGI: 0 |
127 |
+ - _Smoothness: 0.5 |
|
104 | 128 |
- _SmoothnessTextureChannel: 0 |
105 | 129 |
- _SpecularHighlights: 1 |
106 |
- - _SrcBlend: 5 |
|
130 |
+ - _SrcBlend: 1 |
|
107 | 131 |
- _SrcBlendAlpha: 1 |
108 | 132 |
- _Surface: 1 |
109 | 133 |
- _UVSec: 0 |
134 |
+ - _WorkflowMode: 1 |
|
110 | 135 |
- _ZWrite: 0 |
111 | 136 |
m_Colors: |
112 | 137 |
- _BaseColor: {r: 1, g: 1, b: 1, a: 1} |
113 | 138 |
- _Color: {r: 1, g: 1, b: 1, a: 1} |
114 | 139 |
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} |
140 |
+ - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} |
|
115 | 141 |
m_BuildTextureStacks: [] |
+++ VRTK/Assets/VRRes/Shader/GrayScaleMat.mat
... | ... | @@ -0,0 +1,138 @@ |
1 | +%YAML 1.1 | |
2 | +%TAG !u! tag:unity3d.com,2011: | |
3 | +--- !u!114 &-3811426474188602106 | |
4 | +MonoBehaviour: | |
5 | + m_ObjectHideFlags: 11 | |
6 | + m_CorrespondingSourceObject: {fileID: 0} | |
7 | + m_PrefabInstance: {fileID: 0} | |
8 | + m_PrefabAsset: {fileID: 0} | |
9 | + m_GameObject: {fileID: 0} | |
10 | + m_Enabled: 1 | |
11 | + m_EditorHideFlags: 0 | |
12 | + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} | |
13 | + m_Name: | |
14 | + m_EditorClassIdentifier: | |
15 | + version: 7 | |
16 | +--- !u!21 &2100000 | |
17 | +Material: | |
18 | + serializedVersion: 8 | |
19 | + m_ObjectHideFlags: 0 | |
20 | + m_CorrespondingSourceObject: {fileID: 0} | |
21 | + m_PrefabInstance: {fileID: 0} | |
22 | + m_PrefabAsset: {fileID: 0} | |
23 | + m_Name: GrayScaleMat | |
24 | + m_Shader: {fileID: 4800000, guid: e09382ec61aa5d245b9182aa7a777c4d, type: 3} | |
25 | + m_Parent: {fileID: 0} | |
26 | + m_ModifiedSerializedProperties: 0 | |
27 | + m_ValidKeywords: [] | |
28 | + m_InvalidKeywords: [] | |
29 | + m_LightmapFlags: 4 | |
30 | + m_EnableInstancingVariants: 0 | |
31 | + m_DoubleSidedGI: 0 | |
32 | + m_CustomRenderQueue: -1 | |
33 | + stringTagMap: {} | |
34 | + disabledShaderPasses: [] | |
35 | + m_LockedProperties: | |
36 | + m_SavedProperties: | |
37 | + serializedVersion: 3 | |
38 | + m_TexEnvs: | |
39 | + - _BaseMap: | |
40 | + m_Texture: {fileID: 0} | |
41 | + m_Scale: {x: 1, y: 1} | |
42 | + m_Offset: {x: 0, y: 0} | |
43 | + - _BumpMap: | |
44 | + m_Texture: {fileID: 0} | |
45 | + m_Scale: {x: 1, y: 1} | |
46 | + m_Offset: {x: 0, y: 0} | |
47 | + - _DetailAlbedoMap: | |
48 | + m_Texture: {fileID: 0} | |
49 | + m_Scale: {x: 1, y: 1} | |
50 | + m_Offset: {x: 0, y: 0} | |
51 | + - _DetailMask: | |
52 | + m_Texture: {fileID: 0} | |
53 | + m_Scale: {x: 1, y: 1} | |
54 | + m_Offset: {x: 0, y: 0} | |
55 | + - _DetailNormalMap: | |
56 | + m_Texture: {fileID: 0} | |
57 | + m_Scale: {x: 1, y: 1} | |
58 | + m_Offset: {x: 0, y: 0} | |
59 | + - _EmissionMap: | |
60 | + m_Texture: {fileID: 0} | |
61 | + m_Scale: {x: 1, y: 1} | |
62 | + m_Offset: {x: 0, y: 0} | |
63 | + - _MainTex: | |
64 | + m_Texture: {fileID: 0} | |
65 | + m_Scale: {x: 1, y: 1} | |
66 | + m_Offset: {x: 0, y: 0} | |
67 | + - _MetallicGlossMap: | |
68 | + m_Texture: {fileID: 0} | |
69 | + m_Scale: {x: 1, y: 1} | |
70 | + m_Offset: {x: 0, y: 0} | |
71 | + - _OcclusionMap: | |
72 | + m_Texture: {fileID: 0} | |
73 | + m_Scale: {x: 1, y: 1} | |
74 | + m_Offset: {x: 0, y: 0} | |
75 | + - _ParallaxMap: | |
76 | + m_Texture: {fileID: 0} | |
77 | + m_Scale: {x: 1, y: 1} | |
78 | + m_Offset: {x: 0, y: 0} | |
79 | + - _SpecGlossMap: | |
80 | + m_Texture: {fileID: 0} | |
81 | + m_Scale: {x: 1, y: 1} | |
82 | + m_Offset: {x: 0, y: 0} | |
83 | + - unity_Lightmaps: | |
84 | + m_Texture: {fileID: 0} | |
85 | + m_Scale: {x: 1, y: 1} | |
86 | + m_Offset: {x: 0, y: 0} | |
87 | + - unity_LightmapsInd: | |
88 | + m_Texture: {fileID: 0} | |
89 | + m_Scale: {x: 1, y: 1} | |
90 | + m_Offset: {x: 0, y: 0} | |
91 | + - unity_ShadowMasks: | |
92 | + m_Texture: {fileID: 0} | |
93 | + m_Scale: {x: 1, y: 1} | |
94 | + m_Offset: {x: 0, y: 0} | |
95 | + m_Ints: [] | |
96 | + m_Floats: | |
97 | + - _AlphaClip: 0 | |
98 | + - _AlphaToMask: 0 | |
99 | + - _Blend: 0 | |
100 | + - _BlendModePreserveSpecular: 1 | |
101 | + - _BumpScale: 1 | |
102 | + - _ClearCoatMask: 0 | |
103 | + - _ClearCoatSmoothness: 0 | |
104 | + - _ColorMask: 15 | |
105 | + - _Cull: 2 | |
106 | + - _Cutoff: 0.5 | |
107 | + - _DetailAlbedoMapScale: 1 | |
108 | + - _DetailNormalMapScale: 1 | |
109 | + - _DstBlend: 0 | |
110 | + - _DstBlendAlpha: 0 | |
111 | + - _EnvironmentReflections: 1 | |
112 | + - _GlossMapScale: 0 | |
113 | + - _Glossiness: 0 | |
114 | + - _GlossyReflections: 0 | |
115 | + - _Metallic: 0 | |
116 | + - _OcclusionStrength: 1 | |
117 | + - _Parallax: 0.005 | |
118 | + - _QueueOffset: 0 | |
119 | + - _ReceiveShadows: 1 | |
120 | + - _Smoothness: 0.5 | |
121 | + - _SmoothnessTextureChannel: 0 | |
122 | + - _SpecularHighlights: 1 | |
123 | + - _SrcBlend: 1 | |
124 | + - _SrcBlendAlpha: 1 | |
125 | + - _Stencil: 0 | |
126 | + - _StencilComp: 8 | |
127 | + - _StencilOp: 0 | |
128 | + - _StencilReadMask: 255 | |
129 | + - _StencilWriteMask: 255 | |
130 | + - _Surface: 0 | |
131 | + - _WorkflowMode: 1 | |
132 | + - _ZWrite: 1 | |
133 | + m_Colors: | |
134 | + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} | |
135 | + - _Color: {r: 1, g: 1, b: 1, a: 1} | |
136 | + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} | |
137 | + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} | |
138 | + m_BuildTextureStacks: [] |
--- VRTK/Assets/VRRes/Shader/New Material.mat.meta
+++ VRTK/Assets/VRRes/Shader/GrayScaleMat.mat.meta
... | ... | @@ -1,5 +1,5 @@ |
1 | 1 |
fileFormatVersion: 2 |
2 |
-guid: c0b6981baacb4864694b38c110baede2 |
|
2 |
+guid: 70ac76c54c8197e479515af411ecf0bb |
|
3 | 3 |
NativeFormatImporter: |
4 | 4 |
externalObjects: {} |
5 | 5 |
mainObjectFileID: 2100000 |
+++ VRTK/Assets/VRRes/Shader/GrayScaleShader.shader
... | ... | @@ -0,0 +1,82 @@ |
1 | +Shader "Custom/GrayScaleShader" | |
2 | +{ | |
3 | + Properties | |
4 | + { | |
5 | + _MainTex ("Texture", 2D) = "white" {} | |
6 | + | |
7 | + _StencilComp ("Stencil Comparison", Float) = 8 | |
8 | + _Stencil ("Stencil ID", Float) = 0 | |
9 | + _StencilOp ("Stencil Operation", Float) = 0 | |
10 | + _StencilWriteMask ("Stencil Write Mask", Float) = 255 | |
11 | + _StencilReadMask ("Stencil Read Mask", Float) = 255 | |
12 | + _ColorMask ("Color Mask", Float) = 15 | |
13 | + } | |
14 | + SubShader | |
15 | + { | |
16 | + Tags { "RenderType"="Transparent" "Queue"= "Transparent"} | |
17 | + Blend SrcAlpha OneMinusSrcAlpha | |
18 | + ZWrite Off | |
19 | + Cull Off | |
20 | + | |
21 | + LOD 100 | |
22 | + | |
23 | + // Stencil | |
24 | + // { | |
25 | + // Ref [_Stencil] | |
26 | + // Comp [_StencilComp] | |
27 | + // Pass [_StencilOp] | |
28 | + // ReadMask [_StencilReadMask] | |
29 | + // WriteMask [_StencilWriteMask] | |
30 | + // } | |
31 | + // ColorMask [_ColorMask] | |
32 | + | |
33 | + Pass | |
34 | + { | |
35 | + CGPROGRAM | |
36 | + #pragma vertex vert | |
37 | + #pragma fragment frag | |
38 | + // make fog work | |
39 | + //#pragma multi_compile_fog | |
40 | + | |
41 | + #include "UnityCG.cginc" | |
42 | + | |
43 | + struct appdata | |
44 | + { | |
45 | + float4 vertex : POSITION; | |
46 | + float2 uv : TEXCOORD0; | |
47 | + }; | |
48 | + | |
49 | + struct v2f | |
50 | + { | |
51 | + float2 uv : TEXCOORD0; | |
52 | + //UNITY_FOG_COORDS(1) | |
53 | + float4 vertex : SV_POSITION; | |
54 | + }; | |
55 | + | |
56 | + sampler2D _MainTex; | |
57 | + float4 _MainTex_ST; | |
58 | + | |
59 | + v2f vert (appdata v) | |
60 | + { | |
61 | + v2f o; | |
62 | + o.vertex = UnityObjectToClipPos(v.vertex); | |
63 | + o.uv = TRANSFORM_TEX(v.uv, _MainTex); | |
64 | + //UNITY_TRANSFER_FOG(o,o.vertex); | |
65 | + return o; | |
66 | + } | |
67 | + | |
68 | + fixed4 frag (v2f i) : SV_Target | |
69 | + { | |
70 | + // sample the texture | |
71 | + fixed4 col = tex2D(_MainTex, i.uv); | |
72 | + // apply fog | |
73 | + //UNITY_APPLY_FOG(i.fogCoord, col); | |
74 | + float gray = dot(col.rgb, float3(0.299, 0.587, 0.114)); | |
75 | + return fixed4(gray, gray, gray, col.a); | |
76 | + } | |
77 | + ENDCG | |
78 | + } | |
79 | + } | |
80 | + | |
81 | + FallBack "Diffuse" | |
82 | +} |
+++ VRTK/Assets/VRRes/Shader/GrayScaleShader.shader.meta
... | ... | @@ -0,0 +1,9 @@ |
1 | +fileFormatVersion: 2 | |
2 | +guid: e09382ec61aa5d245b9182aa7a777c4d | |
3 | +ShaderImporter: | |
4 | + externalObjects: {} | |
5 | + defaultTextures: [] | |
6 | + nonModifiableTextures: [] | |
7 | + userData: | |
8 | + assetBundleName: | |
9 | + assetBundleVariant: |
--- VRTK/Assets/VRRes/Shader/New Material.mat
... | ... | @@ -1,349 +0,0 @@ |
1 | -%YAML 1.1 | |
2 | -%TAG !u! tag:unity3d.com,2011: | |
3 | ---- !u!21 &2100000 | |
4 | -Material: | |
5 | - serializedVersion: 8 | |
6 | - m_ObjectHideFlags: 0 | |
7 | - m_CorrespondingSourceObject: {fileID: 0} | |
8 | - m_PrefabInstance: {fileID: 0} | |
9 | - m_PrefabAsset: {fileID: 0} | |
10 | - m_Name: New Material | |
11 | - m_Shader: {fileID: 4800000, guid: 9988c0afea80c4f35be55b98e399bb19, type: 3} | |
12 | - m_Parent: {fileID: 0} | |
13 | - m_ModifiedSerializedProperties: 0 | |
14 | - m_ValidKeywords: | |
15 | - - AMBIENT | |
16 | - - ANIME_SOFT | |
17 | - - DIFFUSE | |
18 | - - FOG | |
19 | - - MATCAP_PERSPECTIVE | |
20 | - - OUTLINE_PASS_DISABLED | |
21 | - - SHADOWS_ENABLED | |
22 | - - _DETAILBLEND_MULTIPLY | |
23 | - - _DETAILUV_UV1 | |
24 | - - _HEIGHTCOLORSBLEND_ALPHA_BLEND | |
25 | - - _LAYER1BLEND_ALPHA_BLEND | |
26 | - - _LAYER2BLEND_ALPHA_BLEND | |
27 | - - _LAYER3BLEND_ALPHA_BLEND | |
28 | - - _LIGHTMAPUV_UV1 | |
29 | - - _MATCAPBLEND_MULTIPLY | |
30 | - - _OPTFALLBACK_ALL | |
31 | - - _OPTFOG_ALL | |
32 | - - _OPTLIGHTMAPPING_ALL | |
33 | - - _OPTPOINTLIGHTS_ALL | |
34 | - - _OPTSHADOW_ALL | |
35 | - - _PLANTTYPE_PLANT | |
36 | - - _RIMBLEND_ADDITIVE | |
37 | - - _SHADOWOVERLAYANIMATION_SCROLL | |
38 | - m_InvalidKeywords: | |
39 | - - _NORMALUV_UV1 | |
40 | - - _SPECULARUV_UV1 | |
41 | - m_LightmapFlags: 4 | |
42 | - m_EnableInstancingVariants: 0 | |
43 | - m_DoubleSidedGI: 0 | |
44 | - m_CustomRenderQueue: -1 | |
45 | - stringTagMap: {} | |
46 | - disabledShaderPasses: | |
47 | - - ALWAYS | |
48 | - - SRPDEFAULTUNLIT | |
49 | - m_LockedProperties: | |
50 | - m_SavedProperties: | |
51 | - serializedVersion: 3 | |
52 | - m_TexEnvs: | |
53 | - - _BaseMap: | |
54 | - m_Texture: {fileID: 0} | |
55 | - m_Scale: {x: 1, y: 1} | |
56 | - m_Offset: {x: 0, y: 0} | |
57 | - - _BumpMap: | |
58 | - m_Texture: {fileID: 0} | |
59 | - m_Scale: {x: 1, y: 1} | |
60 | - m_Offset: {x: 0, y: 0} | |
61 | - - _DetailAlbedoMap: | |
62 | - m_Texture: {fileID: 0} | |
63 | - m_Scale: {x: 1, y: 1} | |
64 | - m_Offset: {x: 0, y: 0} | |
65 | - - _DetailMask: | |
66 | - m_Texture: {fileID: 0} | |
67 | - m_Scale: {x: 1, y: 1} | |
68 | - m_Offset: {x: 0, y: 0} | |
69 | - - _DetailNormalMap: | |
70 | - m_Texture: {fileID: 0} | |
71 | - m_Scale: {x: 1, y: 1} | |
72 | - m_Offset: {x: 0, y: 0} | |
73 | - - _DetailTex: | |
74 | - m_Texture: {fileID: 0} | |
75 | - m_Scale: {x: 1, y: 1} | |
76 | - m_Offset: {x: 0, y: 0} | |
77 | - - _EmissionMap: | |
78 | - m_Texture: {fileID: 0} | |
79 | - m_Scale: {x: 1, y: 1} | |
80 | - m_Offset: {x: 0, y: 0} | |
81 | - - _EmissiveTex: | |
82 | - m_Texture: {fileID: 0} | |
83 | - m_Scale: {x: 1, y: 1} | |
84 | - m_Offset: {x: 0, y: 0} | |
85 | - - _HeightColorsTex: | |
86 | - m_Texture: {fileID: 0} | |
87 | - m_Scale: {x: 1, y: 1} | |
88 | - m_Offset: {x: 0, y: 0} | |
89 | - - _Layer1Tex: | |
90 | - m_Texture: {fileID: 0} | |
91 | - m_Scale: {x: 1, y: 1} | |
92 | - m_Offset: {x: 0, y: 0} | |
93 | - - _Layer2Tex: | |
94 | - m_Texture: {fileID: 0} | |
95 | - m_Scale: {x: 1, y: 1} | |
96 | - m_Offset: {x: 0, y: 0} | |
97 | - - _Layer3Tex: | |
98 | - m_Texture: {fileID: 0} | |
99 | - m_Scale: {x: 1, y: 1} | |
100 | - m_Offset: {x: 0, y: 0} | |
101 | - - _LightmapTex: | |
102 | - m_Texture: {fileID: 0} | |
103 | - m_Scale: {x: 1, y: 1} | |
104 | - m_Offset: {x: 0, y: 0} | |
105 | - - _MainTex: | |
106 | - m_Texture: {fileID: 0} | |
107 | - m_Scale: {x: 1, y: 1} | |
108 | - m_Offset: {x: 0, y: 0} | |
109 | - - _MatCapTex: | |
110 | - m_Texture: {fileID: 0} | |
111 | - m_Scale: {x: 1, y: 1} | |
112 | - m_Offset: {x: 0, y: 0} | |
113 | - - _MetallicGlossMap: | |
114 | - m_Texture: {fileID: 0} | |
115 | - m_Scale: {x: 1, y: 1} | |
116 | - m_Offset: {x: 0, y: 0} | |
117 | - - _NormalTex: | |
118 | - m_Texture: {fileID: 0} | |
119 | - m_Scale: {x: 1, y: 1} | |
120 | - m_Offset: {x: 0, y: 0} | |
121 | - - _NormalTex2: | |
122 | - m_Texture: {fileID: 0} | |
123 | - m_Scale: {x: 1, y: 1} | |
124 | - m_Offset: {x: 0, y: 0} | |
125 | - - _NormalTopTex: | |
126 | - m_Texture: {fileID: 0} | |
127 | - m_Scale: {x: 1, y: 1} | |
128 | - m_Offset: {x: 0, y: 0} | |
129 | - - _OcclusionMap: | |
130 | - m_Texture: {fileID: 0} | |
131 | - m_Scale: {x: 1, y: 1} | |
132 | - m_Offset: {x: 0, y: 0} | |
133 | - - _ParallaxMap: | |
134 | - m_Texture: {fileID: 0} | |
135 | - m_Scale: {x: 1, y: 1} | |
136 | - m_Offset: {x: 0, y: 0} | |
137 | - - _ReflectionTex: | |
138 | - m_Texture: {fileID: 0} | |
139 | - m_Scale: {x: 1, y: 1} | |
140 | - m_Offset: {x: 0, y: 0} | |
141 | - - _ShadowOverlayTex: | |
142 | - m_Texture: {fileID: 0} | |
143 | - m_Scale: {x: 1, y: 1} | |
144 | - m_Offset: {x: 0, y: 0} | |
145 | - - _SpecGlossMap: | |
146 | - m_Texture: {fileID: 0} | |
147 | - m_Scale: {x: 1, y: 1} | |
148 | - m_Offset: {x: 0, y: 0} | |
149 | - - _SpecularTex: | |
150 | - m_Texture: {fileID: 0} | |
151 | - m_Scale: {x: 1, y: 1} | |
152 | - m_Offset: {x: 0, y: 0} | |
153 | - - _TopTex: | |
154 | - m_Texture: {fileID: 0} | |
155 | - m_Scale: {x: 1, y: 1} | |
156 | - m_Offset: {x: 0, y: 0} | |
157 | - - _TransparencyMaskTex: | |
158 | - m_Texture: {fileID: 0} | |
159 | - m_Scale: {x: 1, y: 1} | |
160 | - m_Offset: {x: 0, y: 0} | |
161 | - - unity_Lightmaps: | |
162 | - m_Texture: {fileID: 0} | |
163 | - m_Scale: {x: 1, y: 1} | |
164 | - m_Offset: {x: 0, y: 0} | |
165 | - - unity_LightmapsInd: | |
166 | - m_Texture: {fileID: 0} | |
167 | - m_Scale: {x: 1, y: 1} | |
168 | - m_Offset: {x: 0, y: 0} | |
169 | - - unity_ShadowMasks: | |
170 | - m_Texture: {fileID: 0} | |
171 | - m_Scale: {x: 1, y: 1} | |
172 | - m_Offset: {x: 0, y: 0} | |
173 | - m_Ints: [] | |
174 | - m_Floats: | |
175 | - - _AlphaClip: 0 | |
176 | - - _AlphaToMask: 0 | |
177 | - - _AmbientBrightness: 1 | |
178 | - - _Anime: 0 | |
179 | - - _AnimeSoftness: 0.01 | |
180 | - - _AnimeThreshold1: 0.45 | |
181 | - - _AnimeThreshold2: 0.85 | |
182 | - - _Blend: 0 | |
183 | - - _BlendModePreserveSpecular: 1 | |
184 | - - _BlendOp: 0 | |
185 | - - _Brightness: 1 | |
186 | - - _BumpScale: 1 | |
187 | - - _CameraFadeEnd: 0 | |
188 | - - _CameraFadeStart: 0 | |
189 | - - _ClearCoatMask: 0 | |
190 | - - _ClearCoatSmoothness: 0 | |
191 | - - _Contrast: 1 | |
192 | - - _Cull: 2 | |
193 | - - _Cutoff: 0.5 | |
194 | - - _Cutout: 0 | |
195 | - - _DestBlend: 0 | |
196 | - - _DetailAlbedoMapScale: 1 | |
197 | - - _DetailBlend: 2 | |
198 | - - _DetailBrightness: 1 | |
199 | - - _DetailContrast: 1 | |
200 | - - _DetailLighting: 0 | |
201 | - - _DetailNormalMapScale: 1 | |
202 | - - _DetailUV: 0 | |
203 | - - _DetailVertexColors: 0 | |
204 | - - _Diffuse: 1 | |
205 | - - _DiffuseBrightness: 1 | |
206 | - - _DiffuseContrast: 1 | |
207 | - - _DiffusePerPixel: 0 | |
208 | - - _DiffuseWrap: 0 | |
209 | - - _DstBlend: 0 | |
210 | - - _DstBlendAlpha: 0 | |
211 | - - _EnvironmentReflections: 1 | |
212 | - - _Flat: 0 | |
213 | - - _Fog: 1 | |
214 | - - _GlossMapScale: 0 | |
215 | - - _Glossiness: 0 | |
216 | - - _GlossyReflections: 0 | |
217 | - - _HeightColors: 0 | |
218 | - - _HeightColorsAlpha: 1 | |
219 | - - _HeightColorsBlend: 0 | |
220 | - - _HeightColorsEdgeThickness: 1 | |
221 | - - _HeightColorsHeight: 0 | |
222 | - - _HeightColorsSpace: 0 | |
223 | - - _HeightColorsThickness: 0 | |
224 | - - _IgnoreMainTexAlpha: 0 | |
225 | - - _Layer1Alpha: 1 | |
226 | - - _Layer1Blend: 0 | |
227 | - - _Layer1Brightness: 1 | |
228 | - - _Layer1VertexColor: 0 | |
229 | - - _Layer2Alpha: 1 | |
230 | - - _Layer2Blend: 0 | |
231 | - - _Layer2Brightness: 1 | |
232 | - - _Layer2VertexColor: 0 | |
233 | - - _Layer3Alpha: 1 | |
234 | - - _Layer3Blend: 0 | |
235 | - - _Layer3Brightness: 1 | |
236 | - - _Layer3VertexColor: 0 | |
237 | - - _LightmapBrightness: 1 | |
238 | - - _LightmapUV: 0 | |
239 | - - _MatCapBlend: 0 | |
240 | - - _MatCapBrightness: 1 | |
241 | - - _MatCapContrast: 1 | |
242 | - - _MatCapPerspective: 1 | |
243 | - - _MatCapStatic: 0 | |
244 | - - _Metallic: 0 | |
245 | - - _MixedLighting: 0 | |
246 | - - _NormalStrength: 1 | |
247 | - - _NormalUV: 0 | |
248 | - - _OcclusionStrength: 1 | |
249 | - - _OptFallback: 0 | |
250 | - - _OptFog: 0 | |
251 | - - _OptLightmapping: 0 | |
252 | - - _OptPointLights: 0 | |
253 | - - _OptShadow: 0 | |
254 | - - _Outline: 0 | |
255 | - - _OutlineComp: 8 | |
256 | - - _OutlineGroup: 0 | |
257 | - - _OutlinePass: 0 | |
258 | - - _OutlineWidth: 0.002 | |
259 | - - _Parallax: 0.005 | |
260 | - - _Plant: 0 | |
261 | - - _PlantBaseHeight: 0 | |
262 | - - _PlantLocal: 0 | |
263 | - - _PlantPhaseVariation: 0.3 | |
264 | - - _PlantSwayAmount: 0.15 | |
265 | - - _PlantSwaySpeed: 1 | |
266 | - - _PlantType: 0 | |
267 | - - _Preset: 0 | |
268 | - - _QueueOffset: 0 | |
269 | - - _ReceiveShadows: 1 | |
270 | - - _Reflection: 0 | |
271 | - - _ReflectionAmount: 1 | |
272 | - - _ReflectionRim: 0 | |
273 | - - _ReflectionSpecular: 0 | |
274 | - - _Rim: 0 | |
275 | - - _RimAmount: 1 | |
276 | - - _RimBlend: 1 | |
277 | - - _RimContrast: 5 | |
278 | - - _RimInverse: 0 | |
279 | - - _Saturation: 1 | |
280 | - - _ShadowOverlayAnimation: 0 | |
281 | - - _ShadowOverlayBrightness: 1 | |
282 | - - _ShadowOverlaySpeedU: 0.1 | |
283 | - - _ShadowOverlaySpeedV: 0.03 | |
284 | - - _ShadowOverlaySwayAmount: 0.01 | |
285 | - - _ShadowsEnabled: 1 | |
286 | - - _Smoothness: 0.5 | |
287 | - - _SmoothnessTextureChannel: 0 | |
288 | - - _SourceBlend: 1 | |
289 | - - _Specular: 0 | |
290 | - - _SpecularBrightness: 1 | |
291 | - - _SpecularHair: 0 | |
292 | - - _SpecularHighlights: 1 | |
293 | - - _SpecularSmoothness: 20 | |
294 | - - _SpecularUV: 0 | |
295 | - - _SrcBlend: 1 | |
296 | - - _SrcBlendAlpha: 1 | |
297 | - - _Surface: 0 | |
298 | - - _TopBrightness: 1 | |
299 | - - _TransparencyMaskAmount: 1 | |
300 | - - _TransparencyMaskContrast: 1 | |
301 | - - _TriplanarLocal: 0 | |
302 | - - _TriplanarSharpness: 1 | |
303 | - - _TriplanarTop: 0 | |
304 | - - _VertexColor: 0 | |
305 | - - _VertexColors: 0 | |
306 | - - _VertexColorsAmount: 1 | |
307 | - - _VertexColorsContrast: 1 | |
308 | - - _WorkflowMode: 1 | |
309 | - - _ZOffset: 0 | |
310 | - - _ZTest: 4 | |
311 | - - _ZWrite: 1 | |
312 | - m_Colors: | |
313 | - - _AnimeColor1: {r: 1, g: 1, b: 1, a: 1} | |
314 | - - _AnimeColor2: {r: 1.35, g: 1.35, b: 1.35, a: 1} | |
315 | - - _AnimeColor3: {r: 2, g: 2, b: 2, a: 1} | |
316 | - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} | |
317 | - - _Color: {r: 1, g: 1, b: 1, a: 1} | |
318 | - - _DetailColor: {r: 1, g: 1, b: 1, a: 1} | |
319 | - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} | |
320 | - - _Emissive: {r: 0, g: 0, b: 0, a: 0} | |
321 | - - _HeightColorsColor: {r: 1, g: 1, b: 1, a: 1} | |
322 | - - _Layer1Color: {r: 1, g: 1, b: 1, a: 1} | |
323 | - - _Layer2Color: {r: 1, g: 1, b: 1, a: 1} | |
324 | - - _Layer3Color: {r: 1, g: 1, b: 1, a: 1} | |
325 | - - _LightmapColor: {r: 1, g: 1, b: 1, a: 1} | |
326 | - - _MatCapColor: {r: 1, g: 1, b: 1, a: 1} | |
327 | - - _MatCapRot: {r: 0, g: 0, b: 0, a: 0} | |
328 | - - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} | |
329 | - - _ReflectionColor: {r: 1, g: 1, b: 1, a: 1} | |
330 | - - _RimColor: {r: 1, g: 1, b: 1, a: 1} | |
331 | - - _RimDirection: {r: 0, g: 0, b: 0, a: 0} | |
332 | - - _ShadowColor: {r: 0.3, g: 0.3, b: 0.3, a: 1} | |
333 | - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} | |
334 | - - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} | |
335 | - - _TopColor: {r: 1, g: 1, b: 1, a: 1} | |
336 | - m_BuildTextureStacks: [] | |
337 | ---- !u!114 &6438305878780646730 | |
338 | -MonoBehaviour: | |
339 | - m_ObjectHideFlags: 11 | |
340 | - m_CorrespondingSourceObject: {fileID: 0} | |
341 | - m_PrefabInstance: {fileID: 0} | |
342 | - m_PrefabAsset: {fileID: 0} | |
343 | - m_GameObject: {fileID: 0} | |
344 | - m_Enabled: 1 | |
345 | - m_EditorHideFlags: 0 | |
346 | - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} | |
347 | - m_Name: | |
348 | - m_EditorClassIdentifier: | |
349 | - version: 7 |
--- VRTK/Assets/VRRes/VRUI/00.Prefab/VRUI_TK(legacy).prefab
+++ VRTK/Assets/VRRes/VRUI/00.Prefab/VRUI_TK(legacy).prefab
... | ... | @@ -1985,7 +1985,6 @@ |
1985 | 1985 |
uiManager: {fileID: 0} |
1986 | 1986 |
animController: {fileID: 0} |
1987 | 1987 |
popUp: {fileID: 2239418196424004487} |
1988 |
- vrInforPopup: {fileID: 6918489307225326327} |
|
1989 | 1988 |
resultUIManager: {fileID: 1308340255583984525} |
1990 | 1989 |
titleObj: {fileID: 0} |
1991 | 1990 |
titleTxt: {fileID: 0} |
... | ... | @@ -2023,8 +2022,10 @@ |
2023 | 2022 |
tkInfoObj: {fileID: 3080428182466822801} |
2024 | 2023 |
popupDetailManager: {fileID: 6144180644358251471} |
2025 | 2024 |
popupBuyManager: {fileID: 6643644863372837468} |
2025 |
+ nowProgram: |
|
2026 | 2026 |
nowSelectAnim: |
2027 | 2027 |
nowSelectCoachId: 0 |
2028 |
+ nowSelectCoachFileName: |
|
2028 | 2029 |
nowSelectCoachName: |
2029 | 2030 |
tkInfoList: [] |
2030 | 2031 |
tkCoachList: [] |
... | ... | @@ -7090,17 +7091,18 @@ |
7090 | 7091 |
m_Name: |
7091 | 7092 |
m_EditorClassIdentifier: |
7092 | 7093 |
resultUI: {fileID: 3320372527395625900} |
7093 |
- scoreVal: {fileID: 8471574664490887846} |
|
7094 |
+ currentScoreVal: {fileID: 0} |
|
7095 |
+ bestScoreVal: {fileID: 0} |
|
7094 | 7096 |
evaluationTxt: {fileID: 1344968320730945370} |
7095 | 7097 |
moveCount: {fileID: 1879445189901478098} |
7096 | 7098 |
greatCount: {fileID: 6040297431496651470} |
7097 | 7099 |
goodCount: {fileID: 1425073246228405695} |
7098 | 7100 |
missCount: {fileID: 4695822715164653326} |
7099 | 7101 |
accuracyCount: {fileID: 3340495085395508963} |
7100 |
- heartCount: {fileID: 1123017524767558607} |
|
7101 |
- BestCount: {fileID: 3500025047413650939} |
|
7102 |
- homeBtn: {fileID: 4072736374537167151} |
|
7103 |
- closeBtn: {fileID: 7343990980321390445} |
|
7102 |
+ instructorNameTxt: {fileID: 0} |
|
7103 |
+ goldCount: {fileID: 0} |
|
7104 |
+ rankingBtn: {fileID: 0} |
|
7105 |
+ lobbyBtn: {fileID: 0} |
|
7104 | 7106 |
continueBtn: {fileID: 1178431288555158025} |
7105 | 7107 |
--- !u!1 &2066296754677457703 |
7106 | 7108 |
GameObject: |
--- VRTK/Assets/VRRes/VRUI/00.Prefab/VRUI_TK.prefab
+++ VRTK/Assets/VRRes/VRUI/00.Prefab/VRUI_TK.prefab
This diff is too big to display. |
+++ VRTK/Assets/VRRes/VRUI/Basic/10.Store.prefab
This file is too big to display. |
+++ VRTK/Assets/VRRes/VRUI/Basic/10.Store.prefab.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VRUI/Basic/MetaTestAsset.prefab
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VRUI/Basic/MetaTestAsset.prefab.meta
This diff is skipped because there are too many other diffs. |
--- VRTK/Assets/VRRes/VRUI/Basic/Result.prefab
+++ VRTK/Assets/VRRes/VRUI/Basic/Result.prefab
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VRUI/Basic/SwitchToggle.prefab
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VRUI/Basic/SwitchToggle.prefab.meta
This diff is skipped because there are too many other diffs. |
--- VRTK/Assets/VRRes/VR_Prefab/VR_IK_Rig.prefab
+++ VRTK/Assets/VRRes/VR_Prefab/VR_IK_Rig.prefab
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Achievement.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Achievement/Icon_arena_ticket.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Achievement/Icon_arena_ticket.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Achievement/Icon_arena_tier01.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Achievement/Icon_arena_tier01.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Achievement/Icon_arena_tier02.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Achievement/Icon_arena_tier02.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Achievement/Icon_arena_tier03.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Achievement/Icon_arena_tier03.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Achievement/Icon_arena_tier04.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Achievement/Icon_arena_tier04.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Achievement/Icon_arena_tier05.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Achievement/Icon_arena_tier05.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Achievement/Icon_arena_tier07.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Achievement/Icon_arena_tier07.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Achievement/Icon_arena_tier08.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Achievement/Icon_arena_tier08.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/ModeSelcetImg/AIevaluation.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/ModeSelcetImg/AIevaluation.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Coin.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Coin/coin_Big.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Coin/coin_Big.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Coin/coin_Huge.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Coin/coin_Huge.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Coin/coin_Middle.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Coin/coin_Middle.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Coin/coin_Small.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Coin/coin_Small.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Map.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Map/GuroGym.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Map/GuroGym.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Map/SnowMountain.jpg
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Map/SnowMountain.jpg.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Sale.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Sale/ribbon_Best.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Sale/ribbon_Best.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Sale/ribbon_Event.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Sale/ribbon_Event.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Sale/ribbon_Sale.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Sale/ribbon_Sale.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Sale/ribbon_Soldout.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Sale/ribbon_Soldout.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Sale/ribbon_new.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Sale/ribbon_new.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Sale/ribbon_sold out.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Sale/ribbon_sold out.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Tkbelt.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Tkbelt/belt.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Tkbelt/belt.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Tkclothes.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Tkclothes/TkUniform.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Tkclothes/TkUniform.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Tkthing.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Tkthing/TKequipment.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/Tkthing/TKequipment.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/btn_buy.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/btn_buy.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/btn_dropbox.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/btn_dropbox.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/tab_off.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/tab_off.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/tab_on.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/Store/tab_on.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/16_setting.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/16_setting.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/Ellipse 775.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/Ellipse 775.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/Ellipse 776.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/Ellipse 776.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/Ellipse 779.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/Ellipse 779.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/RankBg.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/RankBg.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/Ranking_guage2.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/Ranking_guage2.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/Rectangle 5927.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/Rectangle 5927.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/Rectangle 5947.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/Rectangle 5947.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/Rectangle 5949.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/Rectangle 5949.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/bell-minus.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/bell-minus.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/bell-plus.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/bell-plus.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/ranking_guage.png
Binary file is not shown |
+++ VRTK/Assets/VRRes/VR_Step_Imgs/UI/ranking_guage.png.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/XR/Loaders/SimulationLoader.asset
This diff is skipped because there are too many other diffs. |
--- VRTK/Assets/VRRes/Shader/New Material.mat.meta
+++ VRTK/Assets/XR/Loaders/SimulationLoader.asset.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/XR/Resources.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/XR/Resources/XRSimulationRuntimeSettings.asset
This diff is skipped because there are too many other diffs. |
--- VRTK/Assets/VRRes/Shader/New Material.mat.meta
+++ VRTK/Assets/XR/Resources/XRSimulationRuntimeSettings.asset.meta
This diff is skipped because there are too many other diffs. |
--- VRTK/Assets/XR/Settings/OpenXR Package Settings.asset
+++ VRTK/Assets/XR/Settings/OpenXR Package Settings.asset
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/XR/Settings/XRSimulationSettings.asset
This diff is skipped because there are too many other diffs. |
--- VRTK/Assets/VRRes/Shader/New Material.mat.meta
+++ VRTK/Assets/XR/Settings/XRSimulationSettings.asset.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/XR/UserSimulationSettings.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/XR/UserSimulationSettings/Resources.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset
This diff is skipped because there are too many other diffs. |
--- VRTK/Assets/VRRes/Shader/New Material.mat.meta
+++ VRTK/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset.meta
This diff is skipped because there are too many other diffs. |
+++ VRTK/Assets/XR/UserSimulationSettings/SimulationEnvironmentAssetsManager.asset
This diff is skipped because there are too many other diffs. |
--- VRTK/Assets/VRRes/Shader/New Material.mat.meta
+++ VRTK/Assets/XR/UserSimulationSettings/SimulationEnvironmentAssetsManager.asset.meta
This diff is skipped because there are too many other diffs. |
--- VRTK/Assets/YetAnotherProgressBar/Materials/LitGreen.mat
+++ VRTK/Assets/YetAnotherProgressBar/Materials/LitGreen.mat
This diff is skipped because there are too many other diffs. |
--- VRTK/Bundle/Bundle
+++ VRTK/Bundle/Bundle
Binary file is not shown |
--- VRTK/Bundle/Bundle.manifest
+++ VRTK/Bundle/Bundle.manifest
This diff is skipped because there are too many other diffs. |
+++ VRTK/Bundle/mqdhtest
Binary file is not shown |
+++ VRTK/Bundle/mqdhtest.manifest
This diff is skipped because there are too many other diffs. |
--- VRTK/Bundle/vrobj/mirrorcustom
+++ VRTK/Bundle/vrobj/mirrorcustom
Binary file is not shown |
--- VRTK/Bundle/vrobj/mirrorcustom.manifest
+++ VRTK/Bundle/vrobj/mirrorcustom.manifest
This diff is skipped because there are too many other diffs. |
--- VRTK/Bundle/vrtaekwondo/go0003
+++ VRTK/Bundle/vrtaekwondo/go0003
Binary file is not shown |
--- VRTK/Bundle/vrtaekwondo/go0003.manifest
+++ VRTK/Bundle/vrtaekwondo/go0003.manifest
This diff is skipped because there are too many other diffs. |
--- VRTK/Bundle/vrui/vrui_belly
+++ VRTK/Bundle/vrui/vrui_belly
Binary file is not shown |
--- VRTK/Bundle/vrui/vrui_belly.manifest
+++ VRTK/Bundle/vrui/vrui_belly.manifest
This diff is skipped because there are too many other diffs. |
--- VRTK/Bundle/vrui/vrui_kpop
+++ VRTK/Bundle/vrui/vrui_kpop
Binary file is not shown |
--- VRTK/Bundle/vrui/vrui_kpop.manifest
+++ VRTK/Bundle/vrui/vrui_kpop.manifest
This diff is skipped because there are too many other diffs. |
--- VRTK/Bundle/vrui/vrui_tk
+++ VRTK/Bundle/vrui/vrui_tk
Binary file is not shown |
--- VRTK/Bundle/vrui/vrui_tk.manifest
+++ VRTK/Bundle/vrui/vrui_tk.manifest
This diff is skipped because there are too many other diffs. |
--- VRTK/Bundle/vrui/vruicommon
+++ VRTK/Bundle/vrui/vruicommon
Binary file is not shown |
--- VRTK/Bundle/vrui/vruicommon.manifest
+++ VRTK/Bundle/vrui/vruicommon.manifest
This diff is skipped because there are too many other diffs. |
--- VRTK/ProjectSettings/EditorBuildSettings.asset
+++ VRTK/ProjectSettings/EditorBuildSettings.asset
This diff is skipped because there are too many other diffs. |
--- VRTK/ProjectSettings/ProjectSettings.asset
+++ VRTK/ProjectSettings/ProjectSettings.asset
This diff is skipped because there are too many other diffs. |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?