diff --git a/Assets/GameAssets/Models/Materials/banzibai.mat b/Assets/GameAssets/Models/Materials/banzibai.mat index f2051a9..7114869 100644 --- a/Assets/GameAssets/Models/Materials/banzibai.mat +++ b/Assets/GameAssets/Models/Materials/banzibai.mat @@ -75,6 +75,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.6627451, g: 0.67058825, b: 0.65882355, a: 1} + - _Color: {r: 0.8113208, g: 0.8113208, b: 0.8113208, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Models/Materials/banzihuang.mat b/Assets/GameAssets/Models/Materials/banzihuang.mat index 21d4ef5..1c7935b 100644 --- a/Assets/GameAssets/Models/Materials/banzihuang.mat +++ b/Assets/GameAssets/Models/Materials/banzihuang.mat @@ -75,6 +75,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.86327225, g: 0.8679245, b: 0.76557493, a: 1} + - _Color: {r: 0.9339623, g: 0.9339623, b: 0.86788005, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Models/Materials/qiang.mat b/Assets/GameAssets/Models/Materials/qiang.mat index fbea7f4..8c4956b 100644 --- a/Assets/GameAssets/Models/Materials/qiang.mat +++ b/Assets/GameAssets/Models/Materials/qiang.mat @@ -59,7 +59,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _BumpScale: 0.1 + - _BumpScale: 0.15 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 diff --git a/Assets/GameAssets/Models/Materials/wuding.mat b/Assets/GameAssets/Models/Materials/wuding.mat index dacb131..e3a59f9 100644 --- a/Assets/GameAssets/Models/Materials/wuding.mat +++ b/Assets/GameAssets/Models/Materials/wuding.mat @@ -63,7 +63,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0 + - _Glossiness: 0.149 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 diff --git a/Assets/GameAssets/Models/Materials/zhuozi1.mat b/Assets/GameAssets/Models/Materials/zhuozi1.mat index 770a3c8..0245cf0 100644 --- a/Assets/GameAssets/Models/Materials/zhuozi1.mat +++ b/Assets/GameAssets/Models/Materials/zhuozi1.mat @@ -75,6 +75,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.7295985, g: 0.745283, b: 0.6433339, a: 1} + - _Color: {r: 0.8770321, g: 0.8867924, b: 0.7989498, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Models/Materials/地砖.mat b/Assets/GameAssets/Models/Materials/地砖.mat index 8328581..1e45a8b 100644 --- a/Assets/GameAssets/Models/Materials/地砖.mat +++ b/Assets/GameAssets/Models/Materials/地砖.mat @@ -63,7 +63,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0 + - _Glossiness: 0.188 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 @@ -75,6 +75,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.8962264, g: 0.88354397, b: 0.88354397, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/UI/UIPanel/UI_ChooesPanel.prefab b/Assets/Resources/UI/UIPanel/UI_ChooesPanel.prefab index 29c67fe..7c2ba8f 100644 --- a/Assets/Resources/UI/UIPanel/UI_ChooesPanel.prefab +++ b/Assets/Resources/UI/UIPanel/UI_ChooesPanel.prefab @@ -495,7 +495,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 163, y: 44} + m_SizeDelta: {x: 163, y: 490} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5625638144570284795 MonoBehaviour: @@ -599,7 +599,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 163, y: 44} + m_SizeDelta: {x: 163, y: 490} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5625638144801094709 MonoBehaviour: @@ -779,7 +779,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 163, y: 44} + m_SizeDelta: {x: 163, y: 490} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5625638144886982001 MonoBehaviour: @@ -883,7 +883,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 163, y: 44} + m_SizeDelta: {x: 163, y: 490} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5625638144949982617 MonoBehaviour: @@ -1227,7 +1227,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d5b6e81896d66714584751a0322bb84b, type: 3} + m_Sprite: {fileID: 21300000, guid: c0addab229469754d89e9bee5c8dfa29, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1668,9 +1668,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5625638145809909741} - - component: {fileID: 5625638145809909742} - component: {fileID: 5625638145809909743} - component: {fileID: 5625638145809909736} + - component: {fileID: 605059813701965407} m_Layer: 5 m_Name: "\u53F3\u4FA7\u9009\u62E9\u79D1\u76EE" m_TagString: Untagged @@ -1697,37 +1697,11 @@ RectTransform: m_Father: {fileID: 5625638143940417689} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -100.54001} - m_SizeDelta: {x: 187.5507, y: 0} - m_Pivot: {x: 1, y: 1} ---- !u!114 &5625638145809909742 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5625638145809909740} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 3 - m_Spacing: 32.3 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 490.0159} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5625638145809909743 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1740,8 +1714,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!114 &5625638145809909736 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1755,6 +1729,32 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_AllowSwitchOff: 1 +--- !u!114 &605059813701965407 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5625638145809909740} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 174.87 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &5625638145942618866 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Init.unity b/Assets/Scenes/Init.unity index 21ec869..766fa7d 100644 --- a/Assets/Scenes/Init.unity +++ b/Assets/Scenes/Init.unity @@ -246,8 +246,8 @@ Camera: m_GameObject: {fileID: 963194225} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -325,10 +325,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: loginRespons: - msg: state: - userId: 0 - token: + message: --- !u!4 &1435305960 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/LoginScene.unity b/Assets/Scenes/LoginScene.unity index bf6d83b..23ac905 100644 --- a/Assets/Scenes/LoginScene.unity +++ b/Assets/Scenes/LoginScene.unity @@ -158,8 +158,8 @@ Camera: m_GameObject: {fileID: 693612463} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 diff --git a/Assets/Scenes/xianchang.unity b/Assets/Scenes/xianchang.unity index 4018e18..ad90fc7 100644 --- a/Assets/Scenes/xianchang.unity +++ b/Assets/Scenes/xianchang.unity @@ -1853,7 +1853,7 @@ Light: serializedVersion: 10 m_Type: 1 m_Shape: 0 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Color: {r: 0.9150943, g: 0.89540696, b: 0.8417141, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30