Merge pull request #43 from shnok/dev

README

README.md

@@ -19,14 +19,18 @@ For now the aim is to create a basic demo, therefore only basic features will be
 - Click to move and WASD movements ✅
 - Camera collision ✅
 - Basic UI
-    - Status window ✅
-    - Chat window ✅
-    - Target window ✅
+    - Status ✅
+    - Chat ✅
+    - Target ✅
     - Nameplates ✅
-    - Skillbar
+    - Skillbar ✅
+	- Action ✅
+	- Character info ✅
+	- System menu ✅
+	- Exit window ✅
 - Basic combat ✅
 - Basic RPG features 
-    - HP Loss and regen 🛠️ (Players can fight mobs but wont regen)
+    - HP Loss and regen ✅
     - Exp gain on kills
     - Leveling
 - Small range of models
@@ -46,6 +50,9 @@ For now the aim is to create a basic demo, therefore only basic features will be
     - NPCs ✅
     - Monsters ✅
     - Monsters AI with Pathfinding ✅
+    - Player actions ✅
+    - Inventory system ✅
+    - Skillbar system ✅
 - Import Lineage2's world
     - Talking island region ✅
         - StaticMeshes ✅

l2-unity/UserSettings/Layouts/default-6000.dwlt

@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 2560
     height: 1357
   m_ShowMode: 4
-  m_Title: Game
+  m_Title: UI Builder
   m_RootView: {fileID: 2}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -119,7 +119,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 100}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 101
+  controlID: 132
   draggingID: 0
 --- !u!114 &6
 MonoBehaviour:
@@ -145,7 +145,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 41
+  controlID: 66
   draggingID: 0
 --- !u!114 &7
 MonoBehaviour:
@@ -209,7 +209,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
+  m_Name: Builder
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -220,16 +220,16 @@ MonoBehaviour:
     height: 892
   m_MinSize: {x: 202, y: 226}
   m_MaxSize: {x: 4002, y: 4026}
-  m_ActualView: {fileID: 16}
+  m_ActualView: {fileID: 18}
   m_Panes:
   - {fileID: 16}
   - {fileID: 18}
   - {fileID: 19}
   - {fileID: 15}
   - {fileID: 13}
   - {fileID: 12}
-  m_Selected: 0
-  m_LastSelected: 4
+  m_Selected: 1
+  m_LastSelected: 0
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -514,8 +514,8 @@ MonoBehaviour:
     m_TextWithWhitespace: "Game\u200B"
   m_Pos:
     serializedVersion: 2
-    x: 337
-    y: 24
+    x: 336
+    y: 79
     width: 1763
     height: 866
   m_SerializedDataModeController:
@@ -615,7 +615,7 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 24
+    y: 79
     width: 335
     height: 866
   m_SerializedDataModeController:
@@ -634,7 +634,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 46febbff9602bfff3a4dc0ff2c5fc2fff860c2ff1661c2ff5c56c3ff869cc7ff46e3cbff222ad0ffce6ed4ff72b3d8ffe0e7daff7aeeddff6835e2ff7c6ce4ffe070e7ffd6f8efffec37f2fffafafffff4ffffff4a4711006a471100
+      m_ExpandedIDs: 1cd6f6ff5ed6f6ff2481f9ffaa37fbfff240fbffde2afdff7e20feff2e07ffffc007ffff1c0cffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -1297,7 +1297,7 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 916
+    y: 971
     width: 2100
     height: 383
   m_SerializedDataModeController:
@@ -1322,7 +1322,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Resources/Data/UI/_Elements/Template
+    - Assets/Resources/Data/UI/_Elements/Game
     m_Globs: []
     m_ProductIds: 
     m_AnyWithAssetOrigin: 0
@@ -1332,16 +1332,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Resources/Data/UI/_Elements/Template
+  - Assets/Resources/Data/UI/_Elements/Game
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\Stock\Projects\L2-Unity\l2-unity\l2-unity
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 421}
-    m_SelectedIDs: 001d1400
-    m_LastClickedID: 1318144
-    m_ExpandedIDs: 0000000040cc010042cc010044cc010046cc010048cc01004acc01004ccc01004ecc010050cc010052cc010054cc010056cc010058cc01005acc01005ccc01005ecc010060cc010062cc010064cc010066cc010068cc01006acc01006ccc01006ecc010070cc010072cc010074cc010076cc010078cc01007acc01007ccc01007ecc010080cc010082cc010084cc010086cc010088cc01008acc01008ccc01008ecc010090cc010092cc010094cc010096cc0100
+    scrollPos: {x: 0, y: 303}
+    m_SelectedIDs: 70cc0100
+    m_LastClickedID: 117872
+    m_ExpandedIDs: 0000000040cc010042cc010044cc010046cc010048cc01004acc01004ccc01004ecc010050cc010052cc010054cc010056cc010058cc01005acc01005ccc01005ecc010060cc010062cc010064cc010066cc010068cc01006acc01006ccc01006ecc010070cc010072cc010074cc010076cc010078cc01007acc01007ccc01007ecc010080cc010082cc010084cc010086cc010088cc01008acc01008ccc01008ecc010090cc010092cc010094cc010096cc010026cd01004acd010000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1402,18 +1402,18 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: c623000066ab02007aa5020050a70200d8b600007cae020088ab02004e72d0009472d0003a72d0005872d0000472d000946c07001a6c0700da6c07006a6c0700526c07005467070000000000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: Lineage2_Game
+      m_OriginalName: Lineage2_Game
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 47874
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
       m_TrimLeadingAndTrailingWhitespace: 0
       m_ClientGUIView: {fileID: 10}
@@ -1524,8 +1524,8 @@ MonoBehaviour:
     m_TextWithWhitespace: "Inspector\u200B"
   m_Pos:
     serializedVersion: 2
-    x: 2102
-    y: 24
+    x: 2101
+    y: 79
     width: 458
     height: 1275
   m_SerializedDataModeController: