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

dev_chengFeng
jiaoyangna 2022-01-11 13:49:38 +08:00
commit 8ae14c38fa
2 changed files with 167 additions and 11 deletions

View File

@ -1310,7 +1310,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: -365.49994, y: 100}
m_AnchoredPosition: {x: -365.49994, y: 163}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4226441777941572043
@ -5173,6 +5173,86 @@ MonoBehaviour:
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &3268333139147351274
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4343296338426448121}
- component: {fileID: 8653979510382007262}
- component: {fileID: 2230903094279647148}
m_Layer: 0
m_Name: Text2 (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4343296338426448121
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3268333139147351274}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.25, y: 1.25, z: 1.25}
m_Children: []
m_Father: {fileID: 4474682813813786888}
m_RootOrder: 6
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: 30, y: -112}
m_SizeDelta: {x: 580, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8653979510382007262
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3268333139147351274}
m_CullTransparentMesh: 0
--- !u!114 &2230903094279647148
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3268333139147351274}
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, g: 0, b: 0, 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: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 50
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u8D2D\u4E70\u540E\u8D60\u9001<color=#00CCFF>\u5524\u5143\u795E\u7B26*2</color>\u4EE5\u53CA<color=#00CCFF>\u91D1\u5E01*150\u4E07</color>"
LanguageIndex: 0
--- !u!1 &3342527356922298974
GameObject:
m_ObjectHideFlags: 0
@ -7394,6 +7474,8 @@ RectTransform:
- {fileID: 3006432516794568864}
- {fileID: 9160614970104831905}
- {fileID: 1886096337574406903}
- {fileID: 4031481255581396746}
- {fileID: 4343296338426448121}
- {fileID: 1854472082705230887}
- {fileID: 8400270742698844243}
m_Father: {fileID: 490982664025559419}
@ -7807,11 +7889,11 @@ RectTransform:
m_Children:
- {fileID: 4219795204720420002}
m_Father: {fileID: 4474682813813786888}
m_RootOrder: 6
m_RootOrder: 8
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: -7.5000153, y: -293.75}
m_AnchoredPosition: {x: -7.5000153, y: -313.75}
m_SizeDelta: {x: 359, y: 139}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1875040898519507366
@ -9383,7 +9465,7 @@ GameObject:
- component: {fileID: 6150398696814194559}
- component: {fileID: 6329370645310369793}
m_Layer: 5
m_Name: GeneralInfoPopup 1
m_Name: GeneralInfoPopup
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -10134,7 +10216,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: 30, y: -55}
m_AnchoredPosition: {x: 30, y: 25}
m_SizeDelta: {x: 580, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4149514768841771133
@ -11235,11 +11317,11 @@ RectTransform:
m_LocalScale: {x: 1.25, y: 1.25, z: 1.25}
m_Children: []
m_Father: {fileID: 4474682813813786888}
m_RootOrder: 5
m_RootOrder: 7
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: -210}
m_AnchoredPosition: {x: 0, y: -222}
m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8020962734115850758
@ -11927,6 +12009,80 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!1 &8453495557294198542
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4031481255581396746}
- component: {fileID: 7997027697963102716}
- component: {fileID: 2218753581981703948}
m_Layer: 5
m_Name: Image (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4031481255581396746
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8453495557294198542}
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: 4474682813813786888}
m_RootOrder: 5
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: -365.49994, y: -111.99997}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7997027697963102716
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8453495557294198542}
m_CullTransparentMesh: 0
--- !u!114 &2218753581981703948
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8453495557294198542}
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: 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_Sprite: {fileID: 21300000, guid: c1c1f67c2bf0e8b488f6f3c032202b8d, 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 &8532025510159912680
GameObject:
m_ObjectHideFlags: 0
@ -12311,7 +12467,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: -365.49994, y: -55}
m_AnchoredPosition: {x: -365.49994, y: 25}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2303498788986278824
@ -12545,7 +12701,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: 30, y: 100}
m_AnchoredPosition: {x: 30, y: 163.00003}
m_SizeDelta: {x: 580, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2451691092330900829

View File

@ -71,12 +71,12 @@ function this:Refresh()
local leftTime = data.endTime - GetTimeStamp()
this.leftTime.text = string.format("剩余%s天",TimeToD(leftTime))
if leftTime <= 86400 then
this.leftTime.text = string.format("剩余:",TimeToFelaxible(leftTime))
this.leftTime.text = string.format("剩余:%s",TimeToFelaxible(leftTime))
end
this.timer = Timer.New(function ()
leftTime = leftTime - 1
if leftTime <= 86400 then
this.leftTime.text = string.format("剩余:",TimeToFelaxible(leftTime))
this.leftTime.text = string.format("剩余:%s",TimeToFelaxible(leftTime))
else
this.leftTime.text = string.format("剩余%s天",TimeToD(leftTime))
end