[周卡]======周卡修改提交

dev_chengFeng
wangzhenxing 2022-07-26 17:39:41 +08:00
parent 88bdd83937
commit bf108a4f18
3 changed files with 263 additions and 1 deletions

View File

@ -5605,6 +5605,7 @@ RectTransform:
- {fileID: 3791396218904049447} - {fileID: 3791396218904049447}
- {fileID: 3791396218334099713} - {fileID: 3791396218334099713}
- {fileID: 579990698813903240} - {fileID: 579990698813903240}
- {fileID: 340734797836524865}
m_Father: {fileID: 3791396217625106201} m_Father: {fileID: 3791396217625106201}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -7271,6 +7272,7 @@ RectTransform:
- {fileID: 3791396218267380965} - {fileID: 3791396218267380965}
- {fileID: 3791396218843401763} - {fileID: 3791396218843401763}
- {fileID: 3791396217311411439} - {fileID: 3791396217311411439}
- {fileID: 5135232078593581264}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -10844,6 +10846,7 @@ RectTransform:
- {fileID: 3791396217156366685} - {fileID: 3791396217156366685}
- {fileID: 3791396216811415863} - {fileID: 3791396216811415863}
- {fileID: 1406645877631359141} - {fileID: 1406645877631359141}
- {fileID: 8495818037874361442}
m_Father: {fileID: 3791396217625106201} m_Father: {fileID: 3791396217625106201}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -12376,6 +12379,87 @@ MonoBehaviour:
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 100 m_Text: 100
--- !u!1 &6227997053656680672
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5135232078593581264}
- component: {fileID: 1142228894490095603}
- component: {fileID: 6013816059441570569}
m_Layer: 5
m_Name: time
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5135232078593581264
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6227997053656680672}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7543121757773600665}
m_RootOrder: 12
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: 89.4}
m_SizeDelta: {x: 160, y: 34.22}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1142228894490095603
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6227997053656680672}
m_CullTransparentMesh: 0
--- !u!114 &6013816059441570569
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6227997053656680672}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.98823535, g: 0.7843138, b: 0.38823533, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 30
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: '111111111111111
'
--- !u!1 &6839139221153078043 --- !u!1 &6839139221153078043
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -12451,3 +12535,161 @@ MonoBehaviour:
m_FillClockwise: 1 m_FillClockwise: 1
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
--- !u!1 &7341964547886052355
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 340734797836524865}
- component: {fileID: 3575546749004119182}
- component: {fileID: 3177538087661646297}
m_Layer: 5
m_Name: time
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &340734797836524865
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7341964547886052355}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3791396217607456270}
m_RootOrder: 12
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: -131.1}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3575546749004119182
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7341964547886052355}
m_CullTransparentMesh: 0
--- !u!114 &3177538087661646297
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7341964547886052355}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.6603774, g: 0.24234605, b: 0.09033466, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
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_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u5171\u8BA1\uFF1A500\u4E07\u91D1\u5E01"
--- !u!1 &7612904797670517794
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8495818037874361442}
- component: {fileID: 5035936795494051063}
- component: {fileID: 3620166891324444714}
m_Layer: 5
m_Name: time
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8495818037874361442
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7612904797670517794}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3791396218678684741}
m_RootOrder: 12
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: -131.1}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5035936795494051063
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7612904797670517794}
m_CullTransparentMesh: 0
--- !u!114 &3620166891324444714
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7612904797670517794}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.6603774, g: 0.24234605, b: 0.09033466, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
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_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u5171\u8BA1\uFF1A500\u4E07\u91D1\u5E01"

View File

@ -1908,6 +1908,14 @@ function TimeStampToDateStr2(timestamp)
return date.year..date.month..date.day return date.year..date.month..date.day
end end
-- 将时间转换为年月日
function TimeStampToDateStr6(timestamp)
local date = os.date("*t", timestamp)
local cdate = os.date("*t", GetTimeStamp())
return date.year.."-"..date.month.."-"..date.day
end
-- 将时间戳转换为用于显示的日期字符串(时分秒) -- 将时间戳转换为用于显示的日期字符串(时分秒)
function TimeStampToDateStr3(second) function TimeStampToDateStr3(second)
local minute = math.floor(second / 60) % 60 local minute = math.floor(second / 60) % 60

View File

@ -17,9 +17,10 @@ function WeekCardPanel:InitComponent()
self.selectTxt=Util.GetGameObject(self.gameObject, "selectObj/Text"):GetComponent("Text") self.selectTxt=Util.GetGameObject(self.gameObject, "selectObj/Text"):GetComponent("Text")
self.info1=Util.GetGameObject(self.gameObject, "info1"):GetComponent("Text") self.info1=Util.GetGameObject(self.gameObject, "info1"):GetComponent("Text")
self.info2=Util.GetGameObject(self.gameObject, "info2"):GetComponent("Text") self.info2=Util.GetGameObject(self.gameObject, "info2"):GetComponent("Text")
self.info1.text="·购买后可连续7日领取奖励" self.info1.text="·购买后可领取活动前期累计奖励 及 后续奖励"
self.info2.text="·每日0点刷新奖励可累计领取" self.info2.text="·每日0点刷新奖励可累计领取"
self.titleImg=Util.GetGameObject(self.gameObject, "titleImg"):GetComponent("Image") self.titleImg=Util.GetGameObject(self.gameObject, "titleImg"):GetComponent("Image")
self.timeTxt=Util.GetGameObject(self.gameObject, "time"):GetComponent("Text")
self.titleImg.sprite=self.spLoader:LoadSprite("r_zhouka_zksh_zh") self.titleImg.sprite=self.spLoader:LoadSprite("r_zhouka_zksh_zh")
for i= 1 ,self.grid.transform.childCount do for i= 1 ,self.grid.transform.childCount do
self.cardPres[i] = {} self.cardPres[i] = {}
@ -30,6 +31,7 @@ function WeekCardPanel:InitComponent()
self.cardPres[i].icon = Util.GetGameObject(self.cardPres[i].go, "icon"):GetComponent("Image") self.cardPres[i].icon = Util.GetGameObject(self.cardPres[i].go, "icon"):GetComponent("Image")
self.cardPres[i].hint = Util.GetGameObject(self.cardPres[i].go, "hint"):GetComponent("Text") self.cardPres[i].hint = Util.GetGameObject(self.cardPres[i].go, "hint"):GetComponent("Text")
self.cardPres[i].Text = Util.GetGameObject(self.cardPres[i].go, "Text"):GetComponent("Text") self.cardPres[i].Text = Util.GetGameObject(self.cardPres[i].go, "Text"):GetComponent("Text")
self.cardPres[i].timeTxt = Util.GetGameObject(self.cardPres[i].go, "time"):GetComponent("Text")
-- self.cardPres[i].icon1 = Util.GetGameObject(self.cardPres[i].go, "tip1/icon"):GetComponent("Image") -- self.cardPres[i].icon1 = Util.GetGameObject(self.cardPres[i].go, "tip1/icon"):GetComponent("Image")
-- self.cardPres[i].icon2 = Util.GetGameObject(self.cardPres[i].go, "tip2/icon"):GetComponent("Image") -- self.cardPres[i].icon2 = Util.GetGameObject(self.cardPres[i].go, "tip2/icon"):GetComponent("Image")
-- self.cardPres[i].icon3 = Util.GetGameObject(self.cardPres[i].go, "Image/icon"):GetComponent("Image") -- self.cardPres[i].icon3 = Util.GetGameObject(self.cardPres[i].go, "Image/icon"):GetComponent("Image")
@ -95,13 +97,17 @@ local allcards={}
local curKey=0 local curKey=0
local curIndex=0 local curIndex=0
--local activityId=0 --local activityId=0
local endTime=0
function WeekCardPanel:OnShow() function WeekCardPanel:OnShow()
self.gameObject:SetActive(true) self.gameObject:SetActive(true)
sortingOrder = _sortingOrder sortingOrder = _sortingOrder
local serverOpenTime = PlayerManager.GetServerOpenTime()
-- 查看周卡界面刷新红点 -- 查看周卡界面刷新红点
PlayerPrefs.SetInt("IsCheckWeekCard_"..PlayerManager.uid, 1) PlayerPrefs.SetInt("IsCheckWeekCard_"..PlayerManager.uid, 1)
CheckRedPointStatus(RedPointType.WeekCard) CheckRedPointStatus(RedPointType.WeekCard)
local id = ActivityGiftManager.GetActivityTypeInfo(102) local id = ActivityGiftManager.GetActivityTypeInfo(102)
endTime=id.endTime
self.timeTxt.text="活动时间:"..TimeStampToDateStr6(id.startTime)..""..TimeStampToDateStr6(id.endTime)
weekcardR=ConfigManager.GetConfigDataByKey(ConfigName.WeekcardRotationConfig,"GlobalActivity",id.activityId) weekcardR=ConfigManager.GetConfigDataByKey(ConfigName.WeekcardRotationConfig,"GlobalActivity",id.activityId)
--weekcardR=ConfigManager.GetConfigData(ConfigName.WeekcardRotationConfig,1) --weekcardR=ConfigManager.GetConfigData(ConfigName.WeekcardRotationConfig,1)
local cardTypes={} local cardTypes={}
@ -279,6 +285,7 @@ function WeekCardPanel:ShowCardInfo(index,config)
-- pre.rewards[i]:GetComponent("Image").sprite=self.spLoader:LoadSprite(config.TypeImage) -- pre.rewards[i]:GetComponent("Image").sprite=self.spLoader:LoadSprite(config.TypeImage)
end end
end end
pre.icon.sprite = self.spLoader:LoadSprite(icon) pre.icon.sprite = self.spLoader:LoadSprite(icon)
pre.Text.text = name.."*"..PrintWanNum2(oneNum) pre.Text.text = name.."*"..PrintWanNum2(oneNum)
local str=PrintWanNum2(allNum)..name local str=PrintWanNum2(allNum)..name
@ -296,6 +303,10 @@ function WeekCardPanel:ShowCardInfo(index,config)
getNum=getNum+1 getNum=getNum+1
end end
end end
pre.timeTxt.gameObject:SetActive(true)
local residueTimeNum = endTime - GetTimeStamp()
local dayNum = math.floor(residueTimeNum / (24 * 3600))
pre.timeTxt.text="(剩余"..dayNum.."天)"
if getNum > 0 then if getNum > 0 then
-- 领取奖励 -- 领取奖励
pre.btnText.text = "领取" pre.btnText.text = "领取"
@ -320,6 +331,7 @@ function WeekCardPanel:ShowCardInfo(index,config)
end end
else else
-- 购买周卡 -- 购买周卡
pre.timeTxt.gameObject:SetActive(false)
pre.btnText.text = MoneyUtil.GetMoneyUnitNameWithMoney(rechargeCfg.Price) pre.btnText.text = MoneyUtil.GetMoneyUnitNameWithMoney(rechargeCfg.Price)
pre.red:SetActive(false) pre.red:SetActive(false)
Util.SetGray(pre.btn, false) Util.SetGray(pre.btn, false)