char creation UI and cameras, shader tweaks

shnok · Jun 19, 2024 · 08d136f · 08d136f
1 parent 5634c27
commit 08d136f
Show file tree

Hide file tree

Showing 89 changed files with 6,073 additions and 706 deletions.
diff --git a/l2-unity/Assets/Resources/Data/Effects/l2_lobby_sky/l2_lobby_sky.mat b/l2-unity/Assets/Resources/Data/Effects/l2_lobby_sky/l2_lobby_sky.mat
@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: l2_lobby_sky
-  m_Shader: {fileID: -6465566751694194690, guid: 829c3885a4093e14385bc07c0a6641f5, type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: 93738d1d902b78945950b598e0c88e17, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
@@ -107,6 +107,7 @@ Material:
     - _Metallic: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.005
+    - _QueueControl: 0
     - _QueueOffset: 0
     - _ReceiveShadows: 1
     - _Smoothness: 0.5

diff --git a/l2-unity/Assets/Resources/Data/Effects/l2_lobby_sky/l2_lobby_sky2.mat b/l2-unity/Assets/Resources/Data/Effects/l2_lobby_sky/l2_lobby_sky2.mat
@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: l2_lobby_sky2
-  m_Shader: {fileID: -6465566751694194690, guid: 829c3885a4093e14385bc07c0a6641f5, type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: 93738d1d902b78945950b598e0c88e17, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
@@ -107,6 +107,7 @@ Material:
     - _Metallic: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.005
+    - _QueueControl: 0
     - _QueueOffset: 0
     - _ReceiveShadows: 1
     - _Smoothness: 0.5

diff --git a/l2-unity/Assets/Resources/Data/Effects/skybox/L2Sky.mat b/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,11 +92,11 @@ Material:
     - _Stars_Y_Tile: 1
     - _SunMoonSize: 0.13
     m_Colors:
-    - _GradientColor1: {r: 0, g: 0.3529412, b: 0.54901963, a: 1}
+    - _GradientColor1: {r: 0.26544684, g: 0.20095016, b: 0.16288331, a: 0.9348997}
     - _GradientColor2: {r: 0, g: 0, b: 0, a: 1}
     - _GradientColor3: {r: 7.488819, g: 7.981503, b: 8.47419, a: 1}
-    - _MainLightForward: {r: -0.35781986, g: -0.86251384, b: -0.35781986, a: 0}
-    - _MainLightRight: {r: 0.7071067, g: -0.000000029802322, b: -0.7071069, a: 0}
-    - _MainLightUp: {r: 0.6098894, g: -0.5060337, b: 0.6098893, a: 0}
+    - _MainLightForward: {r: 0.70626634, g: 0.048742864, b: 0.7062662, a: 0}
+    - _MainLightRight: {r: 0.70710677, g: 0.0000000018626451, b: -0.7071069, a: 0}
+    - _MainLightUp: {r: -0.034466416, g: 0.99881136, b: -0.034466404, a: 0}
     - _SunMoonColor: {r: 1, g: 1, b: 1, a: 0}
   m_BuildTextureStacks: []
diff --git a/l2-unity/Assets/Resources/Data/Maps/l2_lobby/StaticMeshes.prefab b/l2-unity/Assets/Resources/Data/Maps/l2_lobby/StaticMeshes.prefab
@@ -55895,7 +55895,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: aa48ffe2ba1ad774fb3e1d0ecf218330, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  rotateSpeed: -3
+  rotateSpeed: -5
 --- !u!1 &4781430676591304283
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/l2-unity/Assets/Resources/Data/Maps/l2_lobby/l2_lobby_Mat.mat b/l2-unity/Assets/Resources/Data/Maps/l2_lobby/l2_lobby_Mat.mat
@@ -16,7 +16,7 @@ Material:
   m_LightmapFlags: 2
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2000
   stringTagMap: {}
   disabledShaderPasses: []
   m_LockedProperties: 

diff --git a/l2-unity/Assets/Resources/Data/Shaders/L2Grass.shadergraph b/l2-unity/Assets/Resources/Data/Shaders/L2Grass.shadergraph
@@ -155,6 +155,15 @@
         },
         {
             "m_Id": "b9530d2e866b42a18eef5cfc2924104e"
+        },
+        {
+            "m_Id": "5926f322a5b04a72999bcb93f46cb52d"
+        },
+        {
+            "m_Id": "37c15203d92341b98fa8e2190ffefe79"
+        },
+        {
+            "m_Id": "78add7278a974b16a2959d02b2128cac"
         }
     ],
     "m_GroupDatas": [
@@ -709,6 +718,15 @@
             },
             {
                 "m_Id": "8d45e2b81a88488db139429c4fa0e3a9"
+            },
+            {
+                "m_Id": "5926f322a5b04a72999bcb93f46cb52d"
+            },
+            {
+                "m_Id": "37c15203d92341b98fa8e2190ffefe79"
+            },
+            {
+                "m_Id": "78add7278a974b16a2959d02b2128cac"
             }
         ]
     },
