diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab index e099010c52..c8ddf5c8e7 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab @@ -704,8 +704,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: -352, y: 41} - m_SizeDelta: {x: 344, y: 122} + m_AnchoredPosition: {x: -363.7, y: 25.9} + m_SizeDelta: {x: 131, y: 131} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1784765689 CanvasRenderer: @@ -735,7 +735,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 49deecf0d6109164a95fe5191d5476b4, type: 3} + m_Sprite: {fileID: 21300000, guid: cbefd13e8b0169841ad41e13e2c8cd23, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6358,6 +6358,7 @@ GameObject: - component: {fileID: 961292883221125782} - component: {fileID: 537336683917607381} - component: {fileID: 421233926260268111} + - component: {fileID: 7107511021931451421} m_Layer: 5 m_Name: Text (4) m_TagString: Untagged @@ -6405,7 +6406,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9433962, g: 0.68752223, b: 0.43164828, a: 0.88235295} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -6425,7 +6426,22 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u666E\u901A" + m_Text: SSS +--- !u!114 &7107511021931451421 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 168607050111109342} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &183897400126010188 GameObject: m_ObjectHideFlags: 0 @@ -6633,7 +6649,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -7555,7 +7571,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -10236,7 +10252,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -12010,6 +12026,7 @@ GameObject: - component: {fileID: 5255351063087867564} - component: {fileID: 2754994952899210960} - component: {fileID: 3017670699445538791} + - component: {fileID: 1216232586823154451} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -12057,7 +12074,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9433962, g: 0.68752223, b: 0.43164828, a: 0.88235295} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -12077,7 +12094,22 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u666E\u901A" + m_Text: B +--- !u!114 &1216232586823154451 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2901855256640373357} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &2944405247568635289 GameObject: m_ObjectHideFlags: 0 @@ -12249,6 +12281,7 @@ GameObject: - component: {fileID: 5278794242828669209} - component: {fileID: 8000050902305912791} - component: {fileID: 5599547333993300472} + - component: {fileID: 4201180942823669994} m_Layer: 5 m_Name: Text (5) m_TagString: Untagged @@ -12296,7 +12329,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9433962, g: 0.68752223, b: 0.43164828, a: 0.88235295} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -12316,7 +12349,22 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u666E\u901A" + m_Text: C +--- !u!114 &4201180942823669994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2972402471276922712} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &3054732533015413961 GameObject: m_ObjectHideFlags: 0 @@ -12660,6 +12708,7 @@ GameObject: - component: {fileID: 751223266398848387} - component: {fileID: 2988506812753569021} - component: {fileID: 6382596897757534093} + - component: {fileID: 8036078195185307082} m_Layer: 5 m_Name: Text (2) m_TagString: Untagged @@ -12707,7 +12756,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9433962, g: 0.68752223, b: 0.43164828, a: 0.88235295} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -12727,7 +12776,22 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u666E\u901A" + m_Text: S +--- !u!114 &8036078195185307082 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3342925282029765477} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &3463983068545149321 GameObject: m_ObjectHideFlags: 0 @@ -12881,7 +12945,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -17506,7 +17570,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -17776,6 +17840,7 @@ GameObject: - component: {fileID: 1283960643325534903} - component: {fileID: 4548460740984974544} - component: {fileID: 3683149144387607487} + - component: {fileID: 1393589487952087228} m_Layer: 5 m_Name: Text (1) m_TagString: Untagged @@ -17823,7 +17888,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9433962, g: 0.68752223, b: 0.43164828, a: 0.88235295} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -17843,7 +17908,22 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u666E\u901A" + m_Text: A +--- !u!114 &1393589487952087228 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5939642934958397172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &6085946799010171771 GameObject: m_ObjectHideFlags: 0 @@ -19299,6 +19379,7 @@ GameObject: - component: {fileID: 6566804396980350026} - component: {fileID: 3313778267829340493} - component: {fileID: 4142000366107475920} + - component: {fileID: 614234391101818088} m_Layer: 5 m_Name: Text (3) m_TagString: Untagged @@ -19346,7 +19427,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9433962, g: 0.68752223, b: 0.43164828, a: 0.88235295} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -19366,7 +19447,22 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u666E\u901A" + m_Text: SS +--- !u!114 &614234391101818088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6909003912948515961} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &6916359079133239732 GameObject: m_ObjectHideFlags: 0 @@ -21828,7 +21924,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 69fd4902d7..49a25eb5bf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -386,8 +386,8 @@ function this.ChallengeCopyShow() progressBar.fillAmount =t end), data[2], 0.5):SetEase(Ease.Linear) - local scoreTextArr = {"良好","优秀","史诗","传说","神话"} - local scoreImageArr = {"r_hero_tujian_lianghao","r_hero_tujian_youxiu","r_hero_tujian_shishi","r_hero_tujian_chuanshuo","r_hero_tujian_shenhua"} + local scoreTextArr = {"B","A","S","SS","SSS"} + local scoreImageArr = {"UI_hz_gonghui_05","UI_hz_gonghui_04","UI_hz_gonghui_03","UI_hz_gonghui_02","UI_hz_gonghui_01"} local scoreText= Util.GetGameObject(this.challengeInfo,"layout/progressBg/scoreText") local boutNum= Util.GetGameObject(this.challengeInfo,"layout/progressBg/boutNum") local lvArr=data[3]