【三界降魔】调改

dev_chengFeng
ZhangBiao 2021-10-27 18:26:51 +08:00
parent 55090ed8cc
commit 429366fa93
2 changed files with 17 additions and 16 deletions

View File

@ -1036,7 +1036,7 @@ 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: -392.9, y: 1091.7}
m_AnchoredPosition: {x: -421, y: 1091.7}
m_SizeDelta: {x: 59.05, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9168330773871915450
@ -1674,7 +1674,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7384004042993726190}
- component: {fileID: 2061020011133335401}
- component: {fileID: 7539455292787852601}
m_Layer: 5
m_Name: rewards
m_TagString: Untagged
@ -1698,10 +1698,10 @@ 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: 0, y: 0}
m_SizeDelta: {x: 600, y: 130}
m_AnchoredPosition: {x: 17, y: -23}
m_SizeDelta: {x: 624.7, y: 130}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2061020011133335401
--- !u!114 &7539455292787852601
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -1710,7 +1710,7 @@ MonoBehaviour:
m_GameObject: {fileID: 5625481823907718389}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
@ -1718,12 +1718,13 @@ MonoBehaviour:
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 3
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildAlignment: 0
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 100, y: 100}
m_Spacing: {x: 20, y: 0}
m_Constraint: 0
m_ConstraintCount: 2
--- !u!1 &5707041049973978227
GameObject:
m_ObjectHideFlags: 0

View File

@ -186,7 +186,7 @@ function DemonSlayerNewPanel:SingleDataShow(pre,data,index)
itemsGrid[pre][i].gameObject:SetActive(false)
end
for i = 1, #shows do
itemsGrid[pre][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,self.sortingOrder)
itemsGrid[pre][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.8,false,false,false,self.sortingOrder)
itemsGrid[pre][i].gameObject:SetActive(true)
end
end
@ -209,11 +209,11 @@ function DemonSlayerNewPanel:SetTime(ActInfo)
local extraTime = ConfigManager.GetConfigData(ConfigName.GlobalActivity,ActInfo.activityId).GapTime*86400
--设置一进去的时间,不设置的话一进去会不对
local time = ActInfo.endTime - GetTimeStamp() - extraTime
local timeStr = Language[12293]
local timeStr = ""
if time > 0 then
timeStr = Language[12293]
timeStr = "距活动结束:%s"
else
timeStr = Language[10471]
timeStr = "距活动关闭:%s"
end
if time > 3600 then
this.timeText.text = string.format(timeStr,TimeToDHM(time))