Skip to content

Commit

Permalink
界面优化
Browse files Browse the repository at this point in the history
  • Loading branch information
imengyu committed Aug 2, 2024
1 parent b529694 commit b84650b
Show file tree
Hide file tree
Showing 18 changed files with 2,677 additions and 49 deletions.
640 changes: 630 additions & 10 deletions Assets/Game/Common/Fonts/SourceHanSerifCN Bold SDF.asset

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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.46727395, y: 0.9893584}
m_Offset: {x: 0.86308646, y: 0.38517237}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,14 @@ PrefabInstance:
propertyPath: m_Name
value: GameUIPageBallanceCommon
objectReference: {fileID: 0}
- target: {fileID: 6891604481642508031, guid: 6ba6ff8a13914cc44b67a08260e7c444, type: 3}
propertyPath: m_SizeDelta.x
value: -30
objectReference: {fileID: 0}
- target: {fileID: 6891604481642508031, guid: 6ba6ff8a13914cc44b67a08260e7c444, type: 3}
propertyPath: m_AnchoredPosition.x
value: 15
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &8574220209871740379
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2410934518318956559, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2410934518318956559, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2410934518318956559, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2410934518318956559, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2410934518318956559, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_SizeDelta.x
value: 400
objectReference: {fileID: 0}
- target: {fileID: 2410934518318956559, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2410934518318956559, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 27.5
objectReference: {fileID: 0}
- target: {fileID: 2638062383971566144, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_Name
value: GameUIPageBallanceCommonInGame
objectReference: {fileID: 0}
- target: {fileID: 3963393710311536829, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3963393710311536829, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3963393710311536829, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3963393710311536829, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3963393710311536829, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3963393710311536829, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3963393710311536829, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3963393710311536829, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3963393710311536829, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3963393710311536829, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3963393710311536829, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3963393710311536829, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3963393710311536829, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3963393710311536829, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3963393710311536829, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3963393710311536829, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3963393710311536829, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3963393710311536829, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3963393710311536829, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3963393710311536829, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9205596095822338699, guid: 8706028093448274bb09845557635c7b, type: 3}
propertyPath: m_ChildAlignment
value: 4
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8706028093448274bb09845557635c7b, type: 3}

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &6911990346279971510
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2534175694295953, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_Name
value: GameUIPageBallanceTransparentInGame
objectReference: {fileID: 0}
- target: {fileID: 423368295205147102, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 423368295205147102, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 423368295205147102, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 423368295205147102, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_SizeDelta.x
value: 300
objectReference: {fileID: 0}
- target: {fileID: 423368295205147102, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1411186373794097516, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1411186373794097516, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1411186373794097516, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1411186373794097516, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1411186373794097516, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1411186373794097516, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1411186373794097516, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1411186373794097516, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1411186373794097516, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1411186373794097516, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1411186373794097516, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1411186373794097516, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1411186373794097516, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1411186373794097516, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1411186373794097516, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1411186373794097516, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1411186373794097516, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1411186373794097516, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1411186373794097516, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1411186373794097516, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6581342297249155930, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}
propertyPath: m_ChildAlignment
value: 4
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: cf51ecebc3ed7f446bf4fac188b4bed2, type: 3}

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

52 changes: 52 additions & 0 deletions Assets/Game/Menu/Prefabs/Pages/PageHighscoreEntry.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 5492639443823692175}
m_Modifications:
- target: {fileID: 2555825379794015059, guid: 811d2a41527d36c43a3ec02653a15404, type: 3}
propertyPath: m_TextWrappingMode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3080357253436928746, guid: 811d2a41527d36c43a3ec02653a15404, type: 3}
propertyPath: m_Name
value: InputField
Expand Down Expand Up @@ -510,6 +514,54 @@ PrefabInstance:
propertyPath: m_FontData.m_FontSize
value: 18
objectReference: {fileID: 0}
- target: {fileID: 6906378512249644005, guid: 811d2a41527d36c43a3ec02653a15404, type: 3}
propertyPath: m_LineType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6906378512249644005, guid: 811d2a41527d36c43a3ec02653a15404, type: 3}
propertyPath: m_LineLimit
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6906378512249644005, guid: 811d2a41527d36c43a3ec02653a15404, type: 3}
propertyPath: m_CharacterLimit
value: 40
objectReference: {fileID: 0}
- target: {fileID: 6906378512249644005, guid: 811d2a41527d36c43a3ec02653a15404, type: 3}
propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6906378512249644005, guid: 811d2a41527d36c43a3ec02653a15404, type: 3}
propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 5
objectReference: {fileID: 0}
- target: {fileID: 6906378512249644005, guid: 811d2a41527d36c43a3ec02653a15404, type: 3}
propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 6721563976610585963}
- target: {fileID: 6906378512249644005, guid: 811d2a41527d36c43a3ec02653a15404, type: 3}
propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 6906378512249644005, guid: 811d2a41527d36c43a3ec02653a15404, type: 3}
propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: NotifyEvent
objectReference: {fileID: 0}
- target: {fileID: 6906378512249644005, guid: 811d2a41527d36c43a3ec02653a15404, type: 3}
propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: Ballance2.UI.Core.GameUIControlMessageSender, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 6906378512249644005, guid: 811d2a41527d36c43a3ec02653a15404, type: 3}
propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument
value:
objectReference: {fileID: 0}
- target: {fileID: 6906378512249644005, guid: 811d2a41527d36c43a3ec02653a15404, type: 3}
propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
value: BtnHighscrollEnterClick
objectReference: {fileID: 0}
- target: {fileID: 6906378512249644005, guid: 811d2a41527d36c43a3ec02653a15404, type: 3}
propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 7094400628871204474, guid: 811d2a41527d36c43a3ec02653a15404, type: 3}
propertyPath: m_Color.a
value: 0.30588236
Expand Down
4 changes: 2 additions & 2 deletions Assets/Game/Menu/Prefabs/Pages/PageSettingsControls.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -3003,7 +3003,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4537979571061933298, guid: 4eebc0c0ecf4702418cc59f1454c4a1e, type: 3}
propertyPath: m_Size
value: 0.75715333
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5165209636578772928, guid: 4eebc0c0ecf4702418cc59f1454c4a1e, type: 3}
propertyPath: m_AnchorMax.x
Expand Down Expand Up @@ -3043,7 +3043,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8492604842380458381, guid: 4eebc0c0ecf4702418cc59f1454c4a1e, type: 3}
propertyPath: m_AnchoredPosition.y
value: -244.12411
value: -212.46025
objectReference: {fileID: 0}
- target: {fileID: 9135458054118685939, guid: 4eebc0c0ecf4702418cc59f1454c4a1e, type: 3}
propertyPath: m_IsActive
Expand Down
Loading

0 comments on commit b84650b

Please sign in to comment.