【降妖夺宝】界面调整
(cherry picked from commit 6befa383c8)
parent
bbf155d7be
commit
b094a73fa7
|
|
@ -894,6 +894,80 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &719390280089749844
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7487765658418523143}
|
||||
- component: {fileID: 1190889494683044866}
|
||||
- component: {fileID: 4146484238985118160}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7487765658418523143
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 719390280089749844}
|
||||
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: 6078970542252040299}
|
||||
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: 0, y: -90}
|
||||
m_SizeDelta: {x: 574, y: 170}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1190889494683044866
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 719390280089749844}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4146484238985118160
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 719390280089749844}
|
||||
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: 8bc0409d8bb710b49bb67ad3cf8a3384, 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 &733102716132459659
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1181,7 +1255,7 @@ GameObject:
|
|||
- component: {fileID: 2132785343472515193}
|
||||
- component: {fileID: 1540491511188435692}
|
||||
m_Layer: 5
|
||||
m_Name: page13
|
||||
m_Name: page14
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -2614,12 +2688,12 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6078970542252040299}
|
||||
m_RootOrder: 1
|
||||
m_Father: {fileID: 6977954435375684854}
|
||||
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: -35.186096}
|
||||
m_AnchoredPosition: {x: 20, y: 0}
|
||||
m_SizeDelta: {x: 488.20996, y: 56.54004}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &9130806236008685898
|
||||
|
|
@ -2657,7 +2731,7 @@ MonoBehaviour:
|
|||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
|
|
@ -3916,7 +3990,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 0.99978995, y: 0.99978995, z: 0.99978995}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6078970542252040299}
|
||||
m_RootOrder: 3
|
||||
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}
|
||||
|
|
@ -4110,7 +4184,7 @@ MonoBehaviour:
|
|||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 0}
|
||||
m_TargetGraphic: {fileID: 3995597544730881352}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
|
|
@ -5884,7 +5958,7 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 2192070711070156195}
|
||||
- {fileID: 4296502101803847451}
|
||||
m_Father: {fileID: 2132785343472515193}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -6475,6 +6549,85 @@ MonoBehaviour:
|
|||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "5\u884CUP"
|
||||
--- !u!1 &6566960110546733221
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 428536920436906137}
|
||||
- component: {fileID: 5485083504298860068}
|
||||
- component: {fileID: 6571514408860480166}
|
||||
m_Layer: 5
|
||||
m_Name: canGet
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &428536920436906137
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6566960110546733221}
|
||||
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: 6078970542252040299}
|
||||
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: -32}
|
||||
m_SizeDelta: {x: 488.20996, y: 56.54004}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5485083504298860068
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6566960110546733221}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6571514408860480166
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6566960110546733221}
|
||||
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.93725497, g: 0.8588236, b: 0.6117647, 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: 34
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u53EC\u552428\u6B21\u5FC5\u5F97UP\u795E\u5C06"
|
||||
--- !u!1 &6824844808564362710
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -6703,7 +6856,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 0.99978995, y: 0.99978995, z: 0.99978995}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6078970542252040299}
|
||||
m_RootOrder: 2
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -7494,7 +7647,9 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 4718898329773437628}
|
||||
- {fileID: 4296502101803847451}
|
||||
- {fileID: 7487765658418523143}
|
||||
- {fileID: 428536920436906137}
|
||||
- {fileID: 2192070711070156195}
|
||||
- {fileID: 8692150506501553550}
|
||||
- {fileID: 804425220329144116}
|
||||
m_Father: {fileID: 2132785343472515193}
|
||||
|
|
@ -8010,12 +8165,12 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6977954435375684854}
|
||||
m_RootOrder: 0
|
||||
m_Father: {fileID: 6078970542252040299}
|
||||
m_RootOrder: 3
|
||||
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: 25, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: -83}
|
||||
m_SizeDelta: {x: 488.20996, y: 56.54004}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4555355105622685865
|
||||
|
|
@ -8039,7 +8194,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 0.86666673, b: 0.6862745, a: 1}
|
||||
m_Color: {r: 0.93725497, g: 0.8588236, b: 0.6117647, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
@ -8047,19 +8202,19 @@ MonoBehaviour:
|
|||
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_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u5269\u4F59\u65F6\u95F4:99:99:99"
|
||||
m_Text: "\u6D3B\u52A8\u5269\u4F59\u65F6\u95F4\uFF1A29\u592912\u5C0F\u65F6"
|
||||
--- !u!1 &8375407808906081497
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -45,11 +45,12 @@ function XiangYaoDuoBao:InitComponent(gameObject)
|
|||
this.detailBtn = Util.GetGameObject(this.gameObject,"rightUp/detailBtn")
|
||||
this.btn = Util.GetGameObject(this.gameObject,"Btn")
|
||||
|
||||
this.upper=Util.GetGameObject(this.gameObject,"bottom/times"):GetComponent("Text") ---召唤上限
|
||||
this.upper=Util.GetGameObject(this.gameObject,"time/times"):GetComponent("Text") ---召唤上限
|
||||
this.tip1=Util.GetGameObject(this.gameObject,"bottom/Tip1"):GetComponent("Text") ---刷新时间
|
||||
this.tip2=Util.GetGameObject(this.gameObject,"bottom/Tip2"):GetComponent("Text") --妖晶限购
|
||||
this.btnGroup=Util.GetGameObject(this.gameObject,"bottom/btngroup")
|
||||
this.leftTime=Util.GetGameObject(this.gameObject,"time/lefttime"):GetComponent("Text")
|
||||
this.leftTime=Util.GetGameObject(this.gameObject,"bottom/lefttime"):GetComponent("Text")
|
||||
this.canGet=Util.GetGameObject(this.gameObject,"bottom/canGet"):GetComponent("Text")
|
||||
|
||||
this.detail= Util.GetGameObject(this.gameObject, "detail")
|
||||
this.detail.gameObject:SetActive(false)
|
||||
|
|
@ -153,6 +154,7 @@ function XiangYaoDuoBao:refreshBtnShow()
|
|||
--下方的数量显示
|
||||
local curMoneyTimes=PrivilegeManager.GetPrivilegeRemainValue(singleRecruit.MoneyTimes)
|
||||
this.tip2.text = "妖晶限购"..curMoneyTimes.."次"
|
||||
this.canGet.text = "召唤<color=#F27D0F>"..lotterySetting[singleRecruit.Id].DiamondBoxContain[1][2] - ActData.value.."</color>次必得UP神将"
|
||||
|
||||
--是否是免费抽
|
||||
local freeTimesId=singleRecruit.FreeTimes
|
||||
|
|
@ -289,7 +291,7 @@ function XiangYaoDuoBao:TimeCountDown()
|
|||
local timeDown=CalculateSecondsNowTo_N_OClock(5)
|
||||
this.tip1.text = TimeToHMS(timeDown)..Language[12200]
|
||||
local timeDown2 = ActData.endTime - GetTimeStamp()
|
||||
this.leftTime.text = Language[10028]..TimeToFelaxible(timeDown2)
|
||||
this.leftTime.text = Language[12230]..TimeToFelaxible(timeDown2)
|
||||
|
||||
this.tip1.gameObject:SetActive( (freeTime == 0) and (timeDown < timeDown2))
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue