temporary merge conflict

shnok · Jun 30, 2024 · f069183 · f069183
1 parent 41b34f5
commit f069183
Show file tree

Hide file tree

Showing 8 changed files with 183 additions and 171 deletions.
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}
@@ -95,8 +95,8 @@ Material:
     - _GradientColor1: {r: 0, g: 0.3529412, b: 0.54901963, a: 1}
     - _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.70602065, g: 0.055406287, b: 0.70602053, a: 0}
+    - _MainLightRight: {r: 0.7071067, g: 0, b: -0.7071069, a: 0}
+    - _MainLightUp: {r: -0.039178163, g: 0.99846387, b: -0.039178163, a: 0}
     - _SunMoonColor: {r: 1, g: 1, b: 1, a: 0}
   m_BuildTextureStacks: []
diff --git a/l2-unity/Assets/Resources/Data/UI/Window.meta b/l2-unity/Assets/Resources/Data/UI/Window.meta
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Windows.meta b/l2-unity/Assets/Resources/Data/UI/_Elements/Windows.meta
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Windows/CharacterInfo.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Windows/CharacterInfo.uxml
@@ -1,5 +1,5 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xmlns="UnityEngine.UIElements" editor-extension-mode="False">
-    <ui:Template name="DelautWIndows" calss="template-default-windows" src="project://database/Assets/Resources/Data/UI/_Elements/DelautWIndows.uxml?fileID=9197481963319205126&amp;guid=403e813a342f65b4298dd7bfbb37c266&amp;type=3#DelautWIndows" />
+    <ui:Template name="DelautWIndows" src="project://database/Assets/Resources/Data/UI/_Elements/DelautWIndows.uxml?fileID=9197481963319205126&amp;guid=403e813a342f65b4298dd7bfbb37c266&amp;type=3#DelautWIndows" />
     <ui:Instance name="defaultWindows" template="DelautWIndows" style="width: 400px; height: 530px; left: 0; bottom: 0; position: absolute;">
         <AttributeOverrides element-name="windows-name-label" text="Character Status" />
         <ui:GroupBox name="Content" class="content" style="margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 0; padding-bottom: 0; padding-left: 0; align-self: stretch; width: 100%; height: 100%; position: absolute; top: 40px;">

diff --git a/l2-unity/Assets/Resources/Prefab/UI.prefab b/l2-unity/Assets/Resources/Prefab/UI.prefab
@@ -19,6 +19,8 @@ GameObject:
   - component: {fileID: 3547752662103543225}
   - component: {fileID: 2482552831895554876}
   - component: {fileID: 1268749513020361338}
+  - component: {fileID: 546440373717176269}
+  - component: {fileID: 6226201242212851191}
   m_Layer: 0
   m_Name: UI
   m_TagString: Untagged
@@ -187,3 +189,27 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 931ea9a304526324bbbfa65df356126e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &546440373717176269
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8310766140472177322}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e1e1f61e3e8843749a6bff1e8c03a6cc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &6226201242212851191
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8310766140472177322}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d3ce6afa5c284fa48b88e8b14d501e28, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
diff --git a/l2-unity/Assets/Scenes/Game.unity b/l2-unity/Assets/Scenes/Game.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 0.265
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 1678428046}
-  m_IndirectSpecularColor: {r: 0.066682234, g: 0.08874011, b: 0.10072155, a: 0.265}
+  m_IndirectSpecularColor: {r: 0.06828698, g: 0.10071014, b: 0.117806815, a: 0.265}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -123,75 +123,6 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
---- !u!21 &5843016
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Override
-  m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs: []
-    m_Ints: []
-    m_Floats:
-    - _AdvancedCat: 1
-    - _Banner: 1
-    - _DirectionalCat: 1
-    - _DirectionalFalloff: 2
-    - _DirectionalIntensity: 1
-    - _FarDistanceHeight: 0
-    - _FarDistanceOffset: 0
-    - _FogAxisMode: 1
-    - _FogCameraMode: 0
-    - _FogCat: 1
-    - _FogColorDuo: 1
-    - _FogDistanceEnd: 100
-    - _FogDistanceFalloff: 2
-    - _FogDistanceStart: 0
-    - _FogHeightEnd: 100
-    - _FogHeightFalloff: 2
-    - _FogHeightStart: 0
-    - _FogIntensity: 1
-    - _FogLayersMode: 0
-    - _IsHeightFogPreset: 1
-    - _IsHeightFogShader: 1
-    - _JitterIntensity: 1
-    - _NoiseCat: 1
-    - _NoiseDistanceEnd: 50
-    - _NoiseIntensity: 1
-    - _NoiseMax: 1
-    - _NoiseMin: 0
-    - _NoiseModeBlend: 1
-    - _NoiseScale: 30
-    - _SkyboxCat: 1
-    - _SkyboxFogBottom: 0
-    - _SkyboxFogFalloff: 1
-    - _SkyboxFogFill: 1
-    - _SkyboxFogHeight: 1
-    - _SkyboxFogIntensity: 1
-    - _SkyboxFogOffset: 0
-    m_Colors:
-    - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1}
-    - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0}
-    - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0}
-    - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1}
-    - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1}
-    - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0}
-  m_BuildTextureStacks: []
 --- !u!1 &119250918
 GameObject:
   m_ObjectHideFlags: 0
