Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev

# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Message/MissionDailyTipPanel.prefab
dev_chengFeng
jiaoyangna 2021-03-07 17:17:47 +08:00
commit 594ce2b53a
3 changed files with 104 additions and 9 deletions

View File

@ -111,7 +111,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 702, y: -115.87}
m_AnchoredPosition: {x: 679.3, y: -118.73}
m_SizeDelta: {x: 103.36, y: 119.26}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1217777655326502041
@ -495,8 +495,8 @@ 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: 61.9, y: -26.828}
m_SizeDelta: {x: 431.6, y: 86.1}
m_AnchoredPosition: {x: 41.87, y: -29.855019}
m_SizeDelta: {x: 383.06, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7556314669806022778
CanvasRenderer:
@ -531,7 +531,7 @@ MonoBehaviour:
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 26
m_MinSize: 20
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0

View File

@ -3257,6 +3257,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1918779212887374031}
- {fileID: 1076924525213601081}
m_Father: {fileID: 1918779212270220639}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4464,8 +4465,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -18.55}
m_SizeDelta: {x: 459.73, y: 37.1}
m_AnchoredPosition: {x: 0, y: 18.549988}
m_SizeDelta: {x: 335.2, y: 37.1}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &1918779212887373872
CanvasRenderer:
@ -4515,7 +4516,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 3
m_Alignment: 6
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -6435,6 +6436,100 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &3802844986406592470
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1076924525213601081}
- component: {fileID: 6365935994801057981}
- component: {fileID: 4474535916462347978}
- component: {fileID: 7060985104303015056}
m_Layer: 5
m_Name: time
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1076924525213601081
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3802844986406592470}
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: 3291570141714537517}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 40.2, y: -16.6}
m_SizeDelta: {x: 335.2, y: 37.1}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &6365935994801057981
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3802844986406592470}
m_CullTransparentMesh: 0
--- !u!114 &4474535916462347978
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3802844986406592470}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3}
m_Name:
m_EditorClassIdentifier:
_textSpacing: -1
--- !u!114 &7060985104303015056
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3802844986406592470}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.3018868, g: 0.3018868, b: 0.3018868, 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_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 27
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u6D3B\u52A8\u65F6\u95F4\uFF1A"
LanguageIndex: 11708
--- !u!1 &4143447345719299696
GameObject:
m_ObjectHideFlags: 0

View File

@ -16,7 +16,7 @@ function this:InitComponent(gameObject)
this.quesBtn = Util.GetGameObject(this.gameObject, "bg/quesBtn")
this.helpPosition= this.quesBtn:GetComponent("RectTransform").localPosition
this.tips = Util.GetGameObject(this.gameObject, "bg/topBar/tips"):GetComponent("Text")
this.time = Util.GetGameObject(this.gameObject, "bg/topBar/time/Text"):GetComponent("Text")
this.time = Util.GetGameObject(this.gameObject, "bg/topBar/time/time"):GetComponent("Text")
this.buyBtn = Util.GetGameObject(this.gameObject, "bg/topBar/button/buyBtn")
this.buyBtnText = Util.GetGameObject(this.buyBtn, "Text"):GetComponent("Text")
@ -95,7 +95,7 @@ function this:OnShow(_parent,...)
end
this.tips.text = Language[11323]
local startTime,endTime,endTimeScale = QinglongSerectTreasureManager.GetTimeStartToEnd()
this.time.text = Language[10584]..startTime.."-"..endTime
this.time.text = startTime.."-"..endTime
this.remainTime.text = Language[10470]..TimeToDHMS(tonumber(endTimeScale) - GetTimeStamp())
this:ShowTime(endTimeScale)
this.refresh(true,true)