@@ -1406,12 +1424,12 @@
     "m_ObjectId": "238cdb0fa36145dcb7525ce8cba0f598",
     "m_Datas": [],
     "m_ActiveSubTarget": {
-        "m_Id": "f08cfc8df43443868dc5582dd386fa22"
+        "m_Id": "c19a43df2cdf4e6aa4748e7bd78e1ca8"
     },
     "m_AllowMaterialOverride": false,
-    "m_SurfaceType": 0,
+    "m_SurfaceType": 1,
     "m_ZTestMode": 4,
-    "m_ZWriteControl": 0,
+    "m_ZWriteControl": 1,
     "m_AlphaMode": 0,
     "m_RenderFace": 0,
     "m_AlphaClip": true,
@@ -1675,6 +1693,36 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot",
+    "m_ObjectId": "34b1417a9a7d497aae85b9c49e3a9eb3",
+    "m_Id": 0,
+    "m_DisplayName": "Emission",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Emission",
+    "m_StageCapability": 2,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": [],
+    "m_ColorMode": 1,
+    "m_DefaultColor": {
+        "r": 0.0,
+        "g": 0.0,
+        "b": 0.0,
+        "a": 1.0
+    }
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
@@ -1709,6 +1757,40 @@
     "m_BareResource": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "37c15203d92341b98fa8e2190ffefe79",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "SurfaceDescription.Occlusion",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "9734df49ebde44eb80c8d99f0abea712"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "SurfaceDescription.Occlusion"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
@@ -2350,6 +2432,40 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "5926f322a5b04a72999bcb93f46cb52d",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "SurfaceDescription.Emission",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "34b1417a9a7d497aae85b9c49e3a9eb3"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "SurfaceDescription.Emission"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -2917,6 +3033,21 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "707f0b2cce794053ad95ae928fce798d",
+    "m_Id": 0,
+    "m_DisplayName": "Metallic",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Metallic",
+    "m_StageCapability": 2,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": []
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
@@ -3036,6 +3167,40 @@
     "m_SerializedDescriptor": "SurfaceDescription.NormalTS"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "78add7278a974b16a2959d02b2128cac",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "SurfaceDescription.Metallic",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 0.0,
+            "height": 0.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "707f0b2cce794053ad95ae928fce798d"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "SurfaceDescription.Metallic"
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode",
@@ -3368,6 +3533,21 @@
     "m_Channel": 0
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "9734df49ebde44eb80c8d99f0abea712",
+    "m_Id": 0,
+    "m_DisplayName": "Ambient Occlusion",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Occlusion",
+    "m_StageCapability": 2,
+    "m_Value": 1.0,
+    "m_DefaultValue": 1.0,
+    "m_Labels": []
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -3981,6 +4161,16 @@
     }
 }
 
+{
+    "m_SGVersion": 2,
+    "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget",
+    "m_ObjectId": "c19a43df2cdf4e6aa4748e7bd78e1ca8",
+    "m_WorkflowMode": 1,
+    "m_NormalDropOffSpace": 0,
+    "m_ClearCoat": false,
+    "m_BlendModePreserveSpecular": true
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
@@ -4296,7 +4486,7 @@
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
     "m_Hidden": false,
-    "m_Value": 0.20000000298023225,
+    "m_Value": 0.03999999910593033,
     "m_FloatType": 0,
     "m_RangeValues": {
         "x": 0.0,
@@ -4554,7 +4744,7 @@
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
     "m_Hidden": false,
-    "m_Value": 0.0,
+    "m_Value": 0.009999999776482582,
     "m_FloatType": 0,
     "m_RangeValues": {
         "x": 0.0,
@@ -4814,12 +5004,6 @@
     "m_Labels": []
 }
 
-{
-    "m_SGVersion": 2,
-    "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget",
-    "m_ObjectId": "f08cfc8df43443868dc5582dd386fa22"
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",