@@ -396,7 +327,7 @@ MonoBehaviour:
   gizmosDistance: 100
   export: 1
   exportPath: geodata
---- !u!21 &329668026
+--- !u!21 &366335983
 Material:
   serializedVersion: 8
   m_ObjectHideFlags: 0
@@ -740,13 +671,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 28a1a60c117e7e44dba97be3fe75b97c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  uvTextureSize: 256
-  uvLayerAlphaMapSize: 1024
-  decoLayerAlphaMapSize: 512
-  uvTileSize: 5
-  mapScale: 1
-  generateMap: 1
-  maps: []
 --- !u!4 &688311054
 Transform:
   m_ObjectHideFlags: 0
@@ -1742,15 +1666,19 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 4181994143891002370, guid: 824ee6870a432f9439e35ee4e771a1f5, type: 3}
       propertyPath: m_Color.b
-      value: 0.6491748
+      value: 0.59607846
       objectReference: {fileID: 0}
     - target: {fileID: 4181994143891002370, guid: 824ee6870a432f9439e35ee4e771a1f5, type: 3}
       propertyPath: m_Color.g
-      value: 0.82681894
+      value: 0.43137255
+      objectReference: {fileID: 0}
+    - target: {fileID: 4181994143891002370, guid: 824ee6870a432f9439e35ee4e771a1f5, type: 3}
+      propertyPath: m_Color.r
+      value: 0.39607844
       objectReference: {fileID: 0}
     - target: {fileID: 4181994143891002370, guid: 824ee6870a432f9439e35ee4e771a1f5, type: 3}
       propertyPath: m_Intensity
-      value: 0
+      value: 0.4
       objectReference: {fileID: 0}
     - target: {fileID: 4181994143891002370, guid: 824ee6870a432f9439e35ee4e771a1f5, type: 3}
       propertyPath: m_RenderMode
@@ -1790,19 +1718,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7988497584237515198, guid: 824ee6870a432f9439e35ee4e771a1f5, type: 3}
       propertyPath: m_LocalRotation.w
-      value: -0.00086008466
+      value: 0.8398675
       objectReference: {fileID: 0}
     - target: {fileID: 7988497584237515198, guid: 824ee6870a432f9439e35ee4e771a1f5, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0.92387915
+      value: 0.38493633
       objectReference: {fileID: 0}
     - target: {fileID: 7988497584237515198, guid: 824ee6870a432f9439e35ee4e771a1f5, type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0.00035625877
+      value: 0.34788454
       objectReference: {fileID: 0}
     - target: {fileID: 7988497584237515198, guid: 824ee6870a432f9439e35ee4e771a1f5, type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.3826833
+      value: -0.15944585
       objectReference: {fileID: 0}
     - target: {fileID: 7988497584237515198, guid: 824ee6870a432f9439e35ee4e771a1f5, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1831,6 +1759,75 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7988497584237515198, guid: 824ee6870a432f9439e35ee4e771a1f5, type: 3}
   m_PrefabInstance: {fileID: 1678428045}
   m_PrefabAsset: {fileID: 0}
+--- !u!21 &1748966797
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Override
+  m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs: []
+    m_Ints: []
+    m_Floats:
+    - _AdvancedCat: 1
+    - _Banner: 1
+    - _DirectionalCat: 1
+    - _DirectionalFalloff: 2
+    - _DirectionalIntensity: 1
+    - _FarDistanceHeight: 0
+    - _FarDistanceOffset: 0
+    - _FogAxisMode: 1
+    - _FogCameraMode: 0
+    - _FogCat: 1
+    - _FogColorDuo: 1
+    - _FogDistanceEnd: 100
+    - _FogDistanceFalloff: 2
+    - _FogDistanceStart: 0
+    - _FogHeightEnd: 100
+    - _FogHeightFalloff: 2
+    - _FogHeightStart: 0
+    - _FogIntensity: 1
+    - _FogLayersMode: 0
+    - _IsHeightFogPreset: 1
+    - _IsHeightFogShader: 1
+    - _JitterIntensity: 1
+    - _NoiseCat: 1
+    - _NoiseDistanceEnd: 50
+    - _NoiseIntensity: 1
+    - _NoiseMax: 1
+    - _NoiseMin: 0
+    - _NoiseModeBlend: 1
+    - _NoiseScale: 30
+    - _SkyboxCat: 1
+    - _SkyboxFogBottom: 0
+    - _SkyboxFogFalloff: 1
+    - _SkyboxFogFill: 1
+    - _SkyboxFogHeight: 1
+    - _SkyboxFogIntensity: 1
+    - _SkyboxFogOffset: 0
+    m_Colors:
+    - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1}
+    - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0}
+    - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0}
+    - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1}
+    - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1}
+    - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0}
+  m_BuildTextureStacks: []
 --- !u!1 &1913599224
 GameObject:
   m_ObjectHideFlags: 0