Skip to content

Commit

Permalink
细节修改
Browse files Browse the repository at this point in the history
  • Loading branch information
imengyu committed Sep 7, 2024
1 parent f245e94 commit 5a61d56
Show file tree
Hide file tree
Showing 114 changed files with 8,740 additions and 8,653 deletions.
5,586 changes: 3,453 additions & 2,133 deletions Assets/Game/Common/Fonts/SourceHanSerifCN Bold SDF.asset

Large diffs are not rendered by default.

1,791 changes: 10 additions & 1,781 deletions Assets/Game/Common/Fonts/bgt65 SDF.asset

Large diffs are not rendered by default.

93 changes: 93 additions & 0 deletions Assets/Game/Common/Materials/Game/Modul_15_Wood.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Modul_15_Wood
m_Shader: {fileID: 4800000, guid: 6e100b1f744cbca44ac87f9ca18e8ac2, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords:
- _EMISSION
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 2800000, guid: 0da309cdc5c443d4ea945139f0b17d92, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 4f0bbe18166134948b8e2682cf187c9b, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _Gloss: 100
- _GlossMapScale: 1
- _Glossiness: 1
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _AmbientColor: {r: 0.09803922, g: 0.09803922, b: 0.09803922, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Emission: {r: 0.33333334, g: 0.33333334, b: 0.33333334, a: 1}
- _EmissionColor: {r: 0.33333334, g: 0.33333334, b: 0.33333334, a: 1}
- _SpecColor: {r: 0.39215687, g: 0.39215687, b: 0.39215687, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/Game/Common/Materials/Game/SkyLayer.mat
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Material:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 550bc03f31e06d54e80a12103627045c, type: 3}
m_Scale: {x: 2, y: 2}
m_Offset: {x: 0.4898759, y: 0.54538774}
m_Offset: {x: 0.4645927, y: 0.57068276}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Game/Common/Materials/Game/SkyVotex.mat
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Material:
- _MainTex:
m_Texture: {fileID: 2800000, guid: d9c74ca925026884cb5f59a9107a1f40, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0.22948146, y: 0.444479}
m_Offset: {x: 0.7074225, y: 0.966537}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand Down
4 changes: 2 additions & 2 deletions Assets/Game/Common/Scripts/Small/CamFollow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,10 @@ private void _UpdateCam()
var z = Mathf.SmoothDamp(CamTarget.position.z, Target.position.z, ref smoothyVelocityCamTarget.z, CamTargetSmoothTime.z);
CamTarget.position = new Vector3(x, y, z);

/*x = Mathf.SmoothDamp(InGameCam.transform.position.x, CamPos.position.x, ref smoothyVelocityCam.x, SmoothTime.x);
x = Mathf.SmoothDamp(InGameCam.transform.position.x, CamPos.position.x, ref smoothyVelocityCam.x, SmoothTime.x);
y = Mathf.SmoothDamp(InGameCam.transform.position.y, CamPos.position.y, ref smoothyVelocityCam.y, SmoothTime.y);
z = Mathf.SmoothDamp(InGameCam.transform.position.z, CamPos.position.z, ref smoothyVelocityCam.z, SmoothTime.z);
InGameCam.transform.position = new Vector3(x, y, z);*/
InGameCam.transform.position = new Vector3(x, y, z);
}
}
}
Expand Down
Loading

0 comments on commit 5a61d56

Please sign in to comment.