山河试炼修改提交

dev_chengFeng
jiaoyangna 2022-03-21 17:21:11 +08:00
parent 31afc70951
commit b57a82309b
2 changed files with 168 additions and 11 deletions

View File

@ -8943,16 +8943,18 @@ RectTransform:
m_GameObject: {fileID: 6387261094607856098}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.99978596, y: 0.99978596, z: 0.99978596}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6044731699449114629}
- {fileID: 3754913601536229201}
- {fileID: 6370401770125018510}
m_Father: {fileID: 3458295202399734364}
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: 77.00006, y: -316.99994}
m_SizeDelta: {x: 126, y: 126}
m_AnchoredPosition: {x: 172.9, y: -155.4}
m_SizeDelta: {x: 298.8, y: 153.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6908792808637426587
CanvasRenderer:
@ -8982,7 +8984,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: 99f849d3a4e72f3408cb590b2fe4c646, type: 3}
m_Sprite: {fileID: 21300000, guid: b3d1f1bef22654047a6531d9d2a406a7, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -9542,6 +9544,80 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &6929759494992025898
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6044731699449114629}
- component: {fileID: 8627108135176767607}
- component: {fileID: 3903209187005056971}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6044731699449114629
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6929759494992025898}
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: 8956641993081459436}
m_RootOrder: 0
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: -80.30002}
m_SizeDelta: {x: 402.32, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8627108135176767607
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6929759494992025898}
m_CullTransparentMesh: 0
--- !u!114 &3903209187005056971
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6929759494992025898}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 36f16563686ad084e8d4c0135d451e47, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &7010381375874422840
GameObject:
m_ObjectHideFlags: 0
@ -9572,12 +9648,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8956641993081459436}
m_RootOrder: 0
m_RootOrder: 2
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: -80.3}
m_SizeDelta: {x: 126, y: 30}
m_SizeDelta: {x: 298.8, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5232027529839106338
CanvasRenderer:
@ -9600,7 +9676,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@ -9608,13 +9684,13 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 25
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 28
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 3
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -9844,6 +9920,80 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u5DF2\u9886\u53D6"
LanguageIndex: 10004
--- !u!1 &7588671177920845527
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3754913601536229201}
- component: {fileID: 6909234727292124261}
- component: {fileID: 7193150960855608428}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3754913601536229201
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7588671177920845527}
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: 8956641993081459436}
m_RootOrder: 1
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.4, y: 0}
m_SizeDelta: {x: 248.3, y: 81.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6909234727292124261
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7588671177920845527}
m_CullTransparentMesh: 0
--- !u!114 &7193150960855608428
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7588671177920845527}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 6a34def6945a7364283cd1da766f7ccf, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &7661218203001728108
GameObject:
m_ObjectHideFlags: 0

View File

@ -113,7 +113,13 @@ function this.activityBtnTimeShow()
end
local remainTime = ActivityGiftManager.GetTaskRemainTime(ActivityTypeDef.ShanHeShiLian)
local s = function()
this.activityEnterBtnTime.text = TimeToFelaxible(remainTime)
local temp = ""
if remainTime <= 86400 then
temp = TimeToFelaxible(remainTime).."后结束"
elseif remainTime > 86400 then
temp = TimeToDHM(remainTime).."后结束"
end
this.activityEnterBtnTime.text = temp
remainTime = remainTime - 1
if remainTime <= 0 then
this.activityEnterBtn.gameObject:SetActive(false)
@ -129,6 +135,7 @@ function this.activityBtnTimeShow()
this.activityBtnTime:Start()
end
function this.OnShowPanel()
SoundManager.PlayMusic(SoundConfig.BGM_Main)