diff --git a/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_ambientocclusion_1k.png b/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_ambientocclusion_1k.png index b1e5861f..4c0a71b9 100644 Binary files a/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_ambientocclusion_1k.png and b/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_ambientocclusion_1k.png differ diff --git a/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_color_1k.png b/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_color_1k.png index 95dfc5b7..7f39582e 100644 Binary files a/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_color_1k.png and b/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_color_1k.png differ diff --git a/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_height_1k.png b/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_height_1k.png index dbcf9562..a77404eb 100644 Binary files a/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_height_1k.png and b/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_height_1k.png differ diff --git a/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_normal_dx_1k.png b/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_normal_dx_1k.png index 53e2e7eb..e80ec02e 100644 Binary files a/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_normal_dx_1k.png and b/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_normal_dx_1k.png differ diff --git a/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_normal_gl_1k.png b/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_normal_gl_1k.png index 398f78b4..2c65c21e 100644 Binary files a/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_normal_gl_1k.png and b/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_normal_gl_1k.png differ diff --git a/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_roughness_1k.png b/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_roughness_1k.png index 2d3fe456..77c561c4 100644 Binary files a/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_roughness_1k.png and b/Blender/grass_with_rocks_01_1k/grass_with_rocks_01_roughness_1k.png differ diff --git a/Blender/lion.blend b/Blender/lion.blend index 13b4a6ba..74d2c294 100644 Binary files a/Blender/lion.blend and b/Blender/lion.blend differ diff --git a/Blender/stage.blend b/Blender/stage.blend index 91c10475..7586daeb 100644 Binary files a/Blender/stage.blend and b/Blender/stage.blend differ diff --git a/Blender/vintage-engrave-isolated-lion-set-260nw-2179771207.jpg b/Blender/vintage-engrave-isolated-lion-set-260nw-2179771207.jpg index 6fca0f18..ba66abac 100644 Binary files a/Blender/vintage-engrave-isolated-lion-set-260nw-2179771207.jpg and b/Blender/vintage-engrave-isolated-lion-set-260nw-2179771207.jpg differ diff --git a/pokeFight/Assets/AR/qrcode.png b/pokeFight/Assets/AR/qrcode.png index 00ccb9cb..9b32df52 100644 Binary files a/pokeFight/Assets/AR/qrcode.png and b/pokeFight/Assets/AR/qrcode.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/Materials/Concrete_Normal.tif b/pokeFight/Assets/MobileARTemplateAssets/Materials/Concrete_Normal.tif index 30494008..e5b1bafd 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/Materials/Concrete_Normal.tif and b/pokeFight/Assets/MobileARTemplateAssets/Materials/Concrete_Normal.tif differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/Tutorial/Images/ARMobileTemplateImage.png b/pokeFight/Assets/MobileARTemplateAssets/Tutorial/Images/ARMobileTemplateImage.png index db9b6c55..acd5d59d 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/Tutorial/Images/ARMobileTemplateImage.png and b/pokeFight/Assets/MobileARTemplateAssets/Tutorial/Images/ARMobileTemplateImage.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/Tutorial/Images/ARMobileThumbnailLarge.png b/pokeFight/Assets/MobileARTemplateAssets/Tutorial/Images/ARMobileThumbnailLarge.png index 2711b9b1..50ca9b1e 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/Tutorial/Images/ARMobileThumbnailLarge.png and b/pokeFight/Assets/MobileARTemplateAssets/Tutorial/Images/ARMobileThumbnailLarge.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/Tutorial/Images/MobileARTemplateImg.png b/pokeFight/Assets/MobileARTemplateAssets/Tutorial/Images/MobileARTemplateImg.png index a84a51de..daddd0ca 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/Tutorial/Images/MobileARTemplateImg.png and b/pokeFight/Assets/MobileARTemplateAssets/Tutorial/Images/MobileARTemplateImg.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Fonts/Inter-Regular.ttf b/pokeFight/Assets/MobileARTemplateAssets/UI/Fonts/Inter-Regular.ttf index 8c6943a4..0d8b854b 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Fonts/Inter-Regular.ttf and b/pokeFight/Assets/MobileARTemplateAssets/UI/Fonts/Inter-Regular.ttf differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/ActivationButtonOpaque.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/ActivationButtonOpaque.png index 1b88be6d..9d323630 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/ActivationButtonOpaque.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/ActivationButtonOpaque.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube.png index c3ec5707..a403b741 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Highlight.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Highlight.png index 865c2a20..8d2ca2cc 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Highlight.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Highlight.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Lift.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Lift.png index edf9ea78..41af101c 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Lift.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Lift.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Lift_Mask.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Lift_Mask.png index 9c50a2f7..a0bca850 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Lift_Mask.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Lift_Mask.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Mask.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Mask.png index 41446c7f..0dda2de4 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Mask.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Mask.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Move.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Move.png index 7258f0a6..16e3e329 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Move.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Move.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Rotate.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Rotate.png index 7f032f8a..d080b35b 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Rotate.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Cube_Rotate.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Debug.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Debug.png index 19346847..bd871a6c 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Debug.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Debug.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-DeleteStroke.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-DeleteStroke.png index 9a10fd0e..dd402768 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-DeleteStroke.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-DeleteStroke.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Editor.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Editor.png index 7b5386c6..5d59abde 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Editor.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Editor.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Gesture_PinchClose.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Gesture_PinchClose.png index f8ece2f6..f7af1207 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Gesture_PinchClose.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Gesture_PinchClose.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Gesture_PinchOpen.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Gesture_PinchOpen.png index c9ed8249..a3c2fb77 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Gesture_PinchOpen.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Gesture_PinchOpen.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Gesture_Touch.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Gesture_Touch.png index c03ed202..441b2916 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Gesture_Touch.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Gesture_Touch.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Gesture_TouchHold.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Gesture_TouchHold.png index b94fa0bc..fe9af5ed 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Gesture_TouchHold.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Gesture_TouchHold.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Gesture_TouchTwoFinger.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Gesture_TouchTwoFinger.png index 73ecfec6..93f8a1bf 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Gesture_TouchTwoFinger.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Gesture_TouchTwoFinger.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Hints.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Hints.png index 9841743c..3065b1c0 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Hints.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Hints.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-LiftAxisGizmo.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-LiftAxisGizmo.png index db18710e..e55876a3 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-LiftAxisGizmo.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-LiftAxisGizmo.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-MobileDevice.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-MobileDevice.png index ffb72d2a..b86932bd 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-MobileDevice.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-MobileDevice.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-MoveAxisGizmos.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-MoveAxisGizmos.png index 69534ad2..2e4578b8 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-MoveAxisGizmos.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-MoveAxisGizmos.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Options.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Options.png index 31ff5b85..d6c012b0 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Options.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Options.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-RotateAxisGizmo.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-RotateAxisGizmo.png index ed300a6c..7fcc06c9 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-RotateAxisGizmo.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-RotateAxisGizmo.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-ScaleAxisGizmo.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-ScaleAxisGizmo.png index c76a6ed3..06a6ded1 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-ScaleAxisGizmo.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-ScaleAxisGizmo.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Surface.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Surface.png index 604e42a7..5db6bb1a 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Surface.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Surface.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-SurfaceVisual.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-SurfaceVisual.png index 61f84260..b39db0e1 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-SurfaceVisual.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-SurfaceVisual.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Unity.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Unity.png index 5ce07556..a7be2bfd 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Unity.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/Icon-Unity.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/MixedCorners.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/MixedCorners.png index a4a82edf..7a613fc6 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/MixedCorners.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/MixedCorners.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/MixedCorners_1.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/MixedCorners_1.png index e96806bf..296d616e 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/MixedCorners_1.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/MixedCorners_1.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/RoundRadius_10_Bottom.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/RoundRadius_10_Bottom.png index 628978f3..864858f8 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/RoundRadius_10_Bottom.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/RoundRadius_10_Bottom.png differ diff --git a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/RoundRadius_10_Top.png b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/RoundRadius_10_Top.png index 19cfb5f3..45986df2 100644 Binary files a/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/RoundRadius_10_Top.png and b/pokeFight/Assets/MobileARTemplateAssets/UI/Sprites/RoundRadius_10_Top.png differ diff --git a/pokeFight/Assets/Models/Demon.fbx b/pokeFight/Assets/Models/Demon.fbx new file mode 100644 index 00000000..35b3ab8f --- /dev/null +++ b/pokeFight/Assets/Models/Demon.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6967518f766ff5d6c1d4d13f7c3a29763520aa43b7f2533b6cc1897d197a2baa +size 596300 diff --git a/pokeFight/Assets/Models/Material.mat b/pokeFight/Assets/Models/Material.mat new file mode 100644 index 00000000..116f26d8 --- /dev/null +++ b/pokeFight/Assets/Models/Material.mat @@ -0,0 +1,136 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Material + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _NORMALMAP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 797991851bfa52b489653842fabff143, type: 3} + m_Scale: {x: 4, y: 4} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: da143aa46ad8ba449b17eb018e49e92f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 4, y: 4} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 797991851bfa52b489653842fabff143, type: 3} + m_Scale: {x: 4, y: 4} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 2800000, guid: 29e8fbd316e91fa41b31c1239bf57070, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &181462768968131937 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/pokeFight/Assets/Models/Yeti.fbx b/pokeFight/Assets/Models/Yeti.fbx new file mode 100644 index 00000000..c8326603 --- /dev/null +++ b/pokeFight/Assets/Models/Yeti.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c6f459aa3c6cefb465ef708344964de55a04568368c77b83528e5dad9e53f04 +size 591788 diff --git a/pokeFight/Assets/Models/Zombie.fbx b/pokeFight/Assets/Models/Zombie.fbx new file mode 100644 index 00000000..0381fa35 --- /dev/null +++ b/pokeFight/Assets/Models/Zombie.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:687f852caf192acf4e9cee82fc05bfdf1e7a84282ef118255f9661b373ea2aee +size 604156 diff --git a/pokeFight/Assets/Models/grass_with_rocks_01_color_1k.png b/pokeFight/Assets/Models/grass_with_rocks_01_color_1k.png new file mode 100644 index 00000000..7f39582e --- /dev/null +++ b/pokeFight/Assets/Models/grass_with_rocks_01_color_1k.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:649f94304c14faa2e67fe1d835df127abb54cc4a3c08844ae21d8347dc94f8ca +size 2204204 diff --git a/pokeFight/Assets/Models/grass_with_rocks_01_normal_gl_1k.png b/pokeFight/Assets/Models/grass_with_rocks_01_normal_gl_1k.png new file mode 100644 index 00000000..2c65c21e --- /dev/null +++ b/pokeFight/Assets/Models/grass_with_rocks_01_normal_gl_1k.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b80d3880d4818198fed5d5b7430b9beac37a30cb4b312c718e5dcce7a8bc3f9a +size 2050958 diff --git a/pokeFight/Assets/Models/grass_with_rocks_01_roughness_1k.png b/pokeFight/Assets/Models/grass_with_rocks_01_roughness_1k.png new file mode 100644 index 00000000..77c561c4 --- /dev/null +++ b/pokeFight/Assets/Models/grass_with_rocks_01_roughness_1k.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:118863cec951c3eae8a8440c89f8009552f0fb72d4e0dacf29a73092050628c6 +size 837041 diff --git a/pokeFight/Assets/Models/stage.fbx b/pokeFight/Assets/Models/stage.fbx new file mode 100644 index 00000000..d05b3ab4 --- /dev/null +++ b/pokeFight/Assets/Models/stage.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a0a1207dfa3ed3f56496416e3ee1ce7481f3996f39c1bffda1e96423dee8e37 +size 5137836 diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Arch.fbx b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Arch.fbx index 712e25f6..7cc82a25 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Arch.fbx and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Arch.fbx differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Cube_Debug.fbx b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Cube_Debug.fbx index ecc79463..98c68e02 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Cube_Debug.fbx and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Cube_Debug.fbx differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Cylinder.fbx b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Cylinder.fbx index 107c67a3..bfe6b38a 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Cylinder.fbx and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Cylinder.fbx differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Pyramid.fbx b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Pyramid.fbx index 899e453c..74099ed7 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Pyramid.fbx and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Pyramid.fbx differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_RoundCube.fbx b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_RoundCube.fbx index b3071455..e07be345 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_RoundCube.fbx and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_RoundCube.fbx differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Torus.fbx b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Torus.fbx index 4a24f8ba..1f20ee4a 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Torus.fbx and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Torus.fbx differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Wedge.fbx b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Wedge.fbx index b4fdf648..5f1fcaa8 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Wedge.fbx and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Models/Primitive_Wedge.fbx differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Button - Circular BG.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Button - Circular BG.png index 64e757a5..e2e862d5 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Button - Circular BG.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Button - Circular BG.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Button - Rounded Highlight.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Button - Rounded Highlight.png index 509295ce..5778a67b 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Button - Rounded Highlight.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Button - Rounded Highlight.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Button - Rounded Radius - 4px.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Button - Rounded Radius - 4px.png index 2bbc296a..749a4e43 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Button - Rounded Radius - 4px.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Button - Rounded Radius - 4px.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Button - Rounded Square BG.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Button - Rounded Square BG.png index 81991473..fe07462a 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Button - Rounded Square BG.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Button - Rounded Square BG.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Create.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Create.png index d54338ea..acb383b7 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Create.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Create.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Delete.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Delete.png index 7521c181..cdc15596 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Delete.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Delete.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Arch.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Arch.png index 032685af..d6066a55 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Arch.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Arch.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Cylinder.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Cylinder.png index f4c01653..6f99d9bd 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Cylinder.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Cylinder.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Debug Cube.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Debug Cube.png index 18a82e5d..9c1ad379 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Debug Cube.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Debug Cube.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Pyramid.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Pyramid.png index c4ce993f..ff54dfbf 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Pyramid.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Pyramid.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Rounded Cube.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Rounded Cube.png index c16df299..95adf475 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Rounded Cube.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Rounded Cube.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Torus.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Torus.png index f766a871..79b41e3f 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Torus.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Torus.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Wedge.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Wedge.png index fcca9b8c..45c43ec6 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Wedge.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Sprites/Icon - Object - Wedge.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Textures/ConcreteNormal.tif b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Textures/ConcreteNormal.tif index 30494008..e5b1bafd 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Textures/ConcreteNormal.tif and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/ARDemoSceneAssets/Textures/ConcreteNormal.tif differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/Textures/PlanePatternDot.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/Textures/PlanePatternDot.png index d9fbf19f..6df12ca4 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/Textures/PlanePatternDot.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/AR Starter Assets/Textures/PlanePatternDot.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Audio/Button Pop.wav b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Audio/Button Pop.wav index 6bfed410..70e41692 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Audio/Button Pop.wav and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Audio/Button Pop.wav differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Blaster.fbx b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Blaster.fbx index 1af0ac7c..3550d763 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Blaster.fbx and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Blaster.fbx differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Blaster_Long.fbx b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Blaster_Long.fbx index 8066c6df..30485b29 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Blaster_Long.fbx and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Blaster_Long.fbx differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Cylinder.fbx b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Cylinder.fbx index 7e122fec..095cf200 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Cylinder.fbx and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Cylinder.fbx differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Pyramid.fbx b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Pyramid.fbx index b1e627d8..b7429403 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Pyramid.fbx and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Pyramid.fbx differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Tapered_Cylinder.fbx b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Tapered_Cylinder.fbx index 328056be..3133fc0a 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Tapered_Cylinder.fbx and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Tapered_Cylinder.fbx differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Torus.fbx b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Torus.fbx index 60c8be6b..b101788f 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Torus.fbx and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Torus.fbx differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Torus_Cut.fbx b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Torus_Cut.fbx index 0093ffd5..5655137f 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Torus_Cut.fbx and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/Primitive_Torus_Cut.fbx differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/PushButton.fbx b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/PushButton.fbx index 1e567bb9..ea0940fd 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/PushButton.fbx and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Models/PushButton.fbx differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Asset.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Asset.png index a2c96759..1a8fc549 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Asset.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Asset.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Checkmark.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Checkmark.png index 420a0b51..7619003a 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Checkmark.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Checkmark.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Circle_60x60 Outline 4.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Circle_60x60 Outline 4.png index def6bfd6..057dca14 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Circle_60x60 Outline 4.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Circle_60x60 Outline 4.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Circle_60x60_Horizontal.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Circle_60x60_Horizontal.png index 2193f736..19733084 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Circle_60x60_Horizontal.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Circle_60x60_Horizontal.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Forward.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Forward.png index f63c1fef..5ee16b9d 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Forward.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Forward.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/LegibilityMask.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/LegibilityMask.png index 902fa953..2e0217f9 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/LegibilityMask.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/LegibilityMask.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4 Outline.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4 Outline.png index 659cfd08..00fb9021 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4 Outline.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4 Outline.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4.png index 2bbc296a..749a4e43 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Textures/Concrete_Albedo.tif b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Textures/Concrete_Albedo.tif index 2e93426c..820c85ba 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Textures/Concrete_Albedo.tif and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Textures/Concrete_Albedo.tif differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Textures/Concrete_Metallic.tif b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Textures/Concrete_Metallic.tif index 48d0434a..1caf88a7 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Textures/Concrete_Metallic.tif and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Textures/Concrete_Metallic.tif differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Textures/Concrete_Normal.tif b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Textures/Concrete_Normal.tif index 30494008..e5b1bafd 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Textures/Concrete_Normal.tif and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/DemoSceneAssets/Textures/Concrete_Normal.tif differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/BlinkVisual.fbx b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/BlinkVisual.fbx index 6850048e..66c46bae 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/BlinkVisual.fbx and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/BlinkVisual.fbx differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/Pinch_Pointer_LOD0.fbx b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/Pinch_Pointer_LOD0.fbx index 75205f6e..c9ef6986 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/Pinch_Pointer_LOD0.fbx and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/Pinch_Pointer_LOD0.fbx differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/Primitive_Cylinder.fbx b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/Primitive_Cylinder.fbx index 15069f8a..385df032 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/Primitive_Cylinder.fbx and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/Primitive_Cylinder.fbx differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/Primitive_Wedge.fbx b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/Primitive_Wedge.fbx index 457da453..33bdb354 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/Primitive_Wedge.fbx and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/Primitive_Wedge.fbx differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/Reticle_Torus.fbx b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/Reticle_Torus.fbx index 60c8be6b..b101788f 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/Reticle_Torus.fbx and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/Reticle_Torus.fbx differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/UniversalController.fbx b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/UniversalController.fbx index bb95eba3..7e62e3ce 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/UniversalController.fbx and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Models/UniversalController.fbx differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Textures/DefaultMaterial_AO.png b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Textures/DefaultMaterial_AO.png index 937a0086..05da5ba9 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Textures/DefaultMaterial_AO.png and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Textures/DefaultMaterial_AO.png differ diff --git a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Tunneling Vignette/TunnelingVignetteHemisphere.fbx b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Tunneling Vignette/TunnelingVignetteHemisphere.fbx index 2d84e5ec..84243657 100644 Binary files a/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Tunneling Vignette/TunnelingVignetteHemisphere.fbx and b/pokeFight/Assets/Samples/XR Interaction Toolkit/3.0.4/Starter Assets/Tunneling Vignette/TunnelingVignetteHemisphere.fbx differ diff --git a/pokeFight/Assets/Scenes/FightScene.unity b/pokeFight/Assets/Scenes/FightScene.unity new file mode 100644 index 00000000..65a8c7d9 --- /dev/null +++ b/pokeFight/Assets/Scenes/FightScene.unity @@ -0,0 +1,810 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &175227209 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 175227210} + - component: {fileID: 175227216} + - component: {fileID: 175227215} + - component: {fileID: 175227214} + - component: {fileID: 175227213} + - component: {fileID: 175227212} + - component: {fileID: 175227211} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &175227210 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 175227209} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1274306623} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &175227211 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 175227209} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + quality: 3 + frameInfluence: 0.1 + jitterScale: 1 + mipBias: 0 + varianceClampScale: 0.9 + contrastAdaptiveSharpening: 0 +--- !u!114 &175227212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 175227209} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c2fadf230d1919748a9aa21d40f74619, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackingType: 0 + m_UpdateType: 0 + m_IgnoreTrackingState: 0 + m_PositionInput: + m_UseReference: 0 + m_Action: + m_Name: Position + m_Type: 0 + m_ExpectedControlType: Vector3 + m_Id: 80239789-0a42-49f1-bda9-71cd3363f12c + m_Processors: + m_Interactions: + m_SingletonActionBindings: + - m_Name: + m_Id: b37badb4-e0f0-489c-a8ba-9fdc69a958ee + m_Path: /centerEyePosition + m_Interactions: + m_Processors: + m_Groups: + m_Action: Position + m_Flags: 0 + - m_Name: + m_Id: 6192d9d9-d610-4409-bc9b-9c734fceade6 + m_Path: /devicePosition + m_Interactions: + m_Processors: + m_Groups: + m_Action: Position + m_Flags: 0 + m_Flags: 0 + m_Reference: {fileID: 0} + m_RotationInput: + m_UseReference: 0 + m_Action: + m_Name: Rotation + m_Type: 0 + m_ExpectedControlType: Quaternion + m_Id: be075c70-2a60-44ce-a6ec-89a66929a96e + m_Processors: + m_Interactions: + m_SingletonActionBindings: + - m_Name: + m_Id: 91660e29-75de-4248-a170-4f06f969e41b + m_Path: /centerEyeRotation + m_Interactions: + m_Processors: + m_Groups: + m_Action: Rotation + m_Flags: 0 + - m_Name: + m_Id: 89f86a2f-43ca-4d68-8556-bbbfbf545720 + m_Path: /deviceRotation + m_Interactions: + m_Processors: + m_Groups: + m_Action: Rotation + m_Flags: 0 + m_Flags: 0 + m_Reference: {fileID: 0} + m_TrackingStateInput: + m_UseReference: 0 + m_Action: + m_Name: Tracking State + m_Type: 0 + m_ExpectedControlType: Integer + m_Id: 96f314bb-89c3-416c-9200-2405b7e64278 + m_Processors: + m_Interactions: + m_SingletonActionBindings: + - m_Name: + m_Id: cc23a573-d8cf-4cdd-8ac9-58ab08558811 + m_Path: /trackingState + m_Interactions: + m_Processors: + m_Groups: + m_Action: Tracking State + m_Flags: 0 + m_Flags: 0 + m_Reference: {fileID: 0} + m_PositionAction: + m_Name: + m_Type: 0 + m_ExpectedControlType: + m_Id: 8fd350f1-183d-49d9-bcd4-d298d8538bdc + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_RotationAction: + m_Name: + m_Type: 0 + m_ExpectedControlType: + m_Id: 1770ed2c-17c8-4c95-bbf4-b844b293b1ce + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 +--- !u!114 &175227213 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 175227209} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 816b289ef451e094f9ae174fb4cf8db0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UseCustomMaterial: 0 + m_CustomMaterial: {fileID: 0} +--- !u!114 &175227214 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 175227209} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4966719baa26e4b0e8231a24d9bd491a, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FocusMode: -1 + m_LightEstimationMode: -1 + m_AutoFocus: 1 + m_LightEstimation: 0 + m_FacingDirection: 1 + m_RenderMode: 0 +--- !u!81 &175227215 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 175227209} + m_Enabled: 1 +--- !u!20 &175227216 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 175227209} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.1 + far clip plane: 20 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!1 &212138226 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 212138228} + - component: {fileID: 212138227} + m_Layer: 0 + m_Name: XR Interaction Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &212138227 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 212138226} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] +--- !u!4 &212138228 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 212138226} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &904959855 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 904959860} + - component: {fileID: 904959859} + - component: {fileID: 904959858} + - component: {fileID: 904959857} + - component: {fileID: 904959856} + m_Layer: 0 + m_Name: XR Origin (Mobile AR) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &904959856 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 904959855} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa17d122634046b4a8e23048891fafc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RaycastPrefab: {fileID: 0} +--- !u!114 &904959857 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 904959855} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e1760703bbd54c04488a8d10600262ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_PlanePrefab: {fileID: 1585201990951412, guid: 886609fc1566e4c27b399f1095d6de18, + type: 3} + m_DetectionMode: -1 +--- !u!114 &904959858 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 904959855} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 017c5e3933235514c9520e1dace2a4b2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ActionAssets: + - {fileID: -944628639613478452, guid: c348712bda248c246b8c49b3db54643f, type: 3} +--- !u!114 &904959859 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 904959855} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e0cb9aa70a22847b5925ee5f067c10a9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Camera: {fileID: 175227216} + m_OriginBaseGameObject: {fileID: 904959855} + m_CameraFloorOffsetObject: {fileID: 1274306622} + m_RequestedTrackingOriginMode: 1 + m_CameraYOffset: 0 +--- !u!4 &904959860 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 904959855} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1274306623} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1274306622 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1274306623} + m_Layer: 0 + m_Name: Camera Offset + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1274306623 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1274306622} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 175227210} + m_Father: {fileID: 904959860} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1577786142 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1577786146} + - component: {fileID: 1577786145} + - component: {fileID: 1577786144} + - component: {fileID: 1577786143} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &1577786143 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1577786142} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1577786144 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1577786142} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1577786145 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1577786142} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1577786146 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1577786142} + serializedVersion: 2 + m_LocalRotation: {x: 0.20577188, y: 0.1343615, z: -0.028534912, w: 0.9689121} + m_LocalPosition: {x: 0, y: 0, z: 2.1} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 23.98, y: 15.79, z: 0} +--- !u!1 &1843968059 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1843968061} + - component: {fileID: 1843968060} + - component: {fileID: 1843968062} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1843968060 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1843968059} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1843968061 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1843968059} + serializedVersion: 2 + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!114 &1843968062 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1843968059} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1843968061} + - {fileID: 212138228} + - {fileID: 904959860} + - {fileID: 1577786146} diff --git a/pokeFight/Assets/Settings/Project Configuration/TemplateImage.png b/pokeFight/Assets/Settings/Project Configuration/TemplateImage.png index 9386dcc6..2e0d4326 100644 Binary files a/pokeFight/Assets/Settings/Project Configuration/TemplateImage.png and b/pokeFight/Assets/Settings/Project Configuration/TemplateImage.png differ diff --git a/pokeFight/Assets/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf b/pokeFight/Assets/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf index c2ea2d27..1db4e05f 100644 Binary files a/pokeFight/Assets/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf and b/pokeFight/Assets/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf differ diff --git a/pokeFight/Assets/TextMesh Pro/Fonts/LiberationSans.ttf b/pokeFight/Assets/TextMesh Pro/Fonts/LiberationSans.ttf index 626dd936..0d896af6 100644 Binary files a/pokeFight/Assets/TextMesh Pro/Fonts/LiberationSans.ttf and b/pokeFight/Assets/TextMesh Pro/Fonts/LiberationSans.ttf differ diff --git a/pokeFight/Assets/TextMesh Pro/Sprites/EmojiOne.png b/pokeFight/Assets/TextMesh Pro/Sprites/EmojiOne.png index c0de66d0..63e49d09 100644 Binary files a/pokeFight/Assets/TextMesh Pro/Sprites/EmojiOne.png and b/pokeFight/Assets/TextMesh Pro/Sprites/EmojiOne.png differ diff --git a/pokeFight/UserSettings/Layouts/default-2022.dwlt b/pokeFight/UserSettings/Layouts/default-2022.dwlt index 92b7dbf0..da9b0a13 100644 --- a/pokeFight/UserSettings/Layouts/default-2022.dwlt +++ b/pokeFight/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 2560 height: 989 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Game m_RootView: {fileID: 3} m_MinSize: {x: 875, y: 321} m_MaxSize: {x: 10000, y: 10000} @@ -47,7 +47,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 44 + controlID: 48 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -143,7 +143,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 45 + controlID: 49 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -168,7 +168,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 46 + controlID: 50 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -193,7 +193,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 47 + controlID: 51 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -293,8 +293,8 @@ MonoBehaviour: y: 0 width: 545 height: 939 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 21} m_Panes: - {fileID: 21} @@ -553,9 +553,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 78810000 m_LastClickedID: 0 - m_ExpandedIDs: b0eaf7ff6eebf7ffdaf1f7ffee20f8ffa221f8ff0e28f8ff2a6ef8ffde6ef8ff4a75f8ff7e97f8ff3098f8ff9c9ef8ff58b7f8ff0cb8f8ff74bef8ffaae6f8ff5ee7f8ffcaedf8ff2cfff8ffec20faff0222faff6228faff48b3faff02b4faff52bafaff9ef6faff5010fbff0411fbff5217fbff4c62fbff0063fbff4e69fbffd2acfbff86adfbffd8b3fbffdc14fcff345efcffe45efcff3065fcffa8ebfcff7efafcff88fbfcff6afefcff6875fdff1e76fdff867bfdff7cc0fdfffef3fdff00f4fdff34f7fdffec1e0100721f0100f81f01000e200100262001001a34010044340100ce340100a2350100b8350100644a0100e64b0100004c0100b44c0100a85701002e59010044590100086501006a6501008e660100ec7a0100727c0100887c01007883010088830100528401008e850100b6a70100b2b20100f2bc01000ac50100f6d00100 + m_ExpandedIDs: 24fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1002,7 +1002,7 @@ MonoBehaviour: m_Fade: m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -1012,11 +1012,11 @@ MonoBehaviour: m_Rotation: m_Target: {x: 0.10680837, y: -0.8484407, z: 0.18750183, w: 0.48330492} speed: 2 - m_Value: {x: 0.10708949, y: -0.84771466, z: 0.18734139, w: 0.48457697} + m_Value: {x: 0.10680836, y: -0.8484406, z: 0.1875018, w: 0.48330486} m_Size: m_Target: 0.076969765 speed: 2 - m_Value: 0.8660254 + m_Value: 0.076969765 m_Ortho: m_Target: 1 speed: 2 @@ -1186,7 +1186,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Models/Zombie + - Assets/AR m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1194,16 +1194,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Models/Zombie + - Assets/AR m_LastFoldersGridSize: -1 m_LastProjectPath: G:\UnityProjects\pokeFight\pokeFight m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 62} - m_SelectedIDs: 887d0100 - m_LastClickedID: 97672 - m_ExpandedIDs: 00000000f24000003e4100008241000000ca9a3b + m_SelectedIDs: c4800000 + m_LastClickedID: 32964 + m_ExpandedIDs: 000000009c8000009e800000c080000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1231,7 +1231,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: + m_ExpandedIDs: 000000009c8000009e800000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: