From a84e223cb4d228818f6b2836e33843c3e3d58e0f Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Sun, 21 Apr 2024 16:58:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/GeneralPanel/GeneralBigPopup.prefab | 186 +++++++++--------- .../View/GeneralBigPopup_RecrutDetail.lua | 34 ++-- 2 files changed, 110 insertions(+), 110 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 764a465499..d42d0f7ca7 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -13960,9 +13960,9 @@ RectTransform: m_Father: {fileID: 3670451248567414134} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 36, y: -18} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 254.2, y: 63.5} m_Pivot: {x: 0, y: 1} --- !u!222 &5210253197636820229 @@ -17323,9 +17323,9 @@ RectTransform: m_Father: {fileID: 3670451248567414134} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 786.59503, y: -43.08} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 159.39, y: 50.16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1420070111345050450 @@ -19826,7 +19826,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7057533525669159572 RectTransform: m_ObjectHideFlags: 0 @@ -19843,8 +19843,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: 9.1, y: -644} - m_SizeDelta: {x: 767.2, y: 45} + m_AnchoredPosition: {x: 9.1, y: -636.38} + m_SizeDelta: {x: 767.2, y: 60.245} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2077048757513793140 CanvasRenderer: @@ -19867,7 +19867,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.70980394, g: 0.6039216, b: 0.5176471, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -19922,10 +19922,10 @@ RectTransform: m_Father: {fileID: 3678500941860488433} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 692, y: -53.6} - m_SizeDelta: {x: 88, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2548272237263765984 CanvasRenderer: @@ -20559,10 +20559,10 @@ RectTransform: m_Father: {fileID: 1512853129445073849} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 151, y: -35} - m_SizeDelta: {x: 262, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6611933679980562685 CanvasRenderer: @@ -25185,10 +25185,10 @@ RectTransform: m_Father: {fileID: 215920149304938626} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 465.55, y: -26.5} - m_SizeDelta: {x: 855.1, y: 39} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 855.1, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5392194319038496384 CanvasRenderer: @@ -25211,7 +25211,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7411765, g: 0.7137255, b: 0.6117647, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -26456,10 +26456,10 @@ RectTransform: m_Father: {fileID: 8863448297139295757} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 435, y: -38.75} - m_SizeDelta: {x: 870, y: 77.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 435, y: 0} + m_SizeDelta: {x: 870, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5915642200145091643 CanvasRenderer: @@ -26915,10 +26915,10 @@ RectTransform: m_Father: {fileID: 338458655642849761} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 111, y: -35} - m_SizeDelta: {x: 182, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7934512073592766787 CanvasRenderer: @@ -27240,7 +27240,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4704877975494855837 RectTransform: m_ObjectHideFlags: 0 @@ -27257,8 +27257,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: -1.8, y: -643.5} - m_SizeDelta: {x: 917, y: 74.5} + m_AnchoredPosition: {x: -1.1425, y: -636.38} + m_SizeDelta: {x: 873.29, y: 60.25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4363171553708867385 CanvasRenderer: @@ -27288,7 +27288,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: 7a37c8663d7814543baf6de1e8b993be, type: 3} + m_Sprite: {fileID: 21300000, guid: 56fac6a71666a884ab673e0440500d73, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -28507,9 +28507,9 @@ RectTransform: m_Father: {fileID: 159297556695191086} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 583.3334, y: -100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8955976630056367158 @@ -31318,9 +31318,9 @@ RectTransform: m_Father: {fileID: 8863448297139295757} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 435, y: -837} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 870, y: 309.7} m_Pivot: {x: 0.5, y: 1} --- !u!114 &5688548084432830598 @@ -31653,10 +31653,10 @@ RectTransform: m_Father: {fileID: 8863448297139295757} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 435, y: -331.75} - m_SizeDelta: {x: 870, y: 72.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 435, y: 0} + m_SizeDelta: {x: 870, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5183859335168644090 CanvasRenderer: @@ -32039,8 +32039,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 458.5, y: 0.000030517578} - m_SizeDelta: {x: 917, y: 46} + m_AnchoredPosition: {x: 458.5, y: -0.000045776367} + m_SizeDelta: {x: 917, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2354951152359418691 CanvasRenderer: @@ -32122,9 +32122,9 @@ RectTransform: m_Father: {fileID: 159297556695191086} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 116.66667, y: -100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6665704931721194040 @@ -32386,7 +32386,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0.5, y: -427.2} - m_SizeDelta: {x: 870, y: 1146.7} + m_SizeDelta: {x: 870, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &2484587132639556036 MonoBehaviour: @@ -33860,9 +33860,9 @@ RectTransform: m_Father: {fileID: 7494134846245643573} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 36, y: -18} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 254.2, y: 63.5} m_Pivot: {x: 0, y: 1} --- !u!222 &3010712499452228185 @@ -43138,9 +43138,9 @@ RectTransform: m_Father: {fileID: 159297556695191086} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 350, y: -100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &773993077155745798 @@ -43528,10 +43528,10 @@ RectTransform: m_Father: {fileID: 8863448297139295757} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 435, y: -796.25} - m_SizeDelta: {x: 870, y: 81.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 435, y: 0} + m_SizeDelta: {x: 870, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4863705341942113372 CanvasRenderer: @@ -44739,10 +44739,10 @@ RectTransform: m_Father: {fileID: 338458655642849761} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 528, y: -35} - m_SizeDelta: {x: 652, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 529.5, y: 0} + m_SizeDelta: {x: 655, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5055004538366893150 CanvasRenderer: @@ -45190,10 +45190,10 @@ RectTransform: m_Father: {fileID: 1512853129445073849} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 567, y: -35} - m_SizeDelta: {x: 570, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5944039970204372121 CanvasRenderer: @@ -45721,7 +45721,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &475247785733533137 RectTransform: m_ObjectHideFlags: 0 @@ -46145,10 +46145,10 @@ RectTransform: m_Father: {fileID: 3678500941860488433} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 188, y: -53.6} - m_SizeDelta: {x: 88, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2743128581437240062 CanvasRenderer: @@ -46932,7 +46932,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3271911493438991065 RectTransform: m_ObjectHideFlags: 0 @@ -48943,9 +48943,9 @@ RectTransform: m_Father: {fileID: 8863448297139295757} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 435, y: -561.75} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 870, y: 387.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &530755074506280210 @@ -49987,9 +49987,9 @@ RectTransform: m_Father: {fileID: 8863448297139295757} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 435, y: -186.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 870, y: 218} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5453380272156850861 @@ -50672,9 +50672,9 @@ RectTransform: m_Father: {fileID: 1724954233501732768} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 36, y: -14} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 254.2, y: 63.5} m_Pivot: {x: 0, y: 1} --- !u!222 &3903058791224746062 @@ -50834,7 +50834,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -0.000019445808} - m_SizeDelta: {x: 916, y: 51} + m_SizeDelta: {x: 916, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &2233394732319046138 MonoBehaviour: @@ -54227,10 +54227,10 @@ RectTransform: m_Father: {fileID: 3678500941860488433} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 524, y: -53.6} - m_SizeDelta: {x: 88, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2793157614885932168 CanvasRenderer: @@ -54860,10 +54860,10 @@ RectTransform: m_Father: {fileID: 3678500941860488433} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 356, y: -53.6} - m_SizeDelta: {x: 88, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5187175447103501528 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua index 508570388b..315d14a949 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua @@ -204,7 +204,7 @@ function this:BuildRateData(actType,UpItem,upItemList) end for n,m in ipairs(UpItem) do local itemConfig=ConfigManager.TryGetConfigData(ConfigName.ItemConfig, m.Reward[1]) - table.insert(rateList,{id = m.Reward[1],tag = itemConfig.Name, name=m.Reward[2],value = m.Weight,color = "BDB69C" }) + table.insert(rateList,{id = m.Reward[1],tag = itemConfig.Name, name=m.Reward[2],value = m.Weight,color = "7D4E2A" }) LogYellow("name:"..tostring(itemConfig.Name).." weight:"..tostring(m.Weight)) end elseif actType == ActivityTypeDef.tiandihonglu then @@ -249,7 +249,7 @@ function this:RefreshIncarnationRate(UpItem,_upRateList,itemType) if v.id == m.Reward[1] then table.insert(rateList,v) else - table.insert(rateList,{tag=itemConfig[m.Reward[1]].Name,name=string.format("%s×%s",itemConfig[m.Reward[1]].Name,m.Reward[2]),value = m.WeightShow,color = "BDB69C"}) + table.insert(rateList,{tag=itemConfig[m.Reward[1]].Name,name=string.format("%s×%s",itemConfig[m.Reward[1]].Name,m.Reward[2]),value = m.WeightShow,color = "7D4E2A"}) end end end @@ -303,10 +303,10 @@ function this:RefreshHeroRate(hero,_rateList) valueList5 = valueList5 - _rateList[i].value table.insert(rateList,_rateList[i]) end - table.insert(rateList,{tag="5星",name="其他5星",value = valueList5,color = "BDB69C"}) - table.insert(rateList,{tag="4星",name="4星神将",value = this:ReculateRate(list4),color = "BDB69C"}) - table.insert(rateList,{tag="3星",name="3星神将",value = this:ReculateRate(list3),color = "BDB69C"}) - table.insert(rateList,{tag="2星",name="2星神将",value = this:ReculateRate(list2),color = "BDB69C"}) + table.insert(rateList,{tag="5星",name="其他5星",value = valueList5,color = "7D4E2A"}) + table.insert(rateList,{tag="4星",name="4星神将",value = this:ReculateRate(list4),color = "7D4E2A"}) + table.insert(rateList,{tag="3星",name="3星神将",value = this:ReculateRate(list3),color = "7D4E2A"}) + table.insert(rateList,{tag="2星",name="2星神将",value = this:ReculateRate(list2),color = "7D4E2A"}) return rateList end @@ -334,16 +334,16 @@ function this:RefreshSoulRate(soul,_rateList,itemType) table.insert(rateList,_rateList[i]) end if valueList6 > 0 then - table.insert(rateList,{tag="红色",name="其他".."红色",value = valueList6,color = "BDB69C"}) + table.insert(rateList,{tag="红色",name="其他".."红色",value = valueList6,color = "7D4E2A"}) end if #list5 > 0 then - table.insert(rateList,{tag="金色",name="金色",value=this:ReculateRate(list5),color = "BDB69C"}) + table.insert(rateList,{tag="金色",name="金色",value=this:ReculateRate(list5),color = "7D4E2A"}) end if #list4 > 0 then - table.insert(rateList,{tag="紫色",name="紫色",value=this:ReculateRate(list4),color = "BDB69C"}) + table.insert(rateList,{tag="紫色",name="紫色",value=this:ReculateRate(list4),color = "7D4E2A"}) end if #list7 > 0 then - table.insert(rateList,{tag="其他",name="其他",value=this:ReculateRate(list7),color = "BDB69C"}) + table.insert(rateList,{tag="其他",name="其他",value=this:ReculateRate(list7),color = "7D4E2A"}) end return rateList end @@ -369,10 +369,10 @@ function this:RefreshMonsterRate(UpMonster,_rateList) valueList1 = valueList1 - _rateList[i].value table.insert(rateList,_rateList[i]) end - table.insert(rateList,{tag="金色",name="金色神兽或碎片",value=valueList1,color = "BDB69C"}) - table.insert(rateList,{tag="紫色",name="紫色神兽或碎片",value=this:ReculateRate(list2),color = "BDB69C"}) - table.insert(rateList,{tag="蓝色",name="蓝色神兽或碎片",value=this:ReculateRate(list3),color = "BDB69C"}) - table.insert(rateList,{tag="其他",name="其他奖励",value=this:ReculateRate(list4),color = "BDB69C"}) + table.insert(rateList,{tag="金色",name="金色神兽或碎片",value=valueList1,color = "7D4E2A"}) + table.insert(rateList,{tag="紫色",name="紫色神兽或碎片",value=this:ReculateRate(list2),color = "7D4E2A"}) + table.insert(rateList,{tag="蓝色",name="蓝色神兽或碎片",value=this:ReculateRate(list3),color = "7D4E2A"}) + table.insert(rateList,{tag="其他",name="其他奖励",value=this:ReculateRate(list4),color = "7D4E2A"}) return rateList end @@ -395,9 +395,9 @@ function this:RefreshNewHeroRate(UpMonster,_rateList) for i = 1 , #_rateList do valueList1 = valueList1 - _rateList[i].value end - table.insert(_rateList,{tag="五星",name="其他五星英雄",value=valueList1,color = "BDB69C"}) - table.insert(_rateList,{tag="四星",name="四星英雄",value=this:ReculateRate(list2),color = "BDB69C"}) - table.insert(_rateList,{tag="三星",name="三星英雄",value=this:ReculateRate(list3),color = "BDB69C"}) + table.insert(_rateList,{tag="五星",name="其他五星英雄",value=valueList1,color = "7D4E2A"}) + table.insert(_rateList,{tag="四星",name="四星英雄",value=this:ReculateRate(list2),color = "7D4E2A"}) + table.insert(_rateList,{tag="三星",name="三星英雄",value=this:ReculateRate(list3),color = "7D4E2A"}) for i = 1 , #_rateList do allValue = _rateList[i].value end