diff --git a/Assets/TcgEngine/Prefabs/UI/LadderRankLine.prefab b/Assets/TcgEngine/Prefabs/UI/LadderRankLine.prefab index f4346fb..e4de76e 100644 --- a/Assets/TcgEngine/Prefabs/UI/LadderRankLine.prefab +++ b/Assets/TcgEngine/Prefabs/UI/LadderRankLine.prefab @@ -38,7 +38,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 182, y: 0} - m_SizeDelta: {x: 220, y: 74} + m_SizeDelta: {x: 231.85, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6726472575990758831 CanvasRenderer: @@ -406,14 +406,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 4870273131461169975} m_Father: {fileID: 6000911466624307800} m_RootOrder: 1 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_AnchoredPosition: {x: 62.85, y: 0} + m_SizeDelta: {x: -125.7, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1244334806764468099 CanvasRenderer: @@ -450,13 +451,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 46 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 1075 + m_Text: "\xD712" --- !u!1 &2352922716911026658 GameObject: m_ObjectHideFlags: 0 @@ -533,6 +534,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2994524833428002364 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4870273131461169975} + - component: {fileID: 3138499611692969407} + - component: {fileID: 4951045911305126732} + m_Layer: 5 + m_Name: StarsIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4870273131461169975 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2994524833428002364} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.00008, y: 1.00008, z: 1.00008} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3355394039040870648} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -64.145004, y: 0} + m_SizeDelta: {x: 120, y: 72} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3138499611692969407 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2994524833428002364} + m_CullTransparentMesh: 1 +--- !u!114 &4951045911305126732 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2994524833428002364} + 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: 025689c72cb6c9b42919a51c3c5a38ef, 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!1 &4162515795131058456 GameObject: m_ObjectHideFlags: 0 @@ -642,10 +719,10 @@ RectTransform: m_Father: {fileID: 6100011614390488879} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 706.3, y: 0.50001} - m_SizeDelta: {x: 82, y: 80} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -15.400024, y: 0.50001} + m_SizeDelta: {x: 144, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3867259667436009521 CanvasRenderer: @@ -675,7 +752,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 20e48ca877602e94c94f1442f80fb753, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1247,7 +1324,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4592006632840117959 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/TcgEngine/Scenes/Menu/Menu.unity b/Assets/TcgEngine/Scenes/Menu/Menu.unity index 7752c16..5658b33 100644 --- a/Assets/TcgEngine/Scenes/Menu/Menu.unity +++ b/Assets/TcgEngine/Scenes/Menu/Menu.unity @@ -124,6 +124,82 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &2362713 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2362714} + - component: {fileID: 2362716} + - component: {fileID: 2362715} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2362714 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2362713} + 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: 211963061} + 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 &2362715 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2362713} + 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.24705882} + 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: 0} + 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 &2362716 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2362713} + m_CullTransparentMesh: 1 --- !u!1 &6303355 GameObject: m_ObjectHideFlags: 0 @@ -512,6 +588,145 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 26068313} m_CullTransparentMesh: 0 +--- !u!1 &26631289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 26631290} + - component: {fileID: 26631294} + - component: {fileID: 26631293} + - component: {fileID: 26631292} + - component: {fileID: 26631291} + m_Layer: 5 + m_Name: Button (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &26631290 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 26631289} + 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: + - {fileID: 1579309084} + m_Father: {fileID: 581826003} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1540.17, y: -964.3} + m_SizeDelta: {x: 124.18, y: 93.52} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &26631291 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 26631289} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 63c2a82fe228eb1448987b03b5e45ab7, type: 3} + m_Name: + m_EditorClassIdentifier: + group: menu + active: 0 + highlight: {fileID: 26631289} + ui_panel: {fileID: 211963062} +--- !u!114 &26631292 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 26631289} + 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: 26631293} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &26631293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 26631289} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &26631294 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 26631289} + m_CullTransparentMesh: 1 --- !u!1 &38139058 GameObject: m_ObjectHideFlags: 0 @@ -2927,6 +3142,74 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 207312627} m_CullTransparentMesh: 0 +--- !u!1 &211963060 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 211963061} + - component: {fileID: 211963063} + - component: {fileID: 211963062} + m_Layer: 5 + m_Name: TaskClient + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &211963061 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 211963060} + 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: + - {fileID: 2362714} + m_Father: {fileID: 581826003} + m_RootOrder: 17 + 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 &211963062 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 211963060} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48645345bd785ef499a05c7438938a2c, type: 3} + m_Name: + m_EditorClassIdentifier: + display_speed: 4 + activePlayerTasks: [] + activeTasks: [] + taskItem: {fileID: 2864833012982062633, guid: d96e5fdf80d69324fb05eb1887005d53, + type: 3} +--- !u!225 &211963063 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 211963060} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &214705189 GameObject: m_ObjectHideFlags: 0 @@ -5654,12 +5937,47 @@ PrefabInstance: propertyPath: m_Name value: LadderRankLine objectReference: {fileID: 0} + - target: {fileID: 3355394039040870648, guid: d2fb6e3e9d404eb45813fa14b31888c7, + type: 3} + propertyPath: m_SizeDelta.x + value: -126.54 + objectReference: {fileID: 0} + - target: {fileID: 3355394039040870648, guid: d2fb6e3e9d404eb45813fa14b31888c7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 63.28 + objectReference: {fileID: 0} - target: {fileID: 3898986378756240123, guid: d2fb6e3e9d404eb45813fa14b31888c7, type: 3} propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: 3b3facb6e4454b940974d1f9ce3eeb4d, type: 3} + - target: {fileID: 4870273131461169975, guid: d2fb6e3e9d404eb45813fa14b31888c7, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5938341118922347061, guid: d2fb6e3e9d404eb45813fa14b31888c7, + type: 3} + propertyPath: m_Text + value: "\xD712" + objectReference: {fileID: 0} + - target: {fileID: 5938341118922347061, guid: d2fb6e3e9d404eb45813fa14b31888c7, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6000911466624307800, guid: d2fb6e3e9d404eb45813fa14b31888c7, + type: 3} + propertyPath: m_SizeDelta.x + value: 231.85 + objectReference: {fileID: 0} + - target: {fileID: 6000911466624307800, guid: d2fb6e3e9d404eb45813fa14b31888c7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 182 + objectReference: {fileID: 0} - target: {fileID: 6100011614390488879, guid: d2fb6e3e9d404eb45813fa14b31888c7, type: 3} propertyPath: m_Pivot.x @@ -5771,6 +6089,11 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: f205c2384ce9dbc439dcbe520db6fb11, type: 3} + - target: {fileID: 9079131196452865094, guid: d2fb6e3e9d404eb45813fa14b31888c7, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d2fb6e3e9d404eb45813fa14b31888c7, type: 3} --- !u!224 &410395548 stripped @@ -7297,6 +7620,7 @@ MonoBehaviour: m_EditorClassIdentifier: playerTasks: [] maxTasks: 5 + userID: --- !u!1 &515092352 GameObject: m_ObjectHideFlags: 0 @@ -8471,8 +8795,10 @@ RectTransform: - {fileID: 2144059522} - {fileID: 732915989} - {fileID: 2143365597} + - {fileID: 26631290} - {fileID: 1674082197} - {fileID: 1899491177} + - {fileID: 211963061} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -18455,7 +18781,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -74.13086, y: -74.75} + m_AnchoredPosition: {x: -74.1308, y: -74.75} m_SizeDelta: {x: -751.06, y: 930.51} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &1106584899 stripped @@ -25609,6 +25935,86 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 135660993694559280} m_PrefabAsset: {fileID: 0} +--- !u!1 &1579309083 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1579309084} + - component: {fileID: 1579309086} + - component: {fileID: 1579309085} + 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 &1579309084 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579309083} + 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: 26631290} + 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 &1579309085 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579309083} + 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: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Button +--- !u!222 &1579309086 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579309083} + m_CullTransparentMesh: 1 --- !u!1 &1583195642 GameObject: m_ObjectHideFlags: 0 @@ -26973,7 +27379,7 @@ RectTransform: - {fileID: 991838448} - {fileID: 463162916} m_Father: {fileID: 581826003} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -29860,7 +30266,7 @@ RectTransform: m_Children: - {fileID: 2137610353} m_Father: {fileID: 581826003} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -39741,7 +40147,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -74.13086, y: -73.48} + m_AnchoredPosition: {x: -74.1308, y: -73.48} m_SizeDelta: {x: -751.06, y: 933.05} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &396921783591273839 @@ -55975,6 +56381,7 @@ MonoBehaviour: - {fileID: 1674082196} - {fileID: 2143365596} - {fileID: 732915988} + Usersid: [] --- !u!225 &4526323995250171127 CanvasGroup: m_ObjectHideFlags: 0 @@ -55983,7 +56390,7 @@ CanvasGroup: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4526323995250171124} m_Enabled: 1 - m_Alpha: 0 + m_Alpha: 1 m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 diff --git a/Assets/TcgEngine/Scripts/GameLogic/TaskManager.cs b/Assets/TcgEngine/Scripts/GameLogic/TaskManager.cs index e1871fb..06fb6fa 100644 --- a/Assets/TcgEngine/Scripts/GameLogic/TaskManager.cs +++ b/Assets/TcgEngine/Scripts/GameLogic/TaskManager.cs @@ -28,8 +28,11 @@ namespace TcgEngine.Gameplay private GameClient gameClient; + public string userID; + private void Awake() { + if (Instance == null) { Instance = this; @@ -43,6 +46,7 @@ namespace TcgEngine.Gameplay private void Start() { + userID = ApiClient.Get().UserID; } private void OnEnable() @@ -56,6 +60,7 @@ namespace TcgEngine.Gameplay LoadPlayerData(); gameClient.onGameStart += OnGameStart; gameClient.onGameEnd += OnGameEnd; + // gameClient.onConnectServer?.Invoke(); } // 移除对GameLogic.Instance的错误引用，改为检查gameLogic变量 @@ -63,6 +68,13 @@ namespace TcgEngine.Gameplay { SubscribeToGameEvents(); } + } + + private void Update() + { + + + } private void OnDisable() @@ -122,16 +134,16 @@ namespace TcgEngine.Gameplay if (ApiClient.Get() != null && ApiClient.Get().IsLoggedIn()) { // 从服务器API获取任务配置 - string url = ApiClient.ServerURL + "/tasks"; + string url = ApiClient.ServerURL + "/api/tasks"; WebResponse res = await ApiClient.Get().SendGetRequest(url); - + Debug.LogError("从服务器API获取任务配置"+res.data); if (res.success) { // 解析任务配置数据 try { TaskDataResponse[] taskResponses = ApiTool.JsonToObject(res.data); - Debug.Log("Loaded " + taskResponses.Length + " tasks from server"); + Debug.Log("Loaded " + taskResponses.Length + " tasks from server"); // 在实际项目中，这里应该将服务器数据转换为TaskData对象并存储在内存中 // 供后续使用，而不是每次都从Resources加载 @@ -156,24 +168,6 @@ namespace TcgEngine.Gameplay Debug.Log("Loaded " + localTasks.Length + " tasks from local resources as fallback"); } -#if UNITY_EDITOR - private void Update() - { - if (Input.GetKeyDown(KeyCode.K)) - { - LoadTasks(); - LoadPlayerData(); - SavePlayerData(); - } - - if (Input.GetKeyDown(KeyCode.U)) - { - UpdateTaskProgress(TaskConditionType.WinGames, "YiYongJun", "YiYongJun"); - UpdateTaskProgress(TaskConditionType.SummonHeroWithAttributes, "WangGuoJun", "YiYongJun"); - } - } -#endif - private async void LoadPlayerData() { // 从服务器加载玩家任务数据 @@ -185,11 +179,11 @@ namespace TcgEngine.Gameplay if (ApiClient.Get() != null && ApiClient.Get().IsLoggedIn()) { // 从服务器获取玩家任务数据 - string url = ApiClient.ServerURL + "/users/" + ApiClient.Get().UserID + "/tasks"; + string url = ApiClient.ServerURL + $"/api/tasks/{userID}"; WebResponse res = await ApiClient.Get().SendGetRequest(url); Debug.Log($"{url}"); - + Debug.LogWarning($"从服务器获取玩家任务数据res_data--:{res.data}"); if (res.success) { // 解析玩家任务数据 @@ -231,28 +225,31 @@ namespace TcgEngine.Gameplay public async void SavePlayerData() { + Debug.LogError("------Get():"+ApiClient.Get()+"------.IsLoggedIn():"+ ApiClient.Get().IsLoggedIn()); // 将玩家任务数据保存到服务器 - if (ApiClient.Get() != null && ApiClient.Get().IsLoggedIn()) + if (ApiClient.Get() != null) { Debug.Log(" GO GO GO "); // 准备要发送的数据 PlayerTasksResponse saveData = new PlayerTasksResponse(); - // 转换任务数据 PlayerTaskResponse[] taskResponses = new PlayerTaskResponse[playerTasks.Count]; for (int i = 0; i < playerTasks.Count; i++) { taskResponses[i] = playerTasks[i].ToResponse(); } - + + Debug.Log($"{taskResponses.Length}"); saveData.tasks = taskResponses; saveData.lastDailyTaskAssigned = lastDailyTaskAssigned.Ticks; string json = ApiTool.ToJson(saveData); - string url = ApiClient.ServerURL + "/users/" + ApiClient.Get().UserID + "/tasks"; + string url = ApiClient.ServerURL + $"/api/tasks/{userID}"; WebResponse res = await ApiClient.Get().SendPostRequest(url, json); - Debug.Log($"{res}"); + Debug.Log($"1111{url}"); + Debug.Log($"2222{json}"); + if (res.success) { @@ -262,6 +259,8 @@ namespace TcgEngine.Gameplay { Debug.LogWarning("Failed to save player tasks to server: " + res.error); } + Debug.LogWarning($"res_data--:{res.data}"); + Debug.LogWarning($"res.success--:{res.success}"); } } @@ -326,7 +325,7 @@ namespace TcgEngine.Gameplay lastDailyTaskAssigned = now; SavePlayerData(); - Debug.Log($"Assigned daily task: {selectedTask.name}"); + Debug.Log($"分配任务: {selectedTask.name}"); } // 检查并更新过期任务 @@ -463,6 +462,7 @@ namespace TcgEngine.Gameplay if (progressUpdated) { + Debug.LogError("读到了"); SavePlayerData(); } } @@ -470,6 +470,7 @@ namespace TcgEngine.Gameplay // 事件处理方法 private void OnGameStart() { + // 进行对战任务进度+1 UpdateTaskProgress(TaskConditionType.PlayGames); } @@ -549,6 +550,19 @@ namespace TcgEngine.Gameplay // 玩家登录时检查任务 public void OnPlayerLogin() { + // 检查是否已有登录任务 + bool hasLoginTask = playerTasks.Any(t => + { + TaskData config = GetTaskConfig(t.taskId); + return config != null && config.condition == TaskConditionType.LoginGame; + }); + + // 如果没有登录任务，就分配一个 + if (!hasLoginTask) + { + AssignLoginTask(); + } + // 登录任务完成 UpdateTaskProgress(TaskConditionType.LoginGame); @@ -558,6 +572,29 @@ namespace TcgEngine.Gameplay // 分配每日任务（如果需要） AssignDailyTaskIfNeeded(); } + + /// + /// 专门分配一个登录任务 + /// + private void AssignLoginTask() + { + TaskData[] allTasks = Resources.LoadAll("Tasks"); + var loginTask = allTasks.FirstOrDefault(t => t.isDailyTask && t.condition == TaskConditionType.LoginGame); + + if (loginTask != null) + { + PlayerTask playerTask = new PlayerTask(loginTask); + playerTasks.Add(playerTask); + lastDailyTaskAssigned = DateTime.Now; + SavePlayerData(); + Debug.Log($"分配登录任务: {loginTask.name}"); + } + else + { + Debug.LogWarning("未找到登录任务配置！"); + } + } + // 获取活跃任务 public List GetActiveTasks() diff --git a/Assets/TcgEngine/Scripts/GameLogic/TaskManagerGx.cs b/Assets/TcgEngine/Scripts/GameLogic/TaskManagerGx.cs new file mode 100644 index 0000000..3357f68 --- /dev/null +++ b/Assets/TcgEngine/Scripts/GameLogic/TaskManagerGx.cs @@ -0,0 +1,31 @@ +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 new file mode 100644 index 0000000..45b5ee5 --- /dev/null +++ b/Assets/TcgEngine/Scripts/GameLogic/TaskManagerGx.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7d388b20392c45e6b37f010373e2c729 +timeCreated: 1757061071 \ No newline at end of file diff --git a/Assets/TcgEngine/Scripts/Menu/LadderRankLine.cs b/Assets/TcgEngine/Scripts/Menu/LadderRankLine.cs index b207eb5..b72a2b1 100644 --- a/Assets/TcgEngine/Scripts/Menu/LadderRankLine.cs +++ b/Assets/TcgEngine/Scripts/Menu/LadderRankLine.cs @@ -48,7 +48,7 @@ namespace TcgEngine.UI RankMedalShow(ranking); this.playerName.text = username; this.rankScore.text = rankScore.ToString(); - this.stars.text = "星×" + stars; + this.stars.text = "×" + stars; this.avatar.sprite = avatar; PlayerRank pr = PlayerRank.Bronze; // 默认 @@ -74,6 +74,7 @@ namespace TcgEngine.UI { this.rankId.sprite = null; // 或者默认图 } + this.rankId.SetNativeSize(); if (rankScore != 0) { diff --git a/Assets/TcgEngine/Scripts/Menu/LeaderboardPanel.cs b/Assets/TcgEngine/Scripts/Menu/LeaderboardPanel.cs index b5b5b5a..9d5c946 100644 --- a/Assets/TcgEngine/Scripts/Menu/LeaderboardPanel.cs +++ b/Assets/TcgEngine/Scripts/Menu/LeaderboardPanel.cs @@ -49,6 +49,7 @@ namespace TcgEngine.UI public GameObject[] hideGameObject; private bool isHideObject = false; + public List Usersid = new List(); protected override void Awake() { base.Awake(); @@ -248,6 +249,8 @@ namespace TcgEngine.UI rankData.rankScore, rankData.stars, false); previous_rank = rankData.position; previous_index = rank_order; + Usersid.Add(rankData.playerId); + //68a6ca87c1f7ac52b66ef8dc } index++; diff --git a/Assets/TcgEngine/Sprites/Loaderboard/my_fraction_bg.png.meta b/Assets/TcgEngine/Sprites/Loaderboard/my_fraction_bg.png.meta index 90eb30f..9c898e0 100644 --- a/Assets/TcgEngine/Sprites/Loaderboard/my_fraction_bg.png.meta +++ b/Assets/TcgEngine/Sprites/Loaderboard/my_fraction_bg.png.meta @@ -48,7 +48,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 20, y: 20, z: 20, w: 20} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -120,7 +120,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/TcgEngine/Sprites/Loaderboard/rank_fraction_bg.png.meta b/Assets/TcgEngine/Sprites/Loaderboard/rank_fraction_bg.png.meta index b237260..fa9d46c 100644 --- a/Assets/TcgEngine/Sprites/Loaderboard/rank_fraction_bg.png.meta +++ b/Assets/TcgEngine/Sprites/Loaderboard/rank_fraction_bg.png.meta @@ -48,7 +48,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 20, y: 20, z: 20, w: 20} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -120,7 +120,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/TcgEngine/Sprites/Rank/Bronze.png b/Assets/TcgEngine/Sprites/Rank/Bronze.png index ac021bb..e1ff6a8 100644 Binary files a/Assets/TcgEngine/Sprites/Rank/Bronze.png and b/Assets/TcgEngine/Sprites/Rank/Bronze.png differ diff --git a/Assets/TcgEngine/Sprites/Rank/Diamond.png b/Assets/TcgEngine/Sprites/Rank/Diamond.png index ac021bb..2d6b5ef 100644 Binary files a/Assets/TcgEngine/Sprites/Rank/Diamond.png and b/Assets/TcgEngine/Sprites/Rank/Diamond.png differ diff --git a/Assets/TcgEngine/Sprites/Rank/Gold.png b/Assets/TcgEngine/Sprites/Rank/Gold.png index ac021bb..7546620 100644 Binary files a/Assets/TcgEngine/Sprites/Rank/Gold.png and b/Assets/TcgEngine/Sprites/Rank/Gold.png differ diff --git a/Assets/TcgEngine/Sprites/Rank/King.png b/Assets/TcgEngine/Sprites/Rank/King.png index ac021bb..9ce3d48 100644 Binary files a/Assets/TcgEngine/Sprites/Rank/King.png and b/Assets/TcgEngine/Sprites/Rank/King.png differ diff --git a/Assets/TcgEngine/Sprites/Rank/Platinum.png b/Assets/TcgEngine/Sprites/Rank/Platinum.png index ac021bb..c1be47a 100644 Binary files a/Assets/TcgEngine/Sprites/Rank/Platinum.png and b/Assets/TcgEngine/Sprites/Rank/Platinum.png differ diff --git a/Assets/TcgEngine/Sprites/Rank/Sliver.png b/Assets/TcgEngine/Sprites/Rank/Sliver.png index ac021bb..d489b93 100644 Binary files a/Assets/TcgEngine/Sprites/Rank/Sliver.png and b/Assets/TcgEngine/Sprites/Rank/Sliver.png differ diff --git a/Assets/TcgEngine/Sprites/Rank/Stars.png b/Assets/TcgEngine/Sprites/Rank/Stars.png new file mode 100644 index 0000000..b5aef04 Binary files /dev/null and b/Assets/TcgEngine/Sprites/Rank/Stars.png differ diff --git a/Assets/TcgEngine/Sprites/Rank/Stars.png.meta b/Assets/TcgEngine/Sprites/Rank/Stars.png.meta new file mode 100644 index 0000000..625796f --- /dev/null +++ b/Assets/TcgEngine/Sprites/Rank/Stars.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 025689c72cb6c9b42919a51c3c5a38ef +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: