diff --git a/Assets/scene.unity b/Assets/scene.unity index 770f9bd..c60ef06 100644 --- a/Assets/scene.unity +++ b/Assets/scene.unity @@ -12379,7 +12379,13 @@ MonoBehaviour: myfield: {fileID: 52053180} timer: {fileID: 1765856482} img_bg: {fileID: 1053260633} + timer_sec: 0 + max_timer: 0 message: + chatWindowScroll: {fileID: 0} + chatWindow: {fileID: 0} + createScrollListObject: {fileID: 0} + createScrollList: {fileID: 0} --- !u!1 &1114027059 GameObject: m_ObjectHideFlags: 0 @@ -17777,6 +17783,7 @@ MonoBehaviour: m_EditorClassIdentifier: text_chat: {fileID: 1176907833} scrollrect: {fileID: 1553687538} + message_old: --- !u!1 &1556693429 GameObject: m_ObjectHideFlags: 0 @@ -22390,9 +22397,6 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 1922246856} - - 33: {fileID: 1922246855} - - 65: {fileID: 1922246854} - - 23: {fileID: 1922246853} - 114: {fileID: 1922246852} m_Layer: 0 m_Name: MainPlayer @@ -22420,49 +22424,6 @@ MonoBehaviour: rolename_strref: 0 ultiID: 0 align: ---- !u!23 &1922246853 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1922246851} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!65 &1922246854 -BoxCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1922246851} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &1922246855 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1922246851} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1922246856 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/scripts/ManaItem.cs b/Assets/scripts/Game_ManaItem.cs similarity index 88% rename from Assets/scripts/ManaItem.cs rename to Assets/scripts/Game_ManaItem.cs index 217aed4..8bb001b 100644 --- a/Assets/scripts/ManaItem.cs +++ b/Assets/scripts/Game_ManaItem.cs @@ -2,7 +2,7 @@ using System.Collections; using UnityEngine.UI; -public class ManaItem : MonoBehaviour { +public class Game_ManaItem : MonoBehaviour { public Image manaImage; diff --git a/Assets/scripts/ManaItem.cs.meta b/Assets/scripts/Game_ManaItem.cs.meta similarity index 100% rename from Assets/scripts/ManaItem.cs.meta rename to Assets/scripts/Game_ManaItem.cs.meta diff --git a/Assets/scripts/ManaStack.cs b/Assets/scripts/Game_ManaStack.cs similarity index 88% rename from Assets/scripts/ManaStack.cs rename to Assets/scripts/Game_ManaStack.cs index cd46c76..4ef9c4b 100644 --- a/Assets/scripts/ManaStack.cs +++ b/Assets/scripts/Game_ManaStack.cs @@ -4,7 +4,7 @@ using UnityEngine.EventSystems; using System.Collections.Generic; using System.Collections; -public class ManaStack : MonoBehaviour { +public class Game_ManaStack : MonoBehaviour { public GameObject manaItem; public Transform contentPanel; @@ -26,7 +26,7 @@ public class ManaStack : MonoBehaviour { //crée un cristaux de mana. (appelée dix fois lors de la fonction Start). void createMana() { GameObject myNewButton = Instantiate(manaItem) as GameObject; - ManaItem mana = myNewButton.GetComponent (); + Game_ManaItem mana = myNewButton.GetComponent (); mana.setDisabled(); myNewButton.transform.SetParent(contentPanel); } @@ -36,7 +36,7 @@ public class ManaStack : MonoBehaviour { public void addDaily(int nbDay) { nbDay--; GameObject manaItemObject; - ManaItem manaButton; + Game_ManaItem manaButton; if(nbDay > manaMax - 1) { nbDay = manaMax - 1; @@ -46,7 +46,7 @@ public class ManaStack : MonoBehaviour { for(int i = 0; i <= nbDay; i++) { manaItemObject = GameObject.Find("ManaItem" + i); - manaButton = manaItemObject.GetComponent (); + manaButton = manaItemObject.GetComponent (); manaButton.setEnabled(); //GameObject.Find("ManaItem"+i).GetComponent("Button").int } diff --git a/Assets/scripts/ManaStack.cs.meta b/Assets/scripts/Game_ManaStack.cs.meta similarity index 100% rename from Assets/scripts/ManaStack.cs.meta rename to Assets/scripts/Game_ManaStack.cs.meta diff --git a/Assets/src/Player.cs b/Assets/scripts/Game_Player.cs similarity index 87% rename from Assets/src/Player.cs rename to Assets/scripts/Game_Player.cs index 68710ef..1d1d629 100644 --- a/Assets/src/Player.cs +++ b/Assets/scripts/Game_Player.cs @@ -1,12 +1,7 @@ using UnityEngine; using System.Collections; -public class Player : MonoBehaviour { - - public Player(int _charID, int _roleID){ - SetCharacter(_charID); - SetRole(_roleID); - } +public class Game_Player : MonoBehaviour { void Awake(){ //Debug diff --git a/Assets/src/Player.cs.meta b/Assets/scripts/Game_Player.cs.meta similarity index 100% rename from Assets/src/Player.cs.meta rename to Assets/scripts/Game_Player.cs.meta diff --git a/Assets/scripts/CameraController.cs b/Assets/scripts/Gui_CameraController.cs similarity index 92% rename from Assets/scripts/CameraController.cs rename to Assets/scripts/Gui_CameraController.cs index 8510800..6f83dbc 100644 --- a/Assets/scripts/CameraController.cs +++ b/Assets/scripts/Gui_CameraController.cs @@ -1,7 +1,7 @@ using UnityEngine; using System.Collections; -public class CameraController : MonoBehaviour { +public class Gui_CameraController : MonoBehaviour { public Vector3 targetPos; public Quaternion targetRot; diff --git a/Assets/scripts/CameraController.cs.meta b/Assets/scripts/Gui_CameraController.cs.meta similarity index 100% rename from Assets/scripts/CameraController.cs.meta rename to Assets/scripts/Gui_CameraController.cs.meta diff --git a/Assets/scripts/chat_scrollbar.cs b/Assets/scripts/Gui_ChatScrollbar.cs similarity index 92% rename from Assets/scripts/chat_scrollbar.cs rename to Assets/scripts/Gui_ChatScrollbar.cs index 042c97d..170b022 100644 --- a/Assets/scripts/chat_scrollbar.cs +++ b/Assets/scripts/Gui_ChatScrollbar.cs @@ -3,7 +3,7 @@ using System.Collections; using UnityEngine.UI; using UnityEngine.EventSystems; -public class chat_scrollbar : MonoBehaviour { +public class Gui_ChatScrollbar : MonoBehaviour { public Scrollbar scrollbar; public InputField myfield; diff --git a/Assets/scripts/chat_scrollbar.cs.meta b/Assets/scripts/Gui_ChatScrollbar.cs.meta similarity index 100% rename from Assets/scripts/chat_scrollbar.cs.meta rename to Assets/scripts/Gui_ChatScrollbar.cs.meta diff --git a/Assets/scripts/ChatWindow.cs b/Assets/scripts/Gui_ChatWindow.cs similarity index 96% rename from Assets/scripts/ChatWindow.cs rename to Assets/scripts/Gui_ChatWindow.cs index 20cdd8e..6947435 100644 --- a/Assets/scripts/ChatWindow.cs +++ b/Assets/scripts/Gui_ChatWindow.cs @@ -2,7 +2,7 @@ using System.Collections; using UnityEngine.UI; -public class ChatWindow : MonoBehaviour { +public class Gui_ChatWindow : MonoBehaviour { public Text text_chat; public ScrollRect scrollrect; diff --git a/Assets/scripts/ChatWindow.cs.meta b/Assets/scripts/Gui_ChatWindow.cs.meta similarity index 100% rename from Assets/scripts/ChatWindow.cs.meta rename to Assets/scripts/Gui_ChatWindow.cs.meta diff --git a/Assets/scripts/Clock.cs b/Assets/scripts/Gui_Clock.cs similarity index 83% rename from Assets/scripts/Clock.cs rename to Assets/scripts/Gui_Clock.cs index 4225962..5416086 100644 --- a/Assets/scripts/Clock.cs +++ b/Assets/scripts/Gui_Clock.cs @@ -2,11 +2,11 @@ using System.Collections; using UnityEngine.UI; -public class Clock : MonoBehaviour { +public class Gui_Clock : MonoBehaviour { public GameObject clock; GameObject day_controller; - DayController daycontroller; + Gui_DayController daycontroller; int maxDay; int maxNight; @@ -14,7 +14,7 @@ public class Clock : MonoBehaviour { // Use this for initialization void Start() { day_controller = GameObject.Find("day_controller"); - daycontroller = day_controller.GetComponent (); + daycontroller = day_controller.GetComponent (); maxDay = daycontroller.maxDay; maxNight = daycontroller.maxNight; diff --git a/Assets/scripts/Clock.cs.meta b/Assets/scripts/Gui_Clock.cs.meta similarity index 100% rename from Assets/scripts/Clock.cs.meta rename to Assets/scripts/Gui_Clock.cs.meta diff --git a/Assets/scripts/CreateScrollList.cs b/Assets/scripts/Gui_CreateScrollList.cs similarity index 97% rename from Assets/scripts/CreateScrollList.cs rename to Assets/scripts/Gui_CreateScrollList.cs index 00cc130..c0a09d4 100644 --- a/Assets/scripts/CreateScrollList.cs +++ b/Assets/scripts/Gui_CreateScrollList.cs @@ -18,7 +18,7 @@ public class Notification { Button.ButtonClickedEvent clickEvent; } -public class CreateScrollList : MonoBehaviour { +public class Gui_CreateScrollList : MonoBehaviour { public GameObject sampleButton; public List itemList; diff --git a/Assets/scripts/CreateScrollList.cs.meta b/Assets/scripts/Gui_CreateScrollList.cs.meta similarity index 100% rename from Assets/scripts/CreateScrollList.cs.meta rename to Assets/scripts/Gui_CreateScrollList.cs.meta diff --git a/Assets/scripts/DayController.cs b/Assets/scripts/Gui_DayController.cs similarity index 86% rename from Assets/scripts/DayController.cs rename to Assets/scripts/Gui_DayController.cs index 36da7b5..a5e78c9 100644 --- a/Assets/scripts/DayController.cs +++ b/Assets/scripts/Gui_DayController.cs @@ -1,7 +1,7 @@ using UnityEngine; using System.Collections; -public class DayController : MonoBehaviour { +public class Gui_DayController : MonoBehaviour { public Animator machine; public int maxDay; @@ -15,15 +15,15 @@ public class DayController : MonoBehaviour { //appel de Window Chat GameObject chatWindowScroll; - ChatWindow chatWindow; + Gui_ChatWindow chatWindow; //appel de CreateScrollList GameObject createScrollListObject; - CreateScrollList createScrollList; + Gui_CreateScrollList createScrollList; //appel de ManaStack GameObject manaStackObject; - ManaStack manaStack; + Game_ManaStack manaStack; // Use this for initialization @@ -40,11 +40,11 @@ public class DayController : MonoBehaviour { //appel de CreateScrollList createScrollListObject = GameObject.Find("log_controller"); - createScrollList = createScrollListObject.GetComponent (); + createScrollList = createScrollListObject.GetComponent (); //appel de ManaStack manaStackObject = GameObject.Find("mana_controller"); - manaStack = manaStackObject.GetComponent (); + manaStack = manaStackObject.GetComponent (); dayNb = 1; chatWindow.writeDay(dayNb); diff --git a/Assets/scripts/DayController.cs.meta b/Assets/scripts/Gui_DayController.cs.meta similarity index 100% rename from Assets/scripts/DayController.cs.meta rename to Assets/scripts/Gui_DayController.cs.meta diff --git a/Assets/scripts/LogNotification.cs b/Assets/scripts/Gui_LogNotification.cs similarity index 65% rename from Assets/scripts/LogNotification.cs rename to Assets/scripts/Gui_LogNotification.cs index 828ec60..98d87c3 100644 --- a/Assets/scripts/LogNotification.cs +++ b/Assets/scripts/Gui_LogNotification.cs @@ -2,7 +2,7 @@ using System.Collections; using UnityEngine.UI; -public class LogNotification : MonoBehaviour { +public class Gui_LogNotification : MonoBehaviour { public Text message; diff --git a/Assets/scripts/LogNotification.cs.meta b/Assets/scripts/Gui_LogNotification.cs.meta similarity index 100% rename from Assets/scripts/LogNotification.cs.meta rename to Assets/scripts/Gui_LogNotification.cs.meta diff --git a/Assets/scripts/OnClickedMoveCamera.cs b/Assets/scripts/Gui_OnClickedMoveCamera.cs similarity index 91% rename from Assets/scripts/OnClickedMoveCamera.cs rename to Assets/scripts/Gui_OnClickedMoveCamera.cs index 7cb6ec6..7c3f14c 100644 --- a/Assets/scripts/OnClickedMoveCamera.cs +++ b/Assets/scripts/Gui_OnClickedMoveCamera.cs @@ -3,10 +3,10 @@ using UnityEngine; using System.Collections; -public class OnClickedMoveCamera : MonoBehaviour { +public class Gui_OnClickedMoveCamera : MonoBehaviour { public Transform destination; - public CameraController camCtrl; + public Gui_CameraController camCtrl; private Color clrBase; private Color clrTarget; diff --git a/Assets/scripts/OnClickedMoveCamera.cs.meta b/Assets/scripts/Gui_OnClickedMoveCamera.cs.meta similarity index 100% rename from Assets/scripts/OnClickedMoveCamera.cs.meta rename to Assets/scripts/Gui_OnClickedMoveCamera.cs.meta diff --git a/Assets/scripts/SampleButton.cs b/Assets/scripts/Gui_SampleButton.cs similarity index 77% rename from Assets/scripts/SampleButton.cs rename to Assets/scripts/Gui_SampleButton.cs index 4110dce..4fe56e1 100644 --- a/Assets/scripts/SampleButton.cs +++ b/Assets/scripts/Gui_SampleButton.cs @@ -2,7 +2,7 @@ using System.Collections; using UnityEngine.UI; -public class SampleButton : MonoBehaviour { +public class Gui_SampleButton : MonoBehaviour { public Button button; public Text nameLabel; diff --git a/Assets/scripts/SampleButton.cs.meta b/Assets/scripts/Gui_SampleButton.cs.meta similarity index 100% rename from Assets/scripts/SampleButton.cs.meta rename to Assets/scripts/Gui_SampleButton.cs.meta diff --git a/Assets/scripts/TchatAnim.cs b/Assets/scripts/Gui_TchatAnim.cs similarity index 92% rename from Assets/scripts/TchatAnim.cs rename to Assets/scripts/Gui_TchatAnim.cs index da8f4e2..f7ba4bb 100644 --- a/Assets/scripts/TchatAnim.cs +++ b/Assets/scripts/Gui_TchatAnim.cs @@ -2,7 +2,7 @@ using UnityEngine.UI; using System.Collections; -public class TchatAnim : MonoBehaviour { +public class Gui_TchatAnim : MonoBehaviour { public Animator machine; public Text charac_nb; @@ -15,11 +15,11 @@ public class TchatAnim : MonoBehaviour { //appel de WindowChat GameObject chatWindowScroll; - ChatWindow chatWindow; + Gui_ChatWindow chatWindow; //appel de TchatAnim GameObject createScrollListObject; - CreateScrollList createScrollList; + Gui_CreateScrollList createScrollList; // Use this for initialization void Start() { @@ -28,11 +28,11 @@ public class TchatAnim : MonoBehaviour { //appel de WindowChat chatWindowScroll = GameObject.Find("ChatWindowScroll"); - chatWindow = chatWindowScroll.GetComponent (); + chatWindow = chatWindowScroll.GetComponent (); //appel de CreateScrollList createScrollListObject = GameObject.Find("log_controller"); - createScrollList = createScrollListObject.GetComponent (); + createScrollList = createScrollListObject.GetComponent (); } diff --git a/Assets/scripts/TchatAnim.cs.meta b/Assets/scripts/Gui_TchatAnim.cs.meta similarity index 100% rename from Assets/scripts/TchatAnim.cs.meta rename to Assets/scripts/Gui_TchatAnim.cs.meta