diff --git a/Assets/TcgEngine/Scenes/Game/Game.unity b/Assets/TcgEngine/Scenes/Game/Game.unity index 0ca1fb6..3721ec9 100644 --- a/Assets/TcgEngine/Scenes/Game/Game.unity +++ b/Assets/TcgEngine/Scenes/Game/Game.unity @@ -1567,6 +1567,21 @@ PrefabInstance: propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} + - target: {fileID: 5621716278606480176, guid: 310f492c3e6afc24b9cb0f4f467ec27d, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5621716278606480176, guid: 310f492c3e6afc24b9cb0f4f467ec27d, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5621716278606480176, guid: 310f492c3e6afc24b9cb0f4f467ec27d, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5621716278606480176, guid: 310f492c3e6afc24b9cb0f4f467ec27d, type: 3} propertyPath: m_LocalPosition.x @@ -1648,6 +1663,21 @@ PrefabInstance: propertyPath: m_WasSpriteAssigned value: 1 objectReference: {fileID: 0} + - target: {fileID: 5621716279381743939, guid: 310f492c3e6afc24b9cb0f4f467ec27d, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5621716279381743939, guid: 310f492c3e6afc24b9cb0f4f467ec27d, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5621716279381743939, guid: 310f492c3e6afc24b9cb0f4f467ec27d, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 310f492c3e6afc24b9cb0f4f467ec27d, type: 3} --- !u!4 &1156614219 stripped @@ -18673,6 +18703,21 @@ PrefabInstance: propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} + - target: {fileID: 5621716278606480176, guid: 310f492c3e6afc24b9cb0f4f467ec27d, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5621716278606480176, guid: 310f492c3e6afc24b9cb0f4f467ec27d, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5621716278606480176, guid: 310f492c3e6afc24b9cb0f4f467ec27d, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5621716278606480176, guid: 310f492c3e6afc24b9cb0f4f467ec27d, type: 3} propertyPath: m_LocalPosition.x @@ -18728,6 +18773,21 @@ PrefabInstance: propertyPath: m_Name value: BoardDeck objectReference: {fileID: 0} + - target: {fileID: 5621716279381743939, guid: 310f492c3e6afc24b9cb0f4f467ec27d, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5621716279381743939, guid: 310f492c3e6afc24b9cb0f4f467ec27d, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5621716279381743939, guid: 310f492c3e6afc24b9cb0f4f467ec27d, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 310f492c3e6afc24b9cb0f4f467ec27d, type: 3} --- !u!114 &5626139744338325029 diff --git a/Assets/TcgEngine/Scenes/Menu/Menu.unity b/Assets/TcgEngine/Scenes/Menu/Menu.unity index d96b2fe..d85ef8c 100644 --- a/Assets/TcgEngine/Scenes/Menu/Menu.unity +++ b/Assets/TcgEngine/Scenes/Menu/Menu.unity @@ -3854,6 +3854,127 @@ Camera: type: 3} m_PrefabInstance: {fileID: 983565676500959008} m_PrefabAsset: {fileID: 0} +--- !u!1 &176883479 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 176883480} + - component: {fileID: 176883483} + - component: {fileID: 176883482} + - component: {fileID: 176883481} + m_Layer: 5 + m_Name: ClearButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &176883480 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 176883479} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3342894375292092703} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -22.399994, y: 0} + m_SizeDelta: {x: 25, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &176883481 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 176883479} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 176883482} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &176883482 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 176883479} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 5b56d48dca6b45f4eac726a4632ae830, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &176883483 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 176883479} + m_CullTransparentMesh: 1 --- !u!1 &187141750 GameObject: m_ObjectHideFlags: 0 @@ -6693,7 +6814,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1963065756} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -9681,6 +9802,86 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 500358687} m_CullTransparentMesh: 0 +--- !u!1 &504123484 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 504123485} + - component: {fileID: 504123487} + - component: {fileID: 504123486} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &504123485 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 504123484} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1689588726} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &504123486 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 504123484} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 28 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u597D\u53CB" +--- !u!222 &504123487 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 504123484} + m_CullTransparentMesh: 1 --- !u!1 &504128231 GameObject: m_ObjectHideFlags: 0 @@ -12223,7 +12424,7 @@ RectTransform: m_Children: - {fileID: 15523033} m_Father: {fileID: 3342894375174218281} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -19051,12 +19252,12 @@ RectTransform: m_Children: - {fileID: 1531967447} m_Father: {fileID: 1969396738} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -121, y: 0} - m_SizeDelta: {x: 160, y: 46.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 347.05124, y: -90.945} + m_SizeDelta: {x: 206.4, y: 67.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &994162388 MonoBehaviour: @@ -19134,7 +19335,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 80bb4745fbd49ca49b161ac56ac1eb9b, type: 3} + m_Sprite: {fileID: 21300000, guid: 2efbff7fa488c1d44adb5aa49b998165, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -23559,12 +23760,12 @@ RectTransform: m_Children: - {fileID: 1262311938} m_Father: {fileID: 1969396738} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 56.9, y: 0} - m_SizeDelta: {x: 160, y: 46.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 578.41876, y: -90.945} + m_SizeDelta: {x: 206.4, y: 67.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1231300872 MonoBehaviour: @@ -23642,7 +23843,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 80bb4745fbd49ca49b161ac56ac1eb9b, type: 3} + m_Sprite: {fileID: 21300000, guid: 2efbff7fa488c1d44adb5aa49b998165, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -24768,8 +24969,8 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 294abb673bffdbb498170d01a73153e5, type: 3} - m_FontSize: 18 - m_FontStyle: 0 + m_FontSize: 28 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 1 m_MaxSize: 40 @@ -24779,7 +24980,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Sell Duplicates + m_Text: "\u91CD\u590D\u5361\u7EC4" --- !u!222 &1262311940 CanvasRenderer: m_ObjectHideFlags: 0 @@ -29970,6 +30171,86 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1481816473} m_CullTransparentMesh: 1 +--- !u!1 &1497002440 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1497002441} + - component: {fileID: 1497002443} + - component: {fileID: 1497002442} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1497002441 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1497002440} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3342894376018028529} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1497002442 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1497002440} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 28 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5207\u6362\u8D26\u53F7" +--- !u!222 &1497002443 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1497002440} + m_CullTransparentMesh: 1 --- !u!1 &1520293343 GameObject: m_ObjectHideFlags: 0 @@ -30363,8 +30644,8 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 294abb673bffdbb498170d01a73153e5, type: 3} - m_FontSize: 24 - m_FontStyle: 0 + m_FontSize: 28 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 @@ -30374,7 +30655,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Account + m_Text: "\u8D26\u6237" --- !u!222 &1531967449 CanvasRenderer: m_ObjectHideFlags: 0 @@ -33193,15 +33474,16 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1963065756} - m_RootOrder: 3 + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 504123485} + m_Father: {fileID: 1969396738} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 257.9, y: 101.2} - m_SizeDelta: {x: 344, y: 112} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 115.68375, y: -90.945} + m_SizeDelta: {x: 206.4, y: 67.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1689588727 MonoBehaviour: @@ -33279,7 +33561,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 30a75d4f4f79a684aa6d4821dac2ff56, type: 3} + m_Sprite: {fileID: 21300000, guid: 2efbff7fa488c1d44adb5aa49b998165, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -33923,82 +34205,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1726359333} m_CullTransparentMesh: 0 ---- !u!1 &1727023670 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1727023671} - - component: {fileID: 1727023673} - - component: {fileID: 1727023672} - m_Layer: 5 - m_Name: "\u6548\u679C\u56FE" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1727023671 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1727023670} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3342894375174218281} - m_RootOrder: 10 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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: 1920, y: 1080} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1727023672 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1727023670} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 534621490949fbe4fbfee3b3e4fa20ea, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1727023673 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1727023670} - m_CullTransparentMesh: 1 --- !u!1 &1727585005 GameObject: m_ObjectHideFlags: 0 @@ -37599,8 +37805,7 @@ RectTransform: - {fileID: 2049775963} - {fileID: 1575221721} - {fileID: 139299861} - - {fileID: 1689588726} - - {fileID: 3342894376018028529} + - {fileID: 1969396738} - {fileID: 3342894376182944059} - {fileID: 309934204} m_Father: {fileID: 3342894375174218281} @@ -37660,13 +37865,14 @@ GameObject: - component: {fileID: 1969396738} - component: {fileID: 1969396740} - component: {fileID: 1969396739} + - component: {fileID: 1969396741} m_Layer: 5 m_Name: BoxBottom m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1969396738 RectTransform: m_ObjectHideFlags: 0 @@ -37679,15 +37885,17 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1689588726} - {fileID: 994162387} - {fileID: 1231300871} - m_Father: {fileID: 3342894375174218281} - m_RootOrder: 4 + - {fileID: 3342894376018028529} + m_Father: {fileID: 1963065756} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -8.52002, y: -293} - m_SizeDelta: {x: 786.6599, y: 74.65} + m_AnchoredPosition: {x: 7.89, y: -201.95} + m_SizeDelta: {x: 925.47, y: 181.89} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1969396739 MonoBehaviour: @@ -37696,7 +37904,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1969396737} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -37727,6 +37935,32 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1969396737} m_CullTransparentMesh: 0 +--- !u!114 &1969396741 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1969396737} + m_Enabled: 0 + 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: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &1970634022 GameObject: m_ObjectHideFlags: 0 @@ -40453,7 +40687,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3342894375174218281} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -50228,7 +50462,7 @@ RectTransform: - {fileID: 3342894375636335590} - {fileID: 3342894376110413257} m_Father: {fileID: 3342894375174218281} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -50474,7 +50708,7 @@ CanvasGroup: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3342894375174218282} m_Enabled: 1 - m_Alpha: 1 + m_Alpha: 0 m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 @@ -50578,6 +50812,7 @@ MonoBehaviour: user_password_new: {fileID: 3342894376208348416} user_password_confirm: {fileID: 3342894375334912332} edit_change_email: {fileID: 3342894376104381832} + edit_email_text: {fileID: 176883481} edit_change_password: {fileID: 3342894376831582099} resend_button: {fileID: 3342894375922929743} confirm_button: {fileID: 3342894376255919644} @@ -50598,13 +50833,11 @@ RectTransform: - {fileID: 1963065756} - {fileID: 1714191683} - {fileID: 3342894375690132110} - - {fileID: 1969396738} - {fileID: 3342894375098959691} - {fileID: 3342894375822018242} - {fileID: 3342894375485981713} - {fileID: 645195504} - {fileID: 2133752679} - - {fileID: 1727023671} m_Father: {fileID: 581826003} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -51389,13 +51622,14 @@ RectTransform: m_Children: - {fileID: 3342894375727929264} - {fileID: 3342894376586087311} + - {fileID: 176883480} m_Father: {fileID: 3342894377127575303} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 6, y: -131} - m_SizeDelta: {x: 411.2044, y: 45.1408} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 54} + m_SizeDelta: {x: 328.99, y: 45.14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3342894375334912330 CanvasRenderer: @@ -51492,8 +51726,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 97.9, y: -295} - m_SizeDelta: {x: 255.5, y: 38} + m_AnchoredPosition: {x: 0.00025177002, y: -100} + m_SizeDelta: {x: 328.34, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3342894375334912334 GameObject: @@ -52600,8 +52834,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 0eaa5f008f3a0e840afc478d9080d03c, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -52619,7 +52853,7 @@ RectTransform: m_GameObject: {fileID: 3342894375485981714} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.5148779, y: 0.5148779, z: 0.5148779} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3342894376620086118} @@ -52630,12 +52864,12 @@ RectTransform: - {fileID: 3342894376044364570} - {fileID: 1030106708} m_Father: {fileID: 3342894375174218281} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -35.3} - m_SizeDelta: {x: 1000, y: 992.52} + m_SizeDelta: {x: 738, y: 836} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3342894375485981714 GameObject: @@ -52665,7 +52899,7 @@ CanvasGroup: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3342894375485981714} m_Enabled: 1 - m_Alpha: 1 + m_Alpha: 0 m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 @@ -52769,7 +53003,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!222 &3342894375516062594 CanvasRenderer: m_ObjectHideFlags: 0 @@ -53911,7 +54145,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.3529412, g: 0.28627452, b: 0.41568628, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -53921,17 +54155,17 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 12800000, guid: df83a8ef8ec265d408cd57ce58f209bf, type: 3} m_FontSize: 54 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 0 m_MaxSize: 70 - m_Alignment: 3 + m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: PASSWORD + m_Text: "\u5BC6\u7801" --- !u!224 &3342894375701584530 RectTransform: m_ObjectHideFlags: 0 @@ -53953,8 +54187,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -220, y: 41.80003} - m_SizeDelta: {x: 358.32623, y: 131.91652} + m_AnchoredPosition: {x: 1.396, y: -94.88} + m_SizeDelta: {x: 635.52, y: 360.59} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3342894375701584531 GameObject: @@ -54033,7 +54267,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 7, y: -0.8000145} + m_AnchoredPosition: {x: 7, y: -0.8000183} m_SizeDelta: {x: -20, y: -0.0000038146973} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3342894375727929265 @@ -54933,7 +55167,7 @@ RectTransform: - {fileID: 3342894376044751989} - {fileID: 3342894376459087634} m_Father: {fileID: 3342894375174218281} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -55309,7 +55543,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 1} + m_Color: {r: 0.3529412, g: 0.28627452, b: 0.41568628, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -55323,13 +55557,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: RESEND CONFIRMATION + m_Text: "\u91CD\u65B0\u53D1\u9001\u786E\u8BA4" --- !u!114 &3342894375922929743 MonoBehaviour: m_ObjectHideFlags: 0 @@ -55401,10 +55635,10 @@ RectTransform: m_Father: {fileID: 3342894377127575303} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 33.600006, y: -71.500046} - m_SizeDelta: {x: 308.4, y: 54.5} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -146.68, y: -26.835022} + m_SizeDelta: {x: 204.33002, y: 54.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3342894375922929777 GameObject: @@ -56285,7 +56519,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 64066fe422ac1de4281b2a471fae2139, type: 3} + m_Sprite: {fileID: 21300000, guid: 2efbff7fa488c1d44adb5aa49b998165, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -56318,10 +56552,10 @@ MonoBehaviour: m_Colors: m_NormalColor: {r: 0.8962264, g: 0.8962264, b: 0.8962264, a: 0.9254902} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_PressedColor: {r: 1, g: 1, b: 1, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 + m_ColorMultiplier: 5 m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} @@ -56374,15 +56608,16 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1963065756} - m_RootOrder: 4 + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1497002441} + m_Father: {fileID: 1969396738} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -262.3, y: 101.2} - m_SizeDelta: {x: 344, y: 112} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 809.78625, y: -90.945} + m_SizeDelta: {x: 206.4, y: 67.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3342894376018028530 GameObject: @@ -56592,10 +56827,10 @@ RectTransform: m_Father: {fileID: 3342894375485981713} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 446, y: 435} - m_SizeDelta: {x: 63.9, y: 64.3} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -57, y: -57.200012} + m_SizeDelta: {x: 63.899994, y: 64.29999} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3342894376044364571 GameObject: @@ -57071,19 +57306,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 3342894376104381836} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 3342894375174218278} - m_TargetAssemblyTypeName: - m_MethodName: OnClickChangeEmail - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] --- !u!222 &3342894376104381835 CanvasRenderer: m_ObjectHideFlags: 0 @@ -57105,7 +57328,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 1} + m_Color: {r: 0.3529412, g: 0.28627452, b: 0.4156863, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -57119,13 +57342,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: EDIT + m_Text: "\u7F16\u8F91" --- !u!224 &3342894376104381837 RectTransform: m_ObjectHideFlags: 0 @@ -57141,10 +57364,10 @@ RectTransform: m_Father: {fileID: 3342894377127575303} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -257.9, y: -71.500046} - m_SizeDelta: {x: 218.3, y: 54.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -27.25} + m_SizeDelta: {x: 140.66, y: 54.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3342894376104381838 GameObject: @@ -57604,7 +57827,7 @@ RectTransform: - {fileID: 3342894376861038189} - {fileID: 1943317256} m_Father: {fileID: 1963065756} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -57930,8 +58153,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 97.9, y: -213} - m_SizeDelta: {x: 255.5, y: 38} + m_AnchoredPosition: {x: -0.00071716, y: -19.000004} + m_SizeDelta: {x: 328.34, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3342894376208348418 GameObject: @@ -58497,7 +58720,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 80bb4745fbd49ca49b161ac56ac1eb9b, type: 3} + m_Sprite: {fileID: 21300000, guid: dc63f0f66d5558340aafd8e6a4c22e7a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -58525,8 +58748,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -370.19998} - m_SizeDelta: {x: 317.60034, y: 90.74945} + m_AnchoredPosition: {x: 0, y: -359.3} + m_SizeDelta: {x: 267, y: 97} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3342894376299205842 CanvasRenderer: @@ -59793,7 +60016,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 7, y: -0.79999924} + m_AnchoredPosition: {x: 7, y: -0.80000305} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3342894376586087344 @@ -59842,7 +60065,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 56759fcc1e5f9eb43b22ea46a357269b, type: 3} + m_Sprite: {fileID: 21300000, guid: 0eaa5f008f3a0e840afc478d9080d03c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -59870,7 +60093,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 3.7235107, y: 0} - m_SizeDelta: {x: 1000, y: 992.52} + m_SizeDelta: {x: 738, y: 836} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3342894376620086119 GameObject: @@ -61013,7 +61236,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9150943, g: 0.9150943, b: 0.9150943, a: 1} + m_Color: {r: 0.3529412, g: 0.28627452, b: 0.41568628, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -61027,13 +61250,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: EDIT + m_Text: "\u7F16\u8F91" --- !u!224 &3342894376831582104 RectTransform: m_ObjectHideFlags: 0 @@ -61049,10 +61272,10 @@ RectTransform: m_Father: {fileID: 3342894375701584530} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -57.300083, y: -54.5} - m_SizeDelta: {x: 200, y: 44.9} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -0.0000038146973, y: -22.449997} + m_SizeDelta: {x: 200, y: 44.899994} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3342894376831582105 GameObject: @@ -62505,13 +62728,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 52 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: ACCOUNT + m_Text: "\u7528\u6237" --- !u!224 &3342894376994421169 RectTransform: m_ObjectHideFlags: 0 @@ -62527,10 +62750,10 @@ RectTransform: m_Father: {fileID: 3342894375485981713} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -126.2, y: 430} - m_SizeDelta: {x: 600.2, y: 94.1} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -47.049988} + m_SizeDelta: {x: 500.04, y: 94.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3342894376994421170 GameObject: @@ -63351,7 +63574,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.3529412, g: 0.28627452, b: 0.41568628, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -63361,17 +63584,17 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 12800000, guid: df83a8ef8ec265d408cd57ce58f209bf, type: 3} m_FontSize: 54 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 0 m_MaxSize: 70 - m_Alignment: 3 + m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Email + m_Text: "\u90AE\u7BB1" --- !u!224 &3342894377127575303 RectTransform: m_ObjectHideFlags: 0 @@ -63390,10 +63613,10 @@ RectTransform: m_Father: {fileID: 3342894375485981713} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -4.5441, y: 296.80002} - m_SizeDelta: {x: 787.09, y: 131.9} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 1.64, y: -191.81} + m_SizeDelta: {x: 636.77, y: 179.38} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3342894377127575304 GameObject: @@ -63508,8 +63731,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 97.9, y: -129.7} - m_SizeDelta: {x: 255.5, y: 38} + m_AnchoredPosition: {x: -0.0012388, y: 65.3} + m_SizeDelta: {x: 328.34, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3342894377147165484 GameObject: diff --git a/Assets/TcgEngine/Scripts/GameClient/BoardDeck.cs b/Assets/TcgEngine/Scripts/GameClient/BoardDeck.cs index d1b9350..5dde547 100644 --- a/Assets/TcgEngine/Scripts/GameClient/BoardDeck.cs +++ b/Assets/TcgEngine/Scripts/GameClient/BoardDeck.cs @@ -45,14 +45,14 @@ namespace TcgEngine.Client return; CardbackData cb = CardbackData.Get(player.cardback); - string targetDeckPath = cb != null && !string.IsNullOrEmpty(cb.deck_path) ? cb.deck_path : "Cardbacks/deck_silver.png"; + string targetDeckPath = cb != null && !string.IsNullOrEmpty(cb.deck_path) ? cb.deck_path : "Cardbacks/Load_card_group.png"; if (deck_render != null && (deck_render.sprite == null || prev_deck_path != targetDeckPath)) { Sprite sprite = SpriteLoader.Get()?.LoadSprite(targetDeckPath); if (sprite != null) { deck_render.sprite = sprite; - deck_render.gameObject.transform.localScale = Vector3.one * 0.5f; + deck_render.gameObject.transform.localScale = Vector3.one; prev_deck_path = targetDeckPath; } else diff --git a/Assets/TcgEngine/Scripts/GameLogic/TaskManager.cs b/Assets/TcgEngine/Scripts/GameLogic/TaskManager.cs index 4c49e2d..2b62cb1 100644 --- a/Assets/TcgEngine/Scripts/GameLogic/TaskManager.cs +++ b/Assets/TcgEngine/Scripts/GameLogic/TaskManager.cs @@ -57,6 +57,9 @@ namespace TcgEngine.Gameplay // 订阅游戏事件 gameClient = FindFirstObjectByType(); gameClient = GameClient.Get(); + + ApiClient client = ApiClient.Get(); + if (gameClient != null) { LoadTasks(); @@ -65,6 +68,17 @@ namespace TcgEngine.Gameplay gameClient.onGameEnd += OnGameEnd; // gameClient.onConnectServer?.Invoke(); } + // else if (client.UserData != null) + // { + // LoadTasks(); + // LoadPlayerData(); + // client.onLogin += OnGameStart; + // client.onLogin += OnGameEnd; + // } + else + { + Debug.Log("绑定失败！"); + } // 移除对GameLogic.Instance的错误引用，改为检查gameLogic变量 if (gameLogic != null) @@ -548,6 +562,11 @@ namespace TcgEngine.Gameplay UpdateTaskProgress(TaskConditionType.PlayGames); } + private void OnGameStart(LoginResponse login) + { + UpdateTaskProgress(TaskConditionType.PlayGames); + } + private void OnGameEnd(int winner) { int player_id = GameClient.Get().GetPlayerID(); diff --git a/Assets/TcgEngine/Scripts/GameLogic/TaskManagerGx.cs b/Assets/TcgEngine/Scripts/GameLogic/TaskManagerGx.cs deleted file mode 100644 index 3357f68..0000000 --- a/Assets/TcgEngine/Scripts/GameLogic/TaskManagerGx.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using UnityEngine; -using TcgEngine; -using TcgEngine.Gameplay; -using TcgEngine.Client; -using System.Threading.Tasks; - -namespace TcgEngine.Gameplay -{ - /// - /// 任务管理器，负责任务的分配、进度追踪和奖励发放等功能 - /// - public class TaskManagerGx : MonoBehaviour - { - public List PlayerTasks = new List(); - - public async void SavePayerData() - { - PlayerTasksResponse saveData = new PlayerTasksResponse(); - // PlayerTaskResponse[] taskResponses = new PlayerTaskResponse[ taskResponses.taskId="login_task_1", - // assignedTime=1757067900, - // taskResponses.expireTime=1757154300, - // taskResponses.status=2, - // taskResponses.progress=1] -; - - } - } -} \ No newline at end of file diff --git a/Assets/TcgEngine/Scripts/GameLogic/TaskManagerGx.cs.meta b/Assets/TcgEngine/Scripts/GameLogic/TaskManagerGx.cs.meta deleted file mode 100644 index 45b5ee5..0000000 --- a/Assets/TcgEngine/Scripts/GameLogic/TaskManagerGx.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 7d388b20392c45e6b37f010373e2c729 -timeCreated: 1757061071 \ No newline at end of file diff --git a/Assets/TcgEngine/Scripts/Menu/FriendPanel.cs b/Assets/TcgEngine/Scripts/Menu/FriendPanel.cs index 947c25b..d3faf63 100644 --- a/Assets/TcgEngine/Scripts/Menu/FriendPanel.cs +++ b/Assets/TcgEngine/Scripts/Menu/FriendPanel.cs @@ -128,6 +128,9 @@ namespace TcgEngine.UI } } + /// + /// 添加好友请求 + /// private async void AddFriend(string fuser) { FriendAddRequest req = new FriendAddRequest(); @@ -147,6 +150,9 @@ namespace TcgEngine.UI } } + /// + /// 移除好友请求 + /// private async void RemoveFriend(string fuser) { FriendAddRequest req = new FriendAddRequest(); diff --git a/Assets/TcgEngine/Scripts/Menu/PlayerPanel.cs b/Assets/TcgEngine/Scripts/Menu/PlayerPanel.cs index 891aacf..f586f3c 100644 --- a/Assets/TcgEngine/Scripts/Menu/PlayerPanel.cs +++ b/Assets/TcgEngine/Scripts/Menu/PlayerPanel.cs @@ -50,6 +50,7 @@ namespace TcgEngine.UI public InputField user_password_new; public InputField user_password_confirm; public Button edit_change_email; + public Button edit_email_text; public Button edit_change_password; public Button resend_button; public Button confirm_button; @@ -72,6 +73,14 @@ namespace TcgEngine.UI foreach (CardbackUI icon in cardbacks) icon.onClick += OnClickCardback; } + + protected override void Start() + { + base.Start(); + renameButton.onClick.AddListener(OnPlayerRename); + + edit_change_email.onClick.AddListener(OnClickChangeEmail); + } protected override void Update() { @@ -79,11 +88,7 @@ namespace TcgEngine.UI } - protected override void Start() - { - base.Start(); - renameButton.onClick.AddListener(OnPlayerRename); - } + private async void LoadData() { @@ -268,6 +273,7 @@ namespace TcgEngine.UI user_password_confirm.readOnly = true; user_password_new.gameObject.SetActive(false); user_password_confirm.gameObject.SetActive(false); + edit_email_text.gameObject.SetActive(false); UserData udata = Authenticator.Get().UserData; user_email.text = udata.email; @@ -282,6 +288,9 @@ namespace TcgEngine.UI edit_panel.Show(); } + /// + /// 点击更改密码 + /// public void OnClickChangePass() { OnClickEdit(); @@ -300,6 +309,9 @@ namespace TcgEngine.UI user_password_prev.Select(); } + /// + /// 点击更改邮箱 + /// public void OnClickChangeEmail() { OnClickEdit(); @@ -308,9 +320,13 @@ namespace TcgEngine.UI edit_change_password.gameObject.SetActive(false); resend_button.gameObject.SetActive(false); confirm_button.gameObject.SetActive(true); + edit_email_text.gameObject.SetActive(true); user_email.Select(); } + /// + /// 重新发送确认请求 + /// public async void OnClickResendConfirm() { edit_error.text = ""; diff --git a/Assets/TcgEngine/Scripts/Network/AuthenticatorApi.cs b/Assets/TcgEngine/Scripts/Network/AuthenticatorApi.cs index 47ff592..6316c86 100644 --- a/Assets/TcgEngine/Scripts/Network/AuthenticatorApi.cs +++ b/Assets/TcgEngine/Scripts/Network/AuthenticatorApi.cs @@ -6,8 +6,8 @@ using UnityEngine; namespace TcgEngine { /// - /// This authenticator require external UserLogin API asset - /// It works with an actual web API and database containing all user info + /// 此身份验证器需要外部用户登录API资产 + /// 它与包含所有用户信息的实际Web API和数据库一起工作 /// public class AuthenticatorApi : Authenticator diff --git a/Assets/TcgEngine/Sprites/Menu/box4.png b/Assets/TcgEngine/Sprites/Menu/box4.png new file mode 100644 index 0000000..d8eab49 Binary files /dev/null and b/Assets/TcgEngine/Sprites/Menu/box4.png differ diff --git a/Assets/TcgEngine/Sprites/PlayerPanel/friends_button.png.meta b/Assets/TcgEngine/Sprites/Menu/box4.png.meta similarity index 98% rename from Assets/TcgEngine/Sprites/PlayerPanel/friends_button.png.meta rename to Assets/TcgEngine/Sprites/Menu/box4.png.meta index 482e3f1..ac56b6c 100644 --- a/Assets/TcgEngine/Sprites/PlayerPanel/friends_button.png.meta +++ b/Assets/TcgEngine/Sprites/Menu/box4.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 30a75d4f4f79a684aa6d4821dac2ff56 +guid: 0eaa5f008f3a0e840afc478d9080d03c TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/TcgEngine/Sprites/PlayerPanel/CARDBACK.png b/Assets/TcgEngine/Sprites/PlayerPanel/CARDBACK.png deleted file mode 100644 index 49cb8f3..0000000 Binary files a/Assets/TcgEngine/Sprites/PlayerPanel/CARDBACK.png and /dev/null differ diff --git a/Assets/TcgEngine/Sprites/PlayerPanel/CARDBACK.png.meta b/Assets/TcgEngine/Sprites/PlayerPanel/CARDBACK.png.meta deleted file mode 100644 index a2acaab..0000000 --- a/Assets/TcgEngine/Sprites/PlayerPanel/CARDBACK.png.meta +++ /dev/null @@ -1,135 +0,0 @@ -fileFormatVersion: 2 -guid: 632f3bdfc600ebf43a1a19401f618c87 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TcgEngine/Sprites/PlayerPanel/PlayerPanel.spriteatlas b/Assets/TcgEngine/Sprites/PlayerPanel/PlayerPanel.spriteatlas new file mode 100644 index 0000000..d2ceb5e --- /dev/null +++ b/Assets/TcgEngine/Sprites/PlayerPanel/PlayerPanel.spriteatlas @@ -0,0 +1,58 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!687078895 &4343727234628468602 +SpriteAtlas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerPanel + serializedVersion: 2 + m_EditorData: + serializedVersion: 2 + textureSettings: + serializedVersion: 2 + anisoLevel: 1 + compressionQuality: 50 + maxTextureSize: 2048 + textureCompression: 0 + filterMode: 1 + generateMipMaps: 0 + readable: 0 + crunchedCompression: 0 + sRGB: 1 + platformSettings: [] + packingSettings: + serializedVersion: 2 + padding: 4 + blockOffset: 1 + allowAlphaSplitting: 0 + enableRotation: 1 + enableTightPacking: 1 + enableAlphaDilation: 0 + secondaryTextureSettings: {} + variantMultiplier: 1 + packables: + - {fileID: 102900000, guid: ee83468c9b685a342ba5a7da8e400a5b, type: 3} + bindAsDefault: 1 + isAtlasV2: 0 + cachedData: {fileID: 0} + m_MasterAtlas: {fileID: 0} + m_PackedSprites: + - {fileID: 21300000, guid: 77e9c3011fb13314a9d4d8c22bf9d07d, type: 3} + - {fileID: 21300000, guid: 30e4fc216fff20f46b8950ef04aa631c, type: 3} + - {fileID: 21300000, guid: 865687022de46114295e3a96ccac2ff1, type: 3} + - {fileID: 21300000, guid: dc44d8c3679dd2741b36136767b8364b, type: 3} + - {fileID: 21300000, guid: 391eccd7955e385498bccfb31bf5a6c9, type: 3} + - {fileID: 21300000, guid: c4d4fb9847555f14888db04d0bc53a7a, type: 3} + m_PackedSpriteNamesToIndex: + - leveSlider + - box_player + - cardsowned_box + - TabPlay + - cardback_box + - leveSliderBg + m_RenderDataMap: {} + m_Tag: PlayerPanel + m_IsVariant: 0 + m_IsPlaceholder: 0 diff --git a/Assets/TcgEngine/Sprites/PlayerPanel/PlayerPanel.spriteatlas.meta b/Assets/TcgEngine/Sprites/PlayerPanel/PlayerPanel.spriteatlas.meta new file mode 100644 index 0000000..ba9905c --- /dev/null +++ b/Assets/TcgEngine/Sprites/PlayerPanel/PlayerPanel.spriteatlas.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ab6fd8d863ab0944bbffe38f0a7fad39 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4343727234628468602 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Sprites/PlayerPanel/friends_button.png b/Assets/TcgEngine/Sprites/PlayerPanel/friends_button.png deleted file mode 100644 index f72b3ca..0000000 Binary files a/Assets/TcgEngine/Sprites/PlayerPanel/friends_button.png and /dev/null differ diff --git a/Assets/TcgEngine/Sprites/PlayerPanel/login_scene.png b/Assets/TcgEngine/Sprites/PlayerPanel/login_scene.png deleted file mode 100644 index e0da588..0000000 Binary files a/Assets/TcgEngine/Sprites/PlayerPanel/login_scene.png and /dev/null differ diff --git a/Assets/TcgEngine/Sprites/PlayerPanel/参考图，随时可删.png b/Assets/TcgEngine/Sprites/PlayerPanel/参考图，随时可删.png deleted file mode 100644 index 5c4b3d8..0000000 Binary files a/Assets/TcgEngine/Sprites/PlayerPanel/参考图，随时可删.png and /dev/null differ diff --git a/Assets/TcgEngine/Sprites/UI/button.png b/Assets/TcgEngine/Sprites/UI/button.png new file mode 100644 index 0000000..e014448 Binary files /dev/null and b/Assets/TcgEngine/Sprites/UI/button.png differ diff --git a/Assets/TcgEngine/Sprites/PlayerPanel/login_scene.png.meta b/Assets/TcgEngine/Sprites/UI/button.png.meta similarity index 98% rename from Assets/TcgEngine/Sprites/PlayerPanel/login_scene.png.meta rename to Assets/TcgEngine/Sprites/UI/button.png.meta index 030d88c..e5a300e 100644 --- a/Assets/TcgEngine/Sprites/PlayerPanel/login_scene.png.meta +++ b/Assets/TcgEngine/Sprites/UI/button.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 64066fe422ac1de4281b2a471fae2139 +guid: 2efbff7fa488c1d44adb5aa49b998165 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/TcgEngine/Sprites/UI/button_confirm.png b/Assets/TcgEngine/Sprites/UI/button_confirm.png new file mode 100644 index 0000000..20d0507 Binary files /dev/null and b/Assets/TcgEngine/Sprites/UI/button_confirm.png differ diff --git a/Assets/TcgEngine/Sprites/PlayerPanel/参考图，随时可删.png.meta b/Assets/TcgEngine/Sprites/UI/button_confirm.png.meta similarity index 98% rename from Assets/TcgEngine/Sprites/PlayerPanel/参考图，随时可删.png.meta rename to Assets/TcgEngine/Sprites/UI/button_confirm.png.meta index 286702a..9159840 100644 --- a/Assets/TcgEngine/Sprites/PlayerPanel/参考图，随时可删.png.meta +++ b/Assets/TcgEngine/Sprites/UI/button_confirm.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4d807d643c070ff4da66b012728af6f1 +guid: dc63f0f66d5558340aafd8e6a4c22e7a TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/TcgEngine/Sprites/LoginMenu/clear_name.png b/Assets/TcgEngine/Sprites/UI/clear_name.png similarity index 100% rename from Assets/TcgEngine/Sprites/LoginMenu/clear_name.png rename to Assets/TcgEngine/Sprites/UI/clear_name.png diff --git a/Assets/TcgEngine/Sprites/LoginMenu/clear_name.png.meta b/Assets/TcgEngine/Sprites/UI/clear_name.png.meta similarity index 100% rename from Assets/TcgEngine/Sprites/LoginMenu/clear_name.png.meta rename to Assets/TcgEngine/Sprites/UI/clear_name.png.meta diff --git a/Assets/TcgEngine/Sprites/效果图.meta b/Assets/TcgEngine/Sprites/效果图.meta deleted file mode 100644 index a116782..0000000 --- a/Assets/TcgEngine/Sprites/效果图.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c175b8d9a0361c248884752852d7a4f9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TcgEngine/Sprites/效果图/角色信息.png b/Assets/TcgEngine/Sprites/效果图/角色信息.png deleted file mode 100644 index e38bc16..0000000 Binary files a/Assets/TcgEngine/Sprites/效果图/角色信息.png and /dev/null differ diff --git a/Assets/TcgEngine/Sprites/效果图/角色信息.png.meta b/Assets/TcgEngine/Sprites/效果图/角色信息.png.meta deleted file mode 100644 index 8246502..0000000 --- a/Assets/TcgEngine/Sprites/效果图/角色信息.png.meta +++ /dev/null @@ -1,135 +0,0 @@ -fileFormatVersion: 2 -guid: 534621490949fbe4fbfee3b3e4fa20ea -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TcgEngine/Sprites/效果图/角色信息1.png b/Assets/TcgEngine/Sprites/效果图/角色信息1.png deleted file mode 100644 index c6e1214..0000000 Binary files a/Assets/TcgEngine/Sprites/效果图/角色信息1.png and /dev/null differ diff --git a/Assets/TcgEngine/Sprites/效果图/角色信息1.png.meta b/Assets/TcgEngine/Sprites/效果图/角色信息1.png.meta deleted file mode 100644 index 46fe99b..0000000 --- a/Assets/TcgEngine/Sprites/效果图/角色信息1.png.meta +++ /dev/null @@ -1,135 +0,0 @@ -fileFormatVersion: 2 -guid: 3a48c31c4e5f64145b3713f5daaf202b -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: