diff --git a/Assets/Plugins/IngameDebugConsole.meta b/Assets/Plugins/IngameDebugConsole.meta deleted file mode 100644 index 36375af..0000000 --- a/Assets/Plugins/IngameDebugConsole.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5f8eae876be4b03438375a82d2c69b4d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Client Scenes/LoginScreen.unity b/Assets/Scenes/Client Scenes/LoginScreen.unity index 763d54f..00c6c1c 100644 --- a/Assets/Scenes/Client Scenes/LoginScreen.unity +++ b/Assets/Scenes/Client Scenes/LoginScreen.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1} + m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -918,12 +918,12 @@ RectTransform: m_Children: - {fileID: 57850659} m_Father: {fileID: 1065132349} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 140, y: -148.95001} - m_SizeDelta: {x: 220, y: 220} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &195337270 MonoBehaviour: @@ -946,7 +946,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 646862b25587b8746a611e12b6d27479, type: 3} - m_Type: 0 + m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1055,8 +1055,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 383.95, y: -378.95} - m_SizeDelta: {x: 220, y: 220} + m_AnchoredPosition: {x: 350, y: -372.5} + m_SizeDelta: {x: 210, y: 210} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &240721845 MonoBehaviour: @@ -1385,7 +1385,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &425791971 RectTransform: m_ObjectHideFlags: 0 @@ -1483,6 +1483,139 @@ RectTransform: m_AnchoredPosition: {x: -0.0018310547, y: 73.92697} m_SizeDelta: {x: 0.19995117, y: 147.85999} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &547497590 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 547497591} + - component: {fileID: 547497594} + - component: {fileID: 547497593} + - component: {fileID: 547497592} + m_Layer: 0 + m_Name: Bear + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &547497591 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 547497590} + 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_Children: + - {fileID: 1693261943} + m_Father: {fileID: 1065132349} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &547497592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 547497590} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 2109663825, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 547497593} + toggleTransition: 1 + graphic: {fileID: 1693261944} + m_Group: {fileID: 1157788719} + onValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 872212411} + m_MethodName: OnClick_Animal + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Bear + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null + m_IsOn: 0 +--- !u!114 &547497593 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 547497590} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 55c1a1507eefa6e44ab67e4e4a4d25f7, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &547497594 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 547497590} + m_CullTransparentMesh: 0 --- !u!1 &560892411 GameObject: m_ObjectHideFlags: 0 @@ -1515,12 +1648,12 @@ RectTransform: m_Children: - {fileID: 627725015} m_Father: {fileID: 1065132349} - m_RootOrder: 7 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 830, y: -378.95} - m_SizeDelta: {x: 220, y: 220} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &560892413 MonoBehaviour: @@ -1543,7 +1676,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 62a24cfa29332d84f9e0df87f6e2f7a6, type: 3} - m_Type: 0 + m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1842,8 +1975,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 383.95, y: -148.95001} - m_SizeDelta: {x: 220, y: 220} + m_AnchoredPosition: {x: 350, y: -152.5} + m_SizeDelta: {x: 210, y: 210} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &666970021 MonoBehaviour: @@ -2865,12 +2998,12 @@ RectTransform: m_Children: - {fileID: 1282132977} m_Father: {fileID: 1065132349} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 830, y: -148.95001} - m_SizeDelta: {x: 220, y: 220} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &855649912 MonoBehaviour: @@ -2893,7 +3026,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 38d98c61457c32b4d8345f9bbf702a2c, type: 3} - m_Type: 0 + m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3269,12 +3402,12 @@ RectTransform: m_Children: - {fileID: 1634407490} m_Father: {fileID: 1065132349} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 370, y: -148.95001} - m_SizeDelta: {x: 220, y: 220} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &898002912 MonoBehaviour: @@ -3297,7 +3430,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 9de33438c8c67974bbaaa82aac912234, type: 3} - m_Type: 0 + m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -4091,6 +4224,78 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1011849905} m_CullTransparentMesh: 0 +--- !u!1 &1015103070 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1015103071} + - component: {fileID: 1015103073} + - component: {fileID: 1015103072} + m_Layer: 0 + m_Name: RawImage (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1015103071 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1015103070} + 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_Children: [] + m_Father: {fileID: 1538349652} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1015103072 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1015103070} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.62352943, g: 0.62352943, b: 0.62352943, a: 0.5019608} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1015103073 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1015103070} + m_CullTransparentMesh: 0 --- !u!1 &1024423074 GameObject: m_ObjectHideFlags: 0 @@ -4158,21 +4363,25 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 547497591} - {fileID: 195337269} - {fileID: 898002911} + - {fileID: 1732326324} - {fileID: 1377053471} - {fileID: 855649911} + - {fileID: 1688087341} - {fileID: 2094861235} - {fileID: 1802975490} - - {fileID: 1611512229} - {fileID: 560892412} + - {fileID: 1611512229} + - {fileID: 1538349652} m_Father: {fileID: 1157788717} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 262.2} - m_SizeDelta: {x: 970, y: 527.9} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -25} + m_SizeDelta: {x: 1700, y: 525} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1065132350 MonoBehaviour: @@ -4231,8 +4440,8 @@ MonoBehaviour: m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 220, y: 220} - m_Spacing: {x: 10, y: 10} + m_CellSize: {x: 240, y: 240} + m_Spacing: {x: 35, y: 15} m_Constraint: 0 m_ConstraintCount: 2 --- !u!1 &1102740751 @@ -4531,8 +4740,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1325, y: -450} - m_SizeDelta: {x: 970, y: 579} + m_AnchoredPosition: {x: 890, y: -450} + m_SizeDelta: {x: 1700, y: 575} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1157788718 CanvasRenderer: @@ -4663,8 +4872,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 613.95, y: -148.95001} - m_SizeDelta: {x: 220, y: 220} + m_AnchoredPosition: {x: 570, y: -152.5} + m_SizeDelta: {x: 210, y: 210} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1239738594 MonoBehaviour: @@ -4905,8 +5114,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 613.95, y: -378.95} - m_SizeDelta: {x: 220, y: 220} + m_AnchoredPosition: {x: 570, y: -372.5} + m_SizeDelta: {x: 210, y: 210} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1298967953 MonoBehaviour: @@ -5266,12 +5475,12 @@ RectTransform: m_Children: - {fileID: 768183173} m_Father: {fileID: 1065132349} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 600, y: -148.95001} - m_SizeDelta: {x: 220, y: 220} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1377053472 MonoBehaviour: @@ -5294,7 +5503,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 205328b663f2e5c418fde3d0058033a3, type: 3} - m_Type: 0 + m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -6057,10 +6266,10 @@ RectTransform: m_Father: {fileID: 2121972508} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 383.5, y: 262.2} - m_SizeDelta: {x: 767.9, y: 527.9} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -25} + m_SizeDelta: {x: 700, y: 525} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1490570092 MonoBehaviour: @@ -6119,7 +6328,7 @@ MonoBehaviour: m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 220, y: 220} + m_CellSize: {x: 210, y: 210} m_Spacing: {x: 10, y: 10} m_Constraint: 0 m_ConstraintCount: 2 @@ -6195,7 +6404,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1492513520} m_CullTransparentMesh: 0 ---- !u!1 &1575157124 +--- !u!1 &1538349651 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6203,48 +6412,181 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1575157125} - - component: {fileID: 1575157127} - - component: {fileID: 1575157126} + - component: {fileID: 1538349652} + - component: {fileID: 1538349655} + - component: {fileID: 1538349654} + - component: {fileID: 1538349653} m_Layer: 0 - m_Name: txt_Port + m_Name: Turtle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1575157125 +--- !u!224 &1538349652 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1575157124} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1538349651} + 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_Children: [] - m_Father: {fileID: 1245163967} - m_RootOrder: 0 + m_Children: + - {fileID: 1015103071} + m_Father: {fileID: 1065132349} + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100.51074, y: -24.999977} - m_SizeDelta: {x: 200, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1575157126 +--- !u!114 &1538349653 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1575157124} + m_GameObject: {fileID: 1538349651} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 2109663825, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1538349654} + toggleTransition: 1 + graphic: {fileID: 1015103072} + m_Group: {fileID: 1157788719} + onValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 872212411} + m_MethodName: OnClick_Animal + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Turtle + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null + m_IsOn: 0 +--- !u!114 &1538349654 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1538349651} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 0d9f7b5162c367348956987ee2875a9e, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &1538349655 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1538349651} + m_CullTransparentMesh: 0 +--- !u!1 &1575157124 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1575157125} + - component: {fileID: 1575157127} + - component: {fileID: 1575157126} + m_Layer: 0 + m_Name: txt_Port + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1575157125 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1575157124} + 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_Children: [] + m_Father: {fileID: 1245163967} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 100.51074, y: -24.999977} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1575157126 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1575157124} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: @@ -6501,7 +6843,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1584683394 RectTransform: m_ObjectHideFlags: 0 @@ -6593,12 +6935,12 @@ RectTransform: m_Children: - {fileID: 1419065202} m_Father: {fileID: 1065132349} - m_RootOrder: 6 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 600, y: -378.95} - m_SizeDelta: {x: 220, y: 220} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1611512230 MonoBehaviour: @@ -6621,7 +6963,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: b68fb654cef55874d98162a4b06cfc24, type: 3} - m_Type: 0 + m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -6874,8 +7216,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 153.95001, y: -378.95} - m_SizeDelta: {x: 220, y: 220} + m_AnchoredPosition: {x: 130, y: -372.5} + m_SizeDelta: {x: 210, y: 210} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1639010721 MonoBehaviour: @@ -6934,28 +7276,308 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_IsOn: 0 ---- !u!114 &1639010722 +--- !u!114 &1639010722 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1639010719} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.18039216, g: 0.4901961, b: 0.19607845, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &1639010723 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1639010719} + m_CullTransparentMesh: 0 +--- !u!1 &1665905654 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1665905655} + - component: {fileID: 1665905657} + - component: {fileID: 1665905656} + m_Layer: 0 + m_Name: Blue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1665905655 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1665905654} + 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_Children: + - {fileID: 910932171} + m_Father: {fileID: 1377133506} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -16.2} + m_SizeDelta: {x: 0, y: -32.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1665905656 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1665905654} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.011764707, g: 0.60784316, b: 0.8980393, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &1665905657 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1665905654} + m_CullTransparentMesh: 0 +--- !u!1 &1672068043 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1672068044} + - component: {fileID: 1672068046} + - component: {fileID: 1672068045} + m_Layer: 0 + m_Name: RawImage (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1672068044 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1672068043} + 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_Children: [] + m_Father: {fileID: 2094861235} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1672068045 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1672068043} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.62352943, g: 0.62352943, b: 0.62352943, a: 0.5019608} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1672068046 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1672068043} + m_CullTransparentMesh: 0 +--- !u!1 &1688087340 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1688087341} + - component: {fileID: 1688087344} + - component: {fileID: 1688087343} + - component: {fileID: 1688087342} + m_Layer: 0 + m_Name: Goat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1688087341 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1688087340} + 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_Children: + - {fileID: 1813189696} + m_Father: {fileID: 1065132349} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1688087342 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1688087340} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 2109663825, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1688087343} + toggleTransition: 1 + graphic: {fileID: 1813189697} + m_Group: {fileID: 1157788719} + onValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 872212411} + m_MethodName: OnClick_Animal + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Goat + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null + m_IsOn: 0 +--- !u!114 &1688087343 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1639010719} + m_GameObject: {fileID: 1688087340} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.18039216, g: 0.4901961, b: 0.19607845, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 5e7567e2c56dec04fa3f9ddd03d78f1b, type: 3} + m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -6963,15 +7585,15 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!222 &1639010723 +--- !u!222 &1688087344 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1639010719} + m_GameObject: {fileID: 1688087340} m_CullTransparentMesh: 0 ---- !u!1 &1665905654 +--- !u!1 &1693261942 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6979,74 +7601,71 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1665905655} - - component: {fileID: 1665905657} - - component: {fileID: 1665905656} + - component: {fileID: 1693261943} + - component: {fileID: 1693261945} + - component: {fileID: 1693261944} m_Layer: 0 - m_Name: Blue + m_Name: RawImage (7) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1665905655 +--- !u!224 &1693261943 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1665905654} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 1693261942} + 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_Children: - - {fileID: 910932171} - m_Father: {fileID: 1377133506} + m_Children: [] + m_Father: {fileID: 547497591} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -16.2} - m_SizeDelta: {x: 0, y: -32.3} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1665905656 +--- !u!114 &1693261944 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1665905654} + m_GameObject: {fileID: 1693261942} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.011764707, g: 0.60784316, b: 0.8980393, a: 1} + m_Color: {r: 0.62352943, g: 0.62352943, b: 0.62352943, a: 0.5019608} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1665905657 + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1693261945 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1665905654} + m_GameObject: {fileID: 1693261942} m_CullTransparentMesh: 0 ---- !u!1 &1672068043 +--- !u!1 &1724179260 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7054,28 +7673,28 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1672068044} - - component: {fileID: 1672068046} - - component: {fileID: 1672068045} + - component: {fileID: 1724179261} + - component: {fileID: 1724179263} + - component: {fileID: 1724179262} m_Layer: 0 - m_Name: RawImage (5) + m_Name: RawImage (8) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1672068044 +--- !u!224 &1724179261 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1672068043} + m_GameObject: {fileID: 1724179260} 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_Children: [] - m_Father: {fileID: 2094861235} + m_Father: {fileID: 1732326324} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -7083,13 +7702,13 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1672068045 +--- !u!114 &1724179262 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1672068043} + m_GameObject: {fileID: 1724179260} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -7110,13 +7729,146 @@ MonoBehaviour: y: 0 width: 1 height: 1 ---- !u!222 &1672068046 +--- !u!222 &1724179263 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1672068043} + m_GameObject: {fileID: 1724179260} + m_CullTransparentMesh: 0 +--- !u!1 &1732326323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1732326324} + - component: {fileID: 1732326327} + - component: {fileID: 1732326326} + - component: {fileID: 1732326325} + m_Layer: 0 + m_Name: Deer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1732326324 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1732326323} + 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_Children: + - {fileID: 1724179261} + m_Father: {fileID: 1065132349} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1732326325 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1732326323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 2109663825, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1732326326} + toggleTransition: 1 + graphic: {fileID: 1724179262} + m_Group: {fileID: 1157788719} + onValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 872212411} + m_MethodName: OnClick_Animal + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Deer + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null + m_IsOn: 0 +--- !u!114 &1732326326 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1732326323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 7ce8ec7ac654a0e4eb770336db965a74, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &1732326327 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1732326323} m_CullTransparentMesh: 0 --- !u!1 &1758508945 GameObject: @@ -7310,12 +8062,12 @@ RectTransform: m_Children: - {fileID: 1621663292} m_Father: {fileID: 1065132349} - m_RootOrder: 5 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 370, y: -378.95} - m_SizeDelta: {x: 220, y: 220} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1802975491 MonoBehaviour: @@ -7337,8 +8089,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 2fbadfac53f6550458d973ce1d9d15a4, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 57789d45e132d69409490cd356bf43cd, type: 3} + m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -7411,6 +8163,78 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_IsOn: 0 +--- !u!1 &1813189695 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1813189696} + - component: {fileID: 1813189698} + - component: {fileID: 1813189697} + m_Layer: 0 + m_Name: RawImage (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1813189696 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1813189695} + 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_Children: [] + m_Father: {fileID: 1688087341} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1813189697 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1813189695} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.62352943, g: 0.62352943, b: 0.62352943, a: 0.5019608} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1813189698 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1813189695} + m_CullTransparentMesh: 0 --- !u!1 &1885492952 GameObject: m_ObjectHideFlags: 0 @@ -7447,8 +8271,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 153.95001, y: -148.95001} - m_SizeDelta: {x: 220, y: 220} + m_AnchoredPosition: {x: 130, y: -152.5} + m_SizeDelta: {x: 210, y: 210} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1885492954 MonoBehaviour: @@ -7979,12 +8803,12 @@ RectTransform: m_Children: - {fileID: 1672068044} m_Father: {fileID: 1065132349} - m_RootOrder: 4 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 140, y: -378.95} - m_SizeDelta: {x: 220, y: 220} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2094861236 MonoBehaviour: @@ -8007,7 +8831,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 43f34d7517e5975419b5c225736986e6, type: 3} - m_Type: 0 + m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -8097,7 +8921,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2121972508 RectTransform: m_ObjectHideFlags: 0 @@ -8116,8 +8940,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 417.51, y: -450} - m_SizeDelta: {x: 765, y: 579} + m_AnchoredPosition: {x: 390, y: -450} + m_SizeDelta: {x: 700, y: 575} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2121972509 CanvasRenderer: diff --git a/Assets/Scenes/ColourCollide_Smaller.unity b/Assets/Scenes/ColourCollide_Smaller.unity index 70b976c..c14d0aa 100644 --- a/Assets/Scenes/ColourCollide_Smaller.unity +++ b/Assets/Scenes/ColourCollide_Smaller.unity @@ -1043,7 +1043,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 - m_IsActive: 1 + m_IsActive: 0 --- !u!23 &200105990 MeshRenderer: m_ObjectHideFlags: 0 @@ -2659,7 +2659,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &460731874 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Scoreboards.unity b/Assets/Scenes/Scoreboards.unity index d41ddb2..bee7b2f 100644 --- a/Assets/Scenes/Scoreboards.unity +++ b/Assets/Scenes/Scoreboards.unity @@ -1116,6 +1116,11 @@ PrefabInstance: propertyPath: m_Name value: Menu Background objectReference: {fileID: 0} + - target: {fileID: 1623985465130001500, guid: 8949cac80f422db4b905533098fbfaec, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1623985465130001499, guid: 8949cac80f422db4b905533098fbfaec, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scenes/Server Scenes/Lobby.unity b/Assets/Scenes/Server Scenes/Lobby.unity index 6310906..4a7a3f2 100644 --- a/Assets/Scenes/Server Scenes/Lobby.unity +++ b/Assets/Scenes/Server Scenes/Lobby.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1} + m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1271,7 +1271,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 220b4889c8b3f7b4f84286ba8773e1b6, type: 3} m_Name: m_EditorClassIdentifier: - Port: 2222 + Port: 80 StartServerOnAwake: 1 Server: {fileID: 11400000, guid: aba6c842adfc9904dba334cb48257361, type: 2} --- !u!4 &1421753750 diff --git a/Assets/Scenes/TuteLevelFive.unity b/Assets/Scenes/TuteLevelFive.unity index bf32e4e..e93a174 100644 --- a/Assets/Scenes/TuteLevelFive.unity +++ b/Assets/Scenes/TuteLevelFive.unity @@ -1291,7 +1291,7 @@ PrefabInstance: - target: {fileID: 5195354181466942482, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6048124330666411029, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} @@ -1425,7 +1425,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: -101.69998 objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_AnchoredPosition.x @@ -1433,7 +1433,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000016973769 + value: -0.000030517578 objectReference: {fileID: 0} - target: {fileID: 1999985796916391521, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} @@ -7781,7 +7781,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1061892581} m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 5, y: 4, z: -10} + m_LocalPosition: {x: 5, y: 50, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -11846,7 +11846,7 @@ Transform: m_GameObject: {fileID: 1556019605} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.64, y: 0.2, z: 0.34} - m_LocalScale: {x: 3, y: 1, z: 1} + m_LocalScale: {x: 4, y: 4, z: 4} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 8 @@ -13191,7 +13191,7 @@ PrefabInstance: - target: {fileID: 6379596649083080720, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} diff --git a/Assets/Scenes/TuteLevelFour.unity b/Assets/Scenes/TuteLevelFour.unity index 083af01..6063907 100644 --- a/Assets/Scenes/TuteLevelFour.unity +++ b/Assets/Scenes/TuteLevelFour.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1} + m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -675,7 +675,7 @@ PrefabInstance: - target: {fileID: 6379596649083080720, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} @@ -2782,7 +2782,7 @@ PrefabInstance: - target: {fileID: 5195354181466942482, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6048124330666411029, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} @@ -2916,11 +2916,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: -101.69998 objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000027255839 + value: -0.000038146973 + objectReference: {fileID: 0} + - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.000047551825 objectReference: {fileID: 0} - target: {fileID: 4043978199840302704, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} diff --git a/Assets/Scenes/TuteLevelOne.unity b/Assets/Scenes/TuteLevelOne.unity index c5c21f1..fc304ee 100644 --- a/Assets/Scenes/TuteLevelOne.unity +++ b/Assets/Scenes/TuteLevelOne.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1} + m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -127,7 +127,7 @@ PrefabInstance: - target: {fileID: 5195354181466942482, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6048124330666411029, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} @@ -261,25 +261,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.0000053478443 + value: -0.000030517578 objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: -101.69998 objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.0000134155825 - objectReference: {fileID: 0} - - target: {fileID: 4043978199840302704, guid: 47297317c21fe8a4c91caa79d00cc9a6, - type: 3} - propertyPath: m_havePropertiesChanged - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4043978199840302704, guid: 47297317c21fe8a4c91caa79d00cc9a6, - type: 3} - propertyPath: m_isInputParsingRequired - value: 0 + value: -0.000045705332 objectReference: {fileID: 0} - target: {fileID: 1999985796916391521, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} @@ -296,6 +286,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 86 objectReference: {fileID: 0} + - target: {fileID: 4043978199840302704, guid: 47297317c21fe8a4c91caa79d00cc9a6, + type: 3} + propertyPath: m_havePropertiesChanged + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4043978199840302704, guid: 47297317c21fe8a4c91caa79d00cc9a6, + type: 3} + propertyPath: m_isInputParsingRequired + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} --- !u!1001 &19108096 @@ -2651,6 +2651,16 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: blockReader.LogicChain.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} propertyPath: nextScene @@ -2743,16 +2753,6 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} - - target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a, - type: 3} - propertyPath: blockReader.LogicChain.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} --- !u!114 &1271739762 stripped @@ -4133,7 +4133,17 @@ PrefabInstance: - target: {fileID: 6379596649083080720, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_havePropertiesChanged + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_isInputParsingRequired + value: 0 objectReference: {fileID: 0} - target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} @@ -4260,15 +4270,35 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1425704337} - - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + - target: {fileID: 6379596649083080723, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} - propertyPath: m_havePropertiesChanged + propertyPath: m_MatchWidthOrHeight value: 0 objectReference: {fileID: 0} - - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + - target: {fileID: 7589238259672119554, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} - propertyPath: m_isInputParsingRequired - value: 0 + propertyPath: m_AnchoredPosition.y + value: 111 + objectReference: {fileID: 0} + - target: {fileID: 6379596649530639660, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -39 + objectReference: {fileID: 0} + - target: {fileID: 6379596650567274008, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 11.000008 + objectReference: {fileID: 0} + - target: {fileID: 7589238259402917140, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_SizeDelta.y + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 7589238259402917140, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -169 objectReference: {fileID: 0} - target: {fileID: 7589238260332146723, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} @@ -4300,36 +4330,6 @@ PrefabInstance: propertyPath: m_fontSizeBase value: 60 objectReference: {fileID: 0} - - target: {fileID: 6379596649083080723, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_MatchWidthOrHeight - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7589238259672119554, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 111 - objectReference: {fileID: 0} - - target: {fileID: 6379596649530639660, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -39 - objectReference: {fileID: 0} - - target: {fileID: 6379596650567274008, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 11.000008 - objectReference: {fileID: 0} - - target: {fileID: 7589238259402917140, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_SizeDelta.y - value: 75 - objectReference: {fileID: 0} - - target: {fileID: 7589238259402917140, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -169 - objectReference: {fileID: 0} - target: {fileID: 7589238260184858646, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} propertyPath: m_Sprite diff --git a/Assets/Scenes/TuteLevelThree.unity b/Assets/Scenes/TuteLevelThree.unity index 257fc08..4ad6748 100644 --- a/Assets/Scenes/TuteLevelThree.unity +++ b/Assets/Scenes/TuteLevelThree.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1} + m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -238,7 +238,7 @@ PrefabInstance: type: 3} propertyPath: m_text value: "In this level you will learn how to use the \nrotate right block, a - rotate rightblock allows your character to rotate right in place\ndrag and + rotate right block allows your character to rotate right in place\ndrag and drop the rotate right block to the tray then\nclick play to watch the character move" objectReference: {fileID: 0} @@ -255,17 +255,17 @@ PrefabInstance: - target: {fileID: 3718319460811201030, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} propertyPath: m_textInfo.characterCount - value: 224 + value: 225 objectReference: {fileID: 0} - target: {fileID: 3718319460811201030, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} propertyPath: m_textInfo.spaceCount - value: 42 + value: 43 objectReference: {fileID: 0} - target: {fileID: 3718319460811201030, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} propertyPath: m_textInfo.wordCount - value: 42 + value: 43 objectReference: {fileID: 0} - target: {fileID: 3718319461203907366, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3} @@ -3996,6 +3996,11 @@ PrefabInstance: propertyPath: m_Name value: Single_Player Canvas objectReference: {fileID: 0} + - target: {fileID: 5195354181466942482, guid: 47297317c21fe8a4c91caa79d00cc9a6, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6048124330666411029, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: character @@ -4128,11 +4133,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: -101.69998 objectReference: {fileID: 0} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000015645546 + value: -0.000022888184 + objectReference: {fileID: 0} + - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.00004660575 objectReference: {fileID: 0} - target: {fileID: 1999985796916391521, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} @@ -6779,7 +6788,7 @@ PrefabInstance: - target: {fileID: 6379596649083080720, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, type: 3} diff --git a/Assets/Scenes/UI_TestScene.unity b/Assets/Scenes/UI_TestScene.unity index e9cac77..6782bd2 100644 --- a/Assets/Scenes/UI_TestScene.unity +++ b/Assets/Scenes/UI_TestScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -216,8 +216,8 @@ Camera: m_GameObject: {fileID: 1352513146} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 0.011480933, g: 0.7870813, b: 0.8113208, a: 0} + m_ClearFlags: 1 + m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0} m_projectionMatrixMode: 1 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} @@ -257,7 +257,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1352513146} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalPosition: {x: 0, y: 1, z: -3} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -341,6 +341,11 @@ PrefabInstance: propertyPath: m_Name value: Player Canvas objectReference: {fileID: 0} + - target: {fileID: 5195354182462625300, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5195354182462625304, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} propertyPath: m_LocalPosition.x @@ -464,12 +469,12 @@ PrefabInstance: - target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.0000000069480643 + value: -0.000015258789 objectReference: {fileID: 0} - target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: -101.69998 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f, type: 3} diff --git a/Assets/Scripts/Networking/Server/ServerObject.cs b/Assets/Scripts/Networking/Server/ServerObject.cs index 1c65705..3c888ad 100644 --- a/Assets/Scripts/Networking/Server/ServerObject.cs +++ b/Assets/Scripts/Networking/Server/ServerObject.cs @@ -1,4 +1,5 @@ -using System.Collections; +using System; +using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.Networking; @@ -19,6 +20,8 @@ namespace Networking.Server { [SerializeField] private ClientList LoginHandler; + public bool useWebSockets; + #endregion Inspector Fields @@ -33,6 +36,7 @@ namespace Networking.Server { LoginHandler.DisconnectedClients = new List(); Debug.Log("Starting Server on " + port); server = new NetworkServerSimple(); + server.useWebSockets = useWebSockets; server.Configure(TransportConfigure.CreateConfigure(),32); diff --git a/Assets/Scripts/UI/Client/LoginUIManager.cs b/Assets/Scripts/UI/Client/LoginUIManager.cs index f052c41..0552f59 100644 --- a/Assets/Scripts/UI/Client/LoginUIManager.cs +++ b/Assets/Scripts/UI/Client/LoginUIManager.cs @@ -162,6 +162,72 @@ public class LoginUIManager : MonoBehaviour { UnityEngine.SceneManagement.SceneManager.LoadScene(SceneToLoad); } + + public void getPlayerColour(string playerAnimal) + { + Color newColor = new Color(); + string hex = "#000000"; + switch (playerAnimal) + { + case "Bear": + hex = "#C62828"; + break; + case "Cat": + hex = "#1565C0"; + break; + case "Cow": + hex = "#EC407A"; + break; + case "Deer": + hex = "#1565C0"; + break; + case "Dog": + hex = "#1565C0"; + break; + case "Fox": + hex = "#1565C0"; + break; + case "Goat": + hex = "#1565C0"; + break; + case "Horse": + hex = "#1565C0"; + break; + case "Lion": + hex = "#1565C0"; + break; + case "Lizard": + hex = "#1565C0"; + break; + case "Panda": + hex = "#1565C0"; + break; + case "Pig": + hex = "#1565C0"; + break; + case "Sheep": + hex = "#1565C0"; + break; + case "Turtle": + hex = "#1565C0"; + break; + case "Wolf": + hex = "#1565C0"; + break; + case "Zebra": + hex = "#1565C0"; + break; + + default: + + break; + } + if (ColorUtility.TryParseHtmlString(hex, out newColor)) + { + this.playerColor = newColor; + colorSelected = true; + } + } #endregion UI Functionality #region Helper Functions diff --git a/Assets/Textures/AnimalSprites/cat.png b/Assets/Textures/AnimalSprites/cat.png index e87b8d7..60f5bcd 100644 --- a/Assets/Textures/AnimalSprites/cat.png +++ b/Assets/Textures/AnimalSprites/cat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6eea09e647b4d2f310088f8db18dfc538eddfe8ec229c62d52c0c6f8ffe63f3 -size 25113 +oid sha256:9c412948bd86a12ee1116eb863a5f0a0e0bb24b95dac63a8a16b78617d6614f7 +size 38159 diff --git a/Assets/Textures/AnimalSprites/cat.png.meta b/Assets/Textures/AnimalSprites/cat.png.meta index 45f850e..2d77805 100644 --- a/Assets/Textures/AnimalSprites/cat.png.meta +++ b/Assets/Textures/AnimalSprites/cat.png.meta @@ -41,12 +41,12 @@ TextureImporter: lightmap: 0 compressionQuality: 50 spriteMode: 1 - spriteExtrude: 1 + spriteExtrude: 0 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 150, y: 50, z: 150, w: 50} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -141,7 +141,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e3d52987c3699c43953f8ce24bcfd87 vertices: [] indices: edges: [] diff --git a/Assets/Textures/AnimalSprites/cow.png b/Assets/Textures/AnimalSprites/cow.png index 4440952..c1cc68a 100644 --- a/Assets/Textures/AnimalSprites/cow.png +++ b/Assets/Textures/AnimalSprites/cow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1d93339ca540bea59a5d11d00ea7427b120539740d0153cf12adbc900f2bdd4 -size 35307 +oid sha256:19022b5817d645e012c754fe3c4ef929e45bf5b20f312031cb8f7cb505cc01e4 +size 40139 diff --git a/Assets/Textures/AnimalSprites/cow.png.meta b/Assets/Textures/AnimalSprites/cow.png.meta index fd79c13..2038db9 100644 --- a/Assets/Textures/AnimalSprites/cow.png.meta +++ b/Assets/Textures/AnimalSprites/cow.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 150, y: 50, z: 150, w: 50} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -141,7 +141,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: fa4e3215426d6704f9184c2bc8d29b1d vertices: [] indices: edges: [] diff --git a/Assets/Textures/AnimalSprites/dog.png b/Assets/Textures/AnimalSprites/dog.png index c488a4a..e4cf693 100644 --- a/Assets/Textures/AnimalSprites/dog.png +++ b/Assets/Textures/AnimalSprites/dog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c7636779d5928ffd4fc5c549147455356062f84314e68fcfdd1d3a73daca7aa -size 33483 +oid sha256:e6fb774cc04362abb4088645b7aee6f3b324466c0f6939fb90363cc8350032c2 +size 36005 diff --git a/Assets/Textures/AnimalSprites/dog.png.meta b/Assets/Textures/AnimalSprites/dog.png.meta index 3ac51f2..c6dc707 100644 --- a/Assets/Textures/AnimalSprites/dog.png.meta +++ b/Assets/Textures/AnimalSprites/dog.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 150, y: 50, z: 150, w: 50} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -141,7 +141,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: d7cc1f9fae4a9cf4eb29df4e279d5c88 vertices: [] indices: edges: [] diff --git a/Assets/Textures/AnimalSprites/fox.png b/Assets/Textures/AnimalSprites/fox.png index 81879f5..c1172d2 100644 --- a/Assets/Textures/AnimalSprites/fox.png +++ b/Assets/Textures/AnimalSprites/fox.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:028fdaf4d3c624eb2059c16c2041b427b21d976c773d155d90905fa121654536 -size 25911 +oid sha256:94cab74305cd5ac4cf6f370daedbf1b02f3107fa5471809d60f2a2fb89a52ace +size 37703 diff --git a/Assets/Textures/AnimalSprites/fox.png.meta b/Assets/Textures/AnimalSprites/fox.png.meta index 936b659..4ec8bf1 100644 --- a/Assets/Textures/AnimalSprites/fox.png.meta +++ b/Assets/Textures/AnimalSprites/fox.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 150, y: 50, z: 150, w: 50} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -141,7 +141,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: d6829e93fcbced048b1f48287faa0335 vertices: [] indices: edges: [] diff --git a/Assets/Textures/AnimalSprites/iguana.png b/Assets/Textures/AnimalSprites/iguana.png deleted file mode 100644 index 4b4d629..0000000 --- a/Assets/Textures/AnimalSprites/iguana.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3c0388ff66836eced3996a4dda7231c092ba0b4703015befb0c583c8260c376d -size 31560 diff --git a/Assets/Textures/AnimalSprites/iguana.png.meta b/Assets/Textures/AnimalSprites/iguana.png.meta deleted file mode 100644 index f26d46c..0000000 --- a/Assets/Textures/AnimalSprites/iguana.png.meta +++ /dev/null @@ -1,154 +0,0 @@ -fileFormatVersion: 2 -guid: 2fbadfac53f6550458d973ce1d9d15a4 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: -1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: tvOS - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Windows Store Apps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/AnimalSprites/lion.png b/Assets/Textures/AnimalSprites/lion.png index 158269f..de176f7 100644 --- a/Assets/Textures/AnimalSprites/lion.png +++ b/Assets/Textures/AnimalSprites/lion.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:34c4dd04c628d5726de3ab0e0c8b90668970c81bed3e2bc1121e9d23ebbe0899 -size 29373 +oid sha256:09d95f6bf359699e66de7dd61a9c9b8c77a786944df6486c3090da32f97e4343 +size 37151 diff --git a/Assets/Textures/AnimalSprites/lion.png.meta b/Assets/Textures/AnimalSprites/lion.png.meta index 039d937..33ffd94 100644 --- a/Assets/Textures/AnimalSprites/lion.png.meta +++ b/Assets/Textures/AnimalSprites/lion.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 150, y: 50, z: 150, w: 50} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -141,7 +141,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 43d7c61b68febfe468e8a475482da23c vertices: [] indices: edges: [] diff --git a/Assets/Textures/AnimalSprites/panda.png b/Assets/Textures/AnimalSprites/panda.png index 2b34396..02cfc95 100644 --- a/Assets/Textures/AnimalSprites/panda.png +++ b/Assets/Textures/AnimalSprites/panda.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1aefbc664f1b578bd21268ca03e17231472e37532452b55f556ee3fe188c6e61 -size 18733 +oid sha256:ff8f7901ba7f937ec296dcb6328dae57737e096987df7c08d1c73515fef19de1 +size 32744 diff --git a/Assets/Textures/AnimalSprites/panda.png.meta b/Assets/Textures/AnimalSprites/panda.png.meta index a53827e..705237e 100644 --- a/Assets/Textures/AnimalSprites/panda.png.meta +++ b/Assets/Textures/AnimalSprites/panda.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 150, y: 50, z: 150, w: 50} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -141,7 +141,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: b9086521ebc5d4340acfbba03aa9a79c vertices: [] indices: edges: [] diff --git a/Assets/Textures/AnimalSprites/pig.png b/Assets/Textures/AnimalSprites/pig.png index 935e7f1..bcd9706 100644 --- a/Assets/Textures/AnimalSprites/pig.png +++ b/Assets/Textures/AnimalSprites/pig.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2173258f79d82f08d1df6bbe7d6bf02ba73784f4183aff226534c7e5ce9c46c2 -size 27443 +oid sha256:1257224f90db66ae5649f81b458f1128cce86c9f4eba7e83df34dc21f59913ff +size 36729 diff --git a/Assets/Textures/AnimalSprites/pig.png.meta b/Assets/Textures/AnimalSprites/pig.png.meta index 8647f29..89a7177 100644 --- a/Assets/Textures/AnimalSprites/pig.png.meta +++ b/Assets/Textures/AnimalSprites/pig.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 150, y: 50, z: 150, w: 50} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -141,7 +141,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 8574d95f73910f44db473172031e6cfb vertices: [] indices: edges: []