Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼

dev_chengFeng
ZhangBiao 2021-04-21 16:36:35 +08:00
commit 6d08ce59a6
3 changed files with 479 additions and 557 deletions

View File

@ -2117,7 +2117,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -365.9, y: 1.8799992}
m_AnchoredPosition: {x: -365.90002, y: 1.8799992}
m_SizeDelta: {x: -731.8, y: -3.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7156679129912923661
@ -4027,7 +4027,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: -0.000012398, y: -22.6}
m_AnchoredPosition: {x: -0.000012398, y: -10}
m_SizeDelta: {x: 234, y: 77.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3246567987664098557
@ -5569,12 +5569,7 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -5599,7 +5594,12 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -5729,12 +5729,7 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -5759,7 +5754,12 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -5889,12 +5889,7 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -5919,7 +5914,12 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -6059,12 +6059,13 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 440662846547803826, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 914783a550a50444099c0977255adae1,
type: 3}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -6089,17 +6090,16 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 440662846547803826, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 914783a550a50444099c0977255adae1,
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!224 &1735899025626293379 stripped
@ -6235,12 +6235,13 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 440662846547803826, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 914783a550a50444099c0977255adae1,
type: 3}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -6265,17 +6266,16 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 440662846547803826, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 914783a550a50444099c0977255adae1,
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!224 &1751704657233609385 stripped
@ -6401,12 +6401,7 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -6431,7 +6426,12 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002

View File

@ -26,8 +26,7 @@ function DemonSlayerPanel:InitComponent()
this.helpBtn = Util.GetGameObject(self.gameObject,"HelpBtn")
this.btnRank = Util.GetGameObject(self.gameObject,"RankList")
this.time = Util.GetGameObject(self.gameObject, "rewardContent/time")
this.leftTime = Util.GetGameObject(self.gameObject, "rewardContent/time/num"):GetComponent("Text")
this.timeText = Util.GetGameObject(self.gameObject, "rewardContent/time"):GetComponent("Text")
this.myRank = Util.GetGameObject(self.gameObject, "rewardContent/myRank/num"):GetComponent("Text")
this.pos = Util.GetGameObject(self.gameObject, "pos")
@ -171,7 +170,6 @@ function DemonSlayerPanel:SetState(ActInfo)
state = 0--7天内
else
state = 1--2天内
this.time:GetComponent("Text").text = Language[10424]
end
-- else
-- self:ClosePanel()
@ -256,12 +254,17 @@ end
function DemonSlayerPanel:SetTime(ActInfo)
local extraTime = ConfigManager.GetConfigData(ConfigName.GlobalActivity,ActInfo.activityId).GapTime*86400
--设置一进去的时间,不设置的话一进去会不对
-- this.time:SetActive(state == 0)
local time = ActInfo.endTime - GetTimeStamp() - extraTime
if time > 3600 then
this.leftTime.text = TimeToDHM(time)
local timeStr = "距排名结算:%s"
if time > 0 then
timeStr = "距排名结算:%s"
else
this.leftTime.text = TimeToMS(time)
timeStr = "活动已结束"
end
if time > 3600 then
this.timeText.text = string.format(timeStr,TimeToDHM(time))
else
this.timeText.text = string.format(timeStr,TimeToMS(time))
end
if self.timer then
@ -273,9 +276,9 @@ function DemonSlayerPanel:SetTime(ActInfo)
if state == 0 then
local time = ActInfo.endTime - GetTimeStamp() - extraTime
if time > 3600 then
this.leftTime.text = TimeToDHM(time)
this.timeText.text = string.format(timeStr,TimeToDHM(time))
else
this.leftTime.text = TimeToMS(time)
this.timeText.text = string.format(timeStr,TimeToMS(time))
end
time = time -1
if time <= 0 then
@ -284,9 +287,9 @@ function DemonSlayerPanel:SetTime(ActInfo)
elseif state == 1 then
local time = ActInfo.endTime - GetTimeStamp()
if time > 3600 then
this.leftTime.text = TimeToDHM(time)
this.timeText.text = string.format(timeStr,TimeToDHM(time))
else
this.leftTime.text = TimeToMS(time)
this.timeText.text = string.format(timeStr,TimeToMS(time))
end
time = time -1
if time <= 0 then