diff --git a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_弹窗.spriteatlas b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_弹窗.spriteatlas index 63abd3c2..0d7b43d0 100644 --- a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_弹窗.spriteatlas +++ b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_弹窗.spriteatlas @@ -88,10 +88,52 @@ SpriteAtlas: bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} - packedSpriteRenderDataKeys: [] + packedSpriteRenderDataKeys: + - e2f0e310f699dd1499e93cb07a0a3198: 21300000 + - a8460773c27a29748bbadcdc333e57aa: 21300000 + - 3b8788a5800321a4498485a85c170fc0: 21300000 + - 1ae1cec5530a6cd44b0d31ea027ebcf1: 21300000 + - e7f5460757eef7c409168510aa3c5037: 21300000 + - 2cfbfa89505825949b3cec3b48d323a6: 21300000 + - 9c5e0e9bd6ee88c4597788568c620662: 21300000 + - 321bf3fcbdc862a46bc384367d7fbe90: 21300000 + - dfa5081d38f50174ca827e79d87b24f7: 21300000 + - 0f15acdd90c87fe47beedadca47e7010: 21300000 + - d54d40edf100af147a5223de2f881ca3: 21300000 + - af50fc7eee516a645b09aa8f79017aaa: 21300000 + - 464e18bfd9c3d5e4b927c13ec9def492: 21300000 + - d2ee8cbf34c48214688c60c2fadf0e8e: 21300000 m_MasterAtlas: {fileID: 0} - m_PackedSprites: [] - m_PackedSpriteNamesToIndex: [] + m_PackedSprites: + - {fileID: 21300000, guid: e2f0e310f699dd1499e93cb07a0a3198, type: 3} + - {fileID: 21300000, guid: a8460773c27a29748bbadcdc333e57aa, type: 3} + - {fileID: 21300000, guid: 3b8788a5800321a4498485a85c170fc0, type: 3} + - {fileID: 21300000, guid: 1ae1cec5530a6cd44b0d31ea027ebcf1, type: 3} + - {fileID: 21300000, guid: e7f5460757eef7c409168510aa3c5037, type: 3} + - {fileID: 21300000, guid: 2cfbfa89505825949b3cec3b48d323a6, type: 3} + - {fileID: 21300000, guid: 9c5e0e9bd6ee88c4597788568c620662, type: 3} + - {fileID: 21300000, guid: 321bf3fcbdc862a46bc384367d7fbe90, type: 3} + - {fileID: 21300000, guid: dfa5081d38f50174ca827e79d87b24f7, type: 3} + - {fileID: 21300000, guid: 0f15acdd90c87fe47beedadca47e7010, type: 3} + - {fileID: 21300000, guid: d54d40edf100af147a5223de2f881ca3, type: 3} + - {fileID: 21300000, guid: af50fc7eee516a645b09aa8f79017aaa, type: 3} + - {fileID: 21300000, guid: 464e18bfd9c3d5e4b927c13ec9def492, type: 3} + - {fileID: 21300000, guid: d2ee8cbf34c48214688c60c2fadf0e8e, type: 3} + m_PackedSpriteNamesToIndex: + - xs_k + - "\u4E3B\u754C\u9762\u2014\u73B0\u4EE3" + - MC + - DZ_icon + - GJSK + - qz_jr + - NL_box_1 + - gx + - gx_2 + - LWTC_d_box + - TXK + - MC_jr + - NL_box + - NL_box 1 m_RenderDataMap: {} m_Tag: "UIRaw_Atlas_\u5F39\u7A97" m_IsVariant: 0 diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameEndForm.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameEndForm.prefab index 7320e992..8b82c13c 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameEndForm.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameEndForm.prefab @@ -874,6 +874,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1862910006349227494 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3152446807514931330} + - component: {fileID: 989524148600500988} + - component: {fileID: 4036430822919996928} + m_Layer: 5 + m_Name: m_btn_Close + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3152446807514931330 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1862910006349227494} + 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: 7752074671510801886} + 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: -2.7417, y: 4.2682} + m_SizeDelta: {x: 1061.4513, y: 2338.266} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &989524148600500988 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1862910006349227494} + m_CullTransparentMesh: 1 +--- !u!114 &4036430822919996928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1862910006349227494} + 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: 0.05660379, g: 0.05660379, b: 0.05660379, a: 0.46666667} + 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!1 &2116892257331728460 GameObject: m_ObjectHideFlags: 0 @@ -1426,6 +1501,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7752074671510801886} + - component: {fileID: 9028738046421714771} + - component: {fileID: -9150420609426286283} m_Layer: 5 m_Name: UIGameEndForm m_TagString: Untagged @@ -1445,6 +1522,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 3152446807514931330} - {fileID: 4700954648216750620} - {fileID: 356128460605191968} - {fileID: 2788493819886838993} @@ -1460,6 +1538,46 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &9028738046421714771 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3037476992696430359} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &-9150420609426286283 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3037476992696430359} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 55 --- !u!1 &3298004900296100892 GameObject: m_ObjectHideFlags: 0 diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs index 25af4438..488a0c3e 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs @@ -668,6 +668,7 @@ namespace GameLogic // 设置游戏状态 SetGameState(false); + // 显示 ShowRankEndForm(); // 多了一步流程 diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameEndForm.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameEndForm.cs index c6bfaddc..cab31099 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameEndForm.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameEndForm.cs @@ -9,6 +9,7 @@ namespace GameLogic class UIGameEndForm : UIWindow { #region űɵĴ + private Button m_btn_Close; private TextMeshProUGUI m_tmp_PlayerName; private RawImage m_rimg_WinPlayerIcon; private TextMeshProUGUI m_tmp_WinPlayerName; @@ -22,6 +23,7 @@ namespace GameLogic private TextMeshProUGUI m_tmp_DzzwPlayerName; protected override void ScriptGenerator() { + m_btn_Close = FindChildComponent