Game manager state machine

l2-unity-todo.txt

@@ -1,7 +1,5 @@
 TODO (priority from top to bottom)
 
-further fixes in NPC html parsing (//buy command)
-UI xml/css cleanup into separate CSS files + more reusable components
 game manager refacto into proper state machine
 
 FIX: equip fists in both hands
@@ -20,6 +18,8 @@ Nature renderer for deco layer
 
 DONE
 
+further fixes in NPC html parsing (//buy command)
+UI xml/css cleanup into separate CSS files + more reusable components
 FIX: do not handle mouse inputs in UI when turning camera
 target name colors
 update inventory limit based on playerinfo packet

l2-unity/Assets/Resources/Data/Effects/skybox/L2Sky.mat

@@ -50,8 +50,8 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _SunMoon:
-        m_Texture: {fileID: 2800000, guid: 87bfdbc0202b0e440b4b25a3824f15db, type: 3}
-        m_Scale: {x: 1.5, y: 1.5}
+        m_Texture: {fileID: 2800000, guid: b443728fc86061b4f8ecbe8a96c9d2ef, type: 3}
+        m_Scale: {x: 2.5, y: 2.5}
         m_Offset: {x: 0.5, y: 0.5}
     - unity_Lightmaps:
         m_Texture: {fileID: 0}
@@ -70,13 +70,13 @@ Material:
     - _Cloud_Cutoff: 4.01
     - _Cloud_Distance: 0.8
     - _Clouds_Far_Tiling: 0.352
-    - _Clouds_Opacity: 2.54
+    - _Clouds_Opacity: 0.12
     - _Clouds_Tiling: 0.12
     - _GradientColor1Influence: 0.6
     - _GradientColor2Influence: 0.5
     - _HorizonCloudsRotationSpeed: -0.1
     - _Horizon_Clouds_Height: 1.44
-    - _Horizon_Clouds_Opacity: 1
+    - _Horizon_Clouds_Opacity: 0.05
     - _Horizon_Clouds_X_Tile: 1
     - _Horizon_Clouds_Y_Tile: 3.17
     - _QueueControl: 0
@@ -92,12 +92,12 @@ Material:
     - _Stars_Y_Tile: 1
     - _SunMoonSize: 0.13
     m_Colors:
-    - _GradientColor1: {r: 0, g: 0.3529412, b: 0.54901963, a: 1}
+    - _GradientColor1: {r: -0.003921569, g: -0.003921569, b: -0.007843138, a: -1}
     - _GradientColor2: {r: 0, g: 0, b: 0, a: 1}
     - _GradientColor3: {r: 6.1592746, g: 6.7682424, b: 7.37721, a: 1}
-    - _MainLightForward: {r: -0.0835492, g: -0.992995, b: -0.08354923, a: 0}
-    - _MainLightRight: {r: 0.7071067, g: 0, b: -0.7071068, a: 0}
-    - _MainLightUp: {r: 0.70215356, g: -0.11815645, b: 0.70215344, a: 0}
+    - _MainLightForward: {r: 0.6924627, g: -0.20246276, b: 0.6924625, a: 0}
+    - _MainLightRight: {r: 0.7071067, g: 0, b: -0.70710695, a: 0}
+    - _MainLightUp: {r: 0.14316282, g: 0.97928995, b: 0.14316279, a: 0}
     - _SunMoonColor: {r: 1, g: 1, b: 1, a: 0}
   m_BuildTextureStacks: []
   m_AllowLocking: 1

l2-unity/Assets/Resources/Prefab/Game.prefab

@@ -9,10 +9,10 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4644061901774829026}
+  - component: {fileID: 5806285974765348047}
   - component: {fileID: 842763773635486120}
   - component: {fileID: 2081572240581827940}
   - component: {fileID: 6227403751048920905}
-  - component: {fileID: 5806285974765348047}
   - component: {fileID: 3414367172090928233}
   - component: {fileID: 506747367762882996}
   - component: {fileID: 8274691919601176420}
@@ -38,7 +38,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &842763773635486120
+--- !u!114 &5806285974765348047
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -47,14 +47,23 @@ MonoBehaviour:
   m_GameObject: {fileID: 6810262815525540192}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 021711eabd7d2494980c3047c33aee55, type: 3}
+  m_Script: {fileID: 11500000, guid: c81a49d02f1b9ae4fa6fc87875961bf1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _protocolVersion: 1
-  _gameState: 0
-  _autoLogin: 0
-  _loadingCamera: {fileID: 0}
---- !u!114 &2081572240581827940
+  _menuScene: Menu
+  _lobbyScene: l2_lobby
+  _gameScene: Game
+  _mapList:
+  - name: 17_25
+    enabled: 1
+  - name: 16_25
+    enabled: 0
+  - name: 17_24
+    enabled: 0
+  - name: 16_24
+    enabled: 0
+  _mapsToLoad: []
+--- !u!114 &842763773635486120
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -63,10 +72,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 6810262815525540192}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2424ac622c3549d479da2aa3fcaa2c2b, type: 3}
+  m_Script: {fileID: 11500000, guid: 021711eabd7d2494980c3047c33aee55, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &6227403751048920905
+  _enableLogs: 0
+  _protocolVersion: 1
+  _gameState: 0
+  _autoLogin: 0
+  _loadingCamera: {fileID: 0}
+  _loading: 0
+  _currentState: 0
+--- !u!114 &2081572240581827940
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -75,10 +91,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 6810262815525540192}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6c0b294c4f11da043a50af17e2d967fa, type: 3}
+  m_Script: {fileID: 11500000, guid: 2424ac622c3549d479da2aa3fcaa2c2b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &5806285974765348047
+--- !u!114 &6227403751048920905
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -87,22 +103,9 @@ MonoBehaviour:
   m_GameObject: {fileID: 6810262815525540192}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c81a49d02f1b9ae4fa6fc87875961bf1, type: 3}
+  m_Script: {fileID: 11500000, guid: 6c0b294c4f11da043a50af17e2d967fa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _menuScene: Menu
-  _lobbyScene: l2_lobby
-  _gameScene: Game
-  _mapList:
-  - name: 17_25
-    enabled: 1
-  - name: 16_25
-    enabled: 0
-  - name: 17_24
-    enabled: 0
-  - name: 16_24
-    enabled: 0
-  _mapsToLoad: []
 --- !u!114 &3414367172090928233
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -140,6 +143,8 @@ MonoBehaviour:
       _collisionRadius: 0
       _lhand: 0
       _rhand: 0
+      _serverNameColor: 0
+      _serverTitleColor: 0
       _race: 0
       _sex: 0
       _face: 0
@@ -153,17 +158,24 @@ MonoBehaviour:
     _playerStatus:
       _hp: 0
       _mp: 0
+      _dead: 0
       _cp: 0
       _pvpFlag: 0
     _playerStats:
       _level: 0
-      _speed: 0
-      _scaledSpeed: 0
+      _runSpeed: 0
+      _moveSpeedMultiplier: 0
+      _walkSpeed: 0
+      _scaledRunSpeed: 0
+      _scaledWalkSpeed: 0
+      _attackSpeedMultiplier: 0
+      _attackRange: 0
       _pAtkSpd: 0
       _mAtkSpd: 0
       _maxHp: 0
       _maxMp: 0
       _maxCp: 0
+      _karma: 0
       _pAtk: 0
       _mAtk: 0
       _pEvasion: 0
@@ -176,22 +188,21 @@ MonoBehaviour:
       _pDef: 0
       _shieldDef: 0
       _exp: 0
-      _maxExp: 0
+      _expPercent: 0
       _sp: 0
       _currWeight: 0
       _maxWeight: 0
-      _attackRange: 0
       _con: 0
       _dex: 0
       _str: 0
       _wit: 0
       _men: 0
       _int: 0
-      _karma: 0
       _pvpKills: 0
       _pkKills: 0
     _isMage: 0
     _classId: 0
+    _baseClassId: 0
     _exp: 0
     _sp: 0
     _expPercent: 0