root
/
sk-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei

Branch_DNA
zhangjiannan 2025-05-15 10:40:01 +08:00
parent e2892eae70 f43b828e62
commit bfa8090cfd
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/ManagedResources/Prefabs/UI/SeasonalActivity/SeasonalActivity.prefab
View File

@ -4414,7 +4414,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 10, y: 0}
m_SizeDelta: {x: 527, y: 80}
m_SizeDelta: {x: 571.5082, y: 80}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &8548605546296935955
CanvasRenderer:
@ -4444,11 +4444,11 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: d86d8a727ce12394cb7af8a758dd3ec7, type: 3}
m_FontSize: 30
m_FontSize: 38
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 26
m_MaxSize: 30
m_MinSize: 35
m_MaxSize: 38
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1

18
Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
View File

@ -29,15 +29,15 @@ local titleBg = {
}
--难度图片
local qualityBg = {
[1] = {color = Color.New(72/255,121/255,234/255,255/255), font = GetLanguageStrById(10304)},
[2] = {color = Color.New(182/255,77/255,242/255,255/255), font = GetLanguageStrById(10305)},
[3] = {color = Color.New(224/255,160/255,11/255,255/255), font = GetLanguageStrById(10306)},
[4] = {color = Color.New(224/255,160/255,11/255,255/255), font = GetLanguageStrById(10306)},
[5] = {color = Color.New(224/255,160/255,11/255,255/255), font = GetLanguageStrById(10306)},
[6] = {color = Color.New(255/255,20/255,212/255,255/255), font = GetLanguageStrById(10307)},
[7] = {color = Color.New(255/255,20/255,212/255,255/255), font = GetLanguageStrById(10307)},
[8] = {color = Color.New(255/255,20/255,212/255,255/255), font = GetLanguageStrById(10307)},
[9] = {color = Color.New(255/255,20/255,212/255,255/255), font = GetLanguageStrById(10307)}
[1] = { color = Color.New(255 / 255, 255 / 255, 255 / 255, 255 / 255), font = GetLanguageStrById(10304) },
[2] = { color = Color.New(84 / 255, 245 / 255, 60 / 255, 255 / 255), font = GetLanguageStrById(10305) },
[3] = { color = Color.New(51 / 255, 186 / 255, 255 / 255, 255 / 255), font = GetLanguageStrById(10306) },
[4] = { color = Color.New(231 / 255, 46 / 255, 210 / 255, 255 / 255), font = GetLanguageStrById(10288) },
[5] = { color = Color.New(248 / 255, 145 / 255, 68 / 255, 255 / 255), font = GetLanguageStrById(10289) },
[6] = { color = Color.New(255 / 255, 42 / 255, 36 / 255, 255 / 255), font = GetLanguageStrById(10307) },
[7] = { color = Color.New(255 / 255, 244 / 255, 25 / 255, 255 / 255), font = GetLanguageStrById(10308) },
[8] = { color = Color.New(255 / 255, 244 / 255, 25 / 255, 255 / 255), font = GetLanguageStrById(10309) },
[9] = { color = Color.New(255 / 255, 244 / 255, 25 / 255, 255 / 255), font = GetLanguageStrById(10310) }
}
local itemList = {}--奖励容器