From 43aef23913f0e0f2d7d23e56246c0ff879e2f3b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Pell=C3=A9?= Date: Sat, 10 Jan 2015 16:18:55 +0100 Subject: [PATCH] Chat: Corrections mineures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -affichage en rouge du nombre de caractères quand il en reste moins de 20 -meilleur utilisation du component inputfield (plus besoin d'ajouter le comonent texte au script pour qu'il fonctionne) -correction de l'animation du timer. (le texte apparaissait brièvement lors de l'état long). --- .../animation/anim_clips_ui/tchat_dispo.anim | 60 +- Assets/scene.unity | 626 +++++++++++++++++- Assets/scripts/OnClickedMoveCamera.cs | 2 +- Assets/scripts/chat_scrollbar.cs | 41 ++ Assets/scripts/chat_scrollbar.cs.meta | 8 + Assets/scripts/tchat_anim.cs | 25 +- 6 files changed, 743 insertions(+), 19 deletions(-) create mode 100644 Assets/scripts/chat_scrollbar.cs create mode 100644 Assets/scripts/chat_scrollbar.cs.meta diff --git a/Assets/animation/anim_clips_ui/tchat_dispo.anim b/Assets/animation/anim_clips_ui/tchat_dispo.anim index 0585aa5..4076f04 100644 --- a/Assets/animation/anim_clips_ui/tchat_dispo.anim +++ b/Assets/animation/anim_clips_ui/tchat_dispo.anim @@ -120,13 +120,13 @@ AnimationClip: - time: .0666666701 value: 343.5 inSlope: 574.499817 - outSlope: 0 - tangentMode: 5 + outSlope: -23.0022316 + tangentMode: 21 - time: 15 value: 0 - inSlope: 0 + inSlope: -23.0022316 outSlope: 0 - tangentMode: 1 + tangentMode: 21 m_PreInfinity: 2 m_PostInfinity: 2 attribute: m_SizeDelta.x @@ -336,6 +336,25 @@ AnimationClip: path: timer_text classID: 224 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 31 + - time: .0333333351 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 31 + m_PreInfinity: 2 + m_PostInfinity: 2 + attribute: m_Enabled + path: Image + classID: 114 + script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -416,6 +435,12 @@ AnimationClip: classID: 224 customType: 0 isPPtrCurve: 0 + - path: 83635035 + attribute: 3305885265 + script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + classID: 114 + customType: 24 + isPPtrCurve: 0 - path: 83635035 attribute: 38095219 script: {fileID: 0} @@ -582,13 +607,13 @@ AnimationClip: - time: .0666666701 value: 343.5 inSlope: 574.499817 - outSlope: 0 - tangentMode: 5 + outSlope: -23.0022316 + tangentMode: 21 - time: 15 value: 0 - inSlope: 0 + inSlope: -23.0022316 outSlope: 0 - tangentMode: 1 + tangentMode: 21 m_PreInfinity: 2 m_PostInfinity: 2 attribute: m_SizeDelta.x @@ -798,5 +823,24 @@ AnimationClip: path: timer_text classID: 224 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 31 + - time: .0333333351 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 31 + m_PreInfinity: 2 + m_PostInfinity: 2 + attribute: m_Enabled + path: Image + classID: 114 + script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_EulerEditorCurves: [] m_Events: [] diff --git a/Assets/scene.unity b/Assets/scene.unity index e641247..7b37038 100644 --- a/Assets/scene.unity +++ b/Assets/scene.unity @@ -2132,6 +2132,128 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 143086259} m_Mesh: {fileID: 4300392, guid: 027c250b9f20b1e49903b3b4c633cd9d, type: 3} +--- !u!1 &145106971 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 145106972} + - 222: {fileID: 145106975} + - 114: {fileID: 145106974} + - 114: {fileID: 145106973} + m_Layer: 5 + m_Name: InputField + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &145106972 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 145106971} + 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: 1398855463} + - {fileID: 197553464} + m_Father: {fileID: 1448507633} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: 1} + m_AnchorMax: {x: .5, y: 1} + m_AnchoredPosition: {x: 3.05175781e-05, y: 0} + m_SizeDelta: {x: 135, y: 264} + m_Pivot: {x: .5, y: 1} +--- !u!114 &145106973 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 145106971} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 575553740, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + 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: 145106974} + m_TextComponent: {fileID: 197553465} + m_Placeholder: {fileID: 1398855464} + m_ContentType: 0 + m_InputType: 0 + m_KeyboardType: 0 + m_LineType: 1 + m_HideMobileInput: 0 + m_CharacterValidation: 0 + m_CharacterLimit: 0 + m_EndEdit: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.InputField+SubmitEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null + m_OnValueChange: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.InputField+OnChangeEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null + m_SelectionColor: {r: .65882355, g: .807843149, b: 1, a: .752941191} + m_Text: + m_CaretBlinkRate: 1.70000005 +--- !u!114 &145106974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 145106971} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &145106975 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 145106971} --- !u!1 &146733538 GameObject: m_ObjectHideFlags: 0 @@ -2834,6 +2956,72 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 196993284} m_Mesh: {fileID: 4300234, guid: 027c250b9f20b1e49903b3b4c633cd9d, type: 3} +--- !u!1 &197553463 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 197553464} + - 222: {fileID: 197553466} + - 114: {fileID: 197553465} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &197553464 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 197553463} + 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: 145106972} + m_RootOrder: 1 + m_AnchorMin: {x: .5, y: 1} + m_AnchorMax: {x: .5, y: 1} + m_AnchoredPosition: {x: -.500020981, y: -7.00000286} + m_SizeDelta: {x: 116, y: 251} + m_Pivot: {x: .5, y: 1} +--- !u!114 &197553465 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 197553463} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .1953125, g: .1953125, b: .1953125, a: 1} + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_RichText: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &197553466 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 197553463} --- !u!1 &200815964 GameObject: m_ObjectHideFlags: 0 @@ -11235,6 +11423,67 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 997126404} m_Mesh: {fileID: 4300526, guid: 027c250b9f20b1e49903b3b4c633cd9d, type: 3} +--- !u!1 &1002045139 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1002045140} + - 222: {fileID: 1002045142} + - 114: {fileID: 1002045141} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1002045140 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1002045139} + 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: 1336172235} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1002045141 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1002045139} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1002045142 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1002045139} --- !u!1 &1002319944 GameObject: m_ObjectHideFlags: 0 @@ -12469,7 +12718,7 @@ RectTransform: - {fileID: 1904739803} - {fileID: 1765856481} m_Father: {fileID: 1981988301} - m_RootOrder: 4 + m_RootOrder: 5 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -12501,7 +12750,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: aab5a535908bfb14284dca66586cb1da, type: 3} m_Name: m_EditorClassIdentifier: - chat: {fileID: 298869983} machine: {fileID: 1108071682} charac_nb: {fileID: 1452464990} myfield: {fileID: 52053180} @@ -13884,6 +14132,145 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1232075316} m_Mesh: {fileID: 4300362, guid: 027c250b9f20b1e49903b3b4c633cd9d, type: 3} +--- !u!1 &1232312313 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1232312315} + - 222: {fileID: 1232312317} + - 114: {fileID: 1232312316} + - 114: {fileID: 1232312314} + - 114: {fileID: 1232312318} + m_Layer: 5 + m_Name: Scrollbar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1232312314 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1232312313} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2061169968, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + 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: 1002045141} + m_HandleRect: {fileID: 1002045140} + m_Direction: 2 + m_Value: .999999642 + m_Size: .651515067 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Scrollbar+ScrollEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!224 &1232312315 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1232312313} + 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: 1336172235} + m_Father: {fileID: 1448507633} + m_RootOrder: 1 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -86, y: 0} + m_SizeDelta: {x: 20, y: 160} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1232312316 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1232312313} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1232312317 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1232312313} +--- !u!114 &1232312318 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1232312313} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1448507629} + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!1 &1234649049 GameObject: m_ObjectHideFlags: 0 @@ -14445,7 +14832,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1981988301} - m_RootOrder: 5 + m_RootOrder: 6 m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: -6.10351562e-05} @@ -14656,6 +15043,39 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1333252447} m_Mesh: {fileID: 4300422, guid: 027c250b9f20b1e49903b3b4c633cd9d, type: 3} +--- !u!1 &1336172234 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1336172235} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1336172235 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1336172234} + 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: 1002045140} + m_Father: {fileID: 1232312315} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: -20} + m_Pivot: {x: .5, y: .5} --- !u!1001 &1336766452 Prefab: m_ObjectHideFlags: 0 @@ -15329,6 +15749,72 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1395740860} m_Mesh: {fileID: 4300406, guid: 027c250b9f20b1e49903b3b4c633cd9d, type: 3} +--- !u!1 &1398855462 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1398855463} + - 222: {fileID: 1398855465} + - 114: {fileID: 1398855464} + m_Layer: 5 + m_Name: Placeholder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1398855463 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1398855462} + 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: 145106972} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -.5} + m_SizeDelta: {x: -20, y: -13} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1398855464 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1398855462} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .1953125, g: .1953125, b: .1953125, a: .5} + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 2 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Enter text... +--- !u!222 &1398855465 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1398855462} --- !u!1 &1405339773 GameObject: m_ObjectHideFlags: 0 @@ -16141,6 +16627,137 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1443490545} m_Mesh: {fileID: 4300536, guid: 027c250b9f20b1e49903b3b4c633cd9d, type: 3} +--- !u!1 &1448507629 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1448507633} + - 222: {fileID: 1448507632} + - 114: {fileID: 1448507631} + - 114: {fileID: 1448507630} + - 114: {fileID: 1448507634} + - 114: {fileID: 1448507635} + - 65: {fileID: 1448507636} + m_Layer: 5 + m_Name: machin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1448507630 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1448507629} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1367256648, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 145106972} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: .100000001 + m_Inertia: 1 + m_DecelerationRate: .135000005 + m_ScrollSensitivity: 1 + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 1232312314} + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1448507631 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1448507629} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + 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 +--- !u!222 &1448507632 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1448507629} +--- !u!224 &1448507633 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1448507629} + 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: 145106972} + - {fileID: 1232312315} + m_Father: {fileID: 1981988301} + m_RootOrder: 4 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -49, y: -197} + m_SizeDelta: {x: 216, y: 172} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1448507634 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1448507629} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1200242548, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 +--- !u!114 &1448507635 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1448507629} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3e099e405878cc041adb932a2155705b, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollbar: {fileID: 1232312314} + myfield: {fileID: 145106973} + scrollrect: {fileID: 1448507630} +--- !u!65 &1448507636 +BoxCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1448507629} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 612.59729, y: 2164.99902, z: 463.088287} + m_Center: {x: -281.298706, y: 202.216156, z: -206.544144} --- !u!1 &1448961920 GameObject: m_ObjectHideFlags: 0 @@ -20140,7 +20757,7 @@ RectTransform: m_RootOrder: 4 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -39, y: -108} + m_AnchoredPosition: {x: -44, y: -193.600006} m_SizeDelta: {x: 207, y: 30} m_Pivot: {x: .5, y: .5} --- !u!114 &1765856482 @@ -23119,6 +23736,7 @@ RectTransform: - {fileID: 1036217563} - {fileID: 1962735454} - {fileID: 235015810} + - {fileID: 1448507633} - {fileID: 1108071681} - {fileID: 1300676963} m_Father: {fileID: 0} diff --git a/Assets/scripts/OnClickedMoveCamera.cs b/Assets/scripts/OnClickedMoveCamera.cs index 471ada8..6ed146a 100644 --- a/Assets/scripts/OnClickedMoveCamera.cs +++ b/Assets/scripts/OnClickedMoveCamera.cs @@ -21,7 +21,7 @@ public class OnClickedMoveCamera : MonoBehaviour { void OnMouseDown(){ //Move to position - print ("test console"); + camCtrl.targetPos = destination.position; camCtrl.targetRot = destination.rotation; } diff --git a/Assets/scripts/chat_scrollbar.cs b/Assets/scripts/chat_scrollbar.cs new file mode 100644 index 0000000..809d31d --- /dev/null +++ b/Assets/scripts/chat_scrollbar.cs @@ -0,0 +1,41 @@ +using UnityEngine; +using System.Collections; +using UnityEngine.UI; +using UnityEngine.EventSystems; + +public class chat_scrollbar : MonoBehaviour { + + public Scrollbar scrollbar; + public InputField myfield; + public ScrollRect scrollrect; + + + // Use this for initialization + void Start () { + scrollbar.value = 1; + } + + + + // Update is called once per frame + void Update () { + + + + //print (iseditingtop); + + } + + + + + + bool isTypingText(){ + if (Input.anyKey && Input.GetMouseButton (0) == false && Input.GetMouseButton (1) == false && Input.GetMouseButton (2) == false && Input.GetKey ("return") == false) { + return true; + } else + return false; + } + + +} diff --git a/Assets/scripts/chat_scrollbar.cs.meta b/Assets/scripts/chat_scrollbar.cs.meta new file mode 100644 index 0000000..4bf7614 --- /dev/null +++ b/Assets/scripts/chat_scrollbar.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3e099e405878cc041adb932a2155705b +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Assets/scripts/tchat_anim.cs b/Assets/scripts/tchat_anim.cs index 41c9dd4..a319e54 100644 --- a/Assets/scripts/tchat_anim.cs +++ b/Assets/scripts/tchat_anim.cs @@ -4,7 +4,6 @@ using System.Collections; public class tchat_anim : MonoBehaviour { - public Text chat; public Animator machine; public Text charac_nb; public InputField myfield; @@ -29,7 +28,13 @@ public class tchat_anim : MonoBehaviour { void Update () { - print (machine.GetInteger("etat_chat")); + //print (machine.GetInteger("etat_chat")); + + if(machine.GetInteger("etat_chat")==0){ + myfield.textComponent.resizeTextForBestFit=false; + + } + //transition vers chat_up if (myfield.textComponent.cachedTextGenerator.lineCount > 1 && machine.GetInteger("etat_chat")==0) { print ("trop long"); @@ -39,7 +44,7 @@ public class tchat_anim : MonoBehaviour { } //transition vers chat_long - if (chat.text.Length > 110 && machine.GetInteger("etat_chat")==1) { + if (myfield.text.Length > 110 && machine.GetInteger("etat_chat")==1) { print ("trop trop long"); machine.SetInteger ("etat_chat", 2); } @@ -50,6 +55,12 @@ public class tchat_anim : MonoBehaviour { charac_nb.text = (myfield.characterLimit - myfield.text.Length).ToString(); } + //les derniers caractères sont écris en rouges + if (myfield.text.Length > 130) { + charac_nb.color = Color.red; + } else + charac_nb.color = Color.white; + //transition vers chat_empty: si l'on vide complètement un message, le tcht se rabaisse. //sinon on le laisse haut (y compris si le message est court). if ((machine.GetInteger ("etat_chat") == 1 || machine.GetInteger ("etat_chat") == 2) && myfield.text.Length == 0 ) { @@ -61,7 +72,7 @@ public class tchat_anim : MonoBehaviour { //En cas de validation du message if(Input.GetKeyDown("space") && myfield.isFocused){ - myfield.text=""; + myfield.text=" "; charac_nb.text=""; print ("space pressed"); @@ -86,13 +97,15 @@ public class tchat_anim : MonoBehaviour { timer_sec=0; timer.text=""; machine.SetInteger ("etat_chat", 0); + myfield.text=""; } } - } - + public void submit(){ + print ("submit entered"); + } }