lzx 2 days ago
parent
commit
a4f9da32f3

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui fb kuang glow3 mask uv.mat

@@ -139,7 +139,7 @@ Material:
     - _MainSpeedU: 0
     - _MainSpeedU: 0
     - _MainSpeedV: 0
     - _MainSpeedV: 0
     - _MainTexOffsetU: 0
     - _MainTexOffsetU: 0
-    - _MainTexOffsetV: -0.044610858
+    - _MainTexOffsetV: -0.3
     - _MainTilingU: 1
     - _MainTilingU: 1
     - _MainTilingV: 0.78
     - _MainTilingV: 0.78
     - _MaskSpeedU: 0.5
     - _MaskSpeedU: 0.5

+ 2 - 2
Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -110,7 +110,7 @@ RectTransform:
   m_Father: {fileID: 3729966574632931888}
   m_Father: {fileID: 3729966574632931888}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -1912,7 +1912,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8620268506487690809
 --- !u!224 &8620268506487690809
 RectTransform:
 RectTransform:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0

+ 1 - 1
Assets/Scenes/testCombat.scene

@@ -2394,7 +2394,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_RemovedGameObjects: []

+ 1 - 1
ProjectSettings/GraphicsSettings.asset

@@ -63,7 +63,7 @@ GraphicsSettings:
   m_FogKeepExp2: 1
   m_FogKeepExp2: 1
   m_AlbedoSwatchInfos: []
   m_AlbedoSwatchInfos: []
   m_ModelImportDefaultMaterial: {fileID: 0}
   m_ModelImportDefaultMaterial: {fileID: 0}
-  m_LightsUseLinearIntensity: 0
+  m_LightsUseLinearIntensity: 1
   m_LightsUseColorTemperature: 1
   m_LightsUseColorTemperature: 1
   m_DefaultRenderingLayerMask: 1
   m_DefaultRenderingLayerMask: 1
   m_LogWhenShaderIsCompiled: 0
   m_LogWhenShaderIsCompiled: 0

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -49,7 +49,7 @@ PlayerSettings:
   defaultScreenWidthWeb: 960
   defaultScreenWidthWeb: 960
   defaultScreenHeightWeb: 600
   defaultScreenHeightWeb: 600
   m_StereoRenderingPath: 0
   m_StereoRenderingPath: 0
-  m_ActiveColorSpace: 0
+  m_ActiveColorSpace: 1
   unsupportedMSAAFallback: 0
   unsupportedMSAAFallback: 0
   m_SpriteBatchVertexThreshold: 300
   m_SpriteBatchVertexThreshold: 300
   m_MTRendering: 1
   m_MTRendering: 1