Revert "【关卡界面】怎加挂机时间"

This reverts commit 136b2a4c18.
dev_chengFeng
ZhangBiao 2020-12-29 10:53:48 +08:00
parent fa46595132
commit 5137e588dc
2 changed files with 40 additions and 44 deletions

View File

@ -4918,7 +4918,7 @@ ParticleSystem:
--- !u!199 &689865173
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -11343,7 +11343,7 @@ ParticleSystem:
--- !u!199 &53865032735354669
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -16194,7 +16194,7 @@ ParticleSystem:
--- !u!199 &53865032903479894
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -20929,7 +20929,7 @@ ParticleSystem:
--- !u!199 &53865033217178009
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -25542,7 +25542,7 @@ ParticleSystem:
--- !u!199 &53865033315684810
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -31039,7 +31039,7 @@ ParticleSystem:
--- !u!199 &4590674014730051834
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -31626,7 +31626,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 50, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 217.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1473222624206509369
@ -31950,10 +31950,10 @@ RectTransform:
m_Father: {fileID: 70693627459769760}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 44, y: 0}
m_SizeDelta: {x: 364.13, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5318835811565835880
CanvasRenderer:
@ -31990,7 +31990,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 58
m_Alignment: 4
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -36811,7 +36811,7 @@ ParticleSystem:
--- !u!199 &1081348591254749029
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -41831,7 +41831,7 @@ ParticleSystem:
--- !u!199 &1081348592704307586
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -46608,7 +46608,7 @@ ParticleSystem:
--- !u!199 &1081348592807160273
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -51311,7 +51311,7 @@ ParticleSystem:
--- !u!199 &1081348593100259870
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -56339,7 +56339,7 @@ ParticleSystem:
--- !u!199 &5181674795885682804
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -60911,7 +60911,7 @@ ParticleSystem:
--- !u!199 &345244862577150605
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -61268,7 +61268,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 50, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5551596210412472397
@ -67666,7 +67666,7 @@ ParticleSystem:
--- !u!199 &4461638917069206421
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -72822,7 +72822,7 @@ ParticleSystem:
--- !u!199 &6978629692603714544
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -77924,7 +77924,7 @@ ParticleSystem:
--- !u!199 &7894323138156412175
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -84463,7 +84463,7 @@ ParticleSystem:
--- !u!199 &4571234231691897658
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -90695,7 +90695,7 @@ ParticleSystem:
--- !u!199 &6988990775388982249
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -97781,7 +97781,7 @@ ParticleSystem:
--- !u!199 &6133679773105218358
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -102675,7 +102675,7 @@ ParticleSystem:
--- !u!199 &6133679773792227019
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -107341,7 +107341,7 @@ ParticleSystem:
--- !u!199 &6133679774607836274
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -113980,7 +113980,7 @@ ParticleSystem:
--- !u!199 &6532744217531708957
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -119016,7 +119016,7 @@ ParticleSystem:
--- !u!199 &7511510412382184216
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -123959,7 +123959,7 @@ ParticleSystem:
--- !u!199 &7511510412793165601
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -129300,7 +129300,7 @@ ParticleSystem:
--- !u!199 &6340980222856265954
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -134068,7 +134068,7 @@ ParticleSystem:
--- !u!199 &4325216380872068964
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -136292,8 +136292,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 136, y: -47}
m_SizeDelta: {x: 300, y: 38}
m_AnchoredPosition: {x: 182.01, y: 2.6}
m_SizeDelta: {x: 364.13, y: 31.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &666585210320718736
CanvasRenderer:
@ -136323,7 +136323,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: b8e1c1d9252d25b49b7508b9c7ef0e3a, type: 3}
m_Sprite: {fileID: 21300000, guid: 142358505d2906d4a8c0dad782d2e6fd, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -136339,6 +136339,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 5391497229806396012}
m_Modifications:
- target: {fileID: 4537954547819557299, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
propertyPath: m_Name
value: UI_Effect_MuBiaoJiangLi
objectReference: {fileID: 0}
- target: {fileID: 8645003667159546895, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
propertyPath: m_LocalPosition.x
@ -136444,11 +136449,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4537954547819557299, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
propertyPath: m_Name
value: UI_Effect_MuBiaoJiangLi
objectReference: {fileID: 0}
- target: {fileID: 7667894851207529766, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
propertyPath: m_IsActive

View File

@ -28,8 +28,6 @@ function InvadeMonsterView:InitComponent(gameObject, fightPointPassMainPanel)
--红点
this.expeditionRedPoint = Util.GetGameObject(self.gameObject, "Bg/btnDown/btnFastExplore/redPoint")
this.rewardBoxRedPoint = Util.GetGameObject(self.gameObject, "Bg/getBoxReward/rewardBoxRedPoint")
this.rewardBoxTimeObj = Util.GetGameObject(self.gameObject, "Bg/getBoxReward/time")
this.rewardBoxTime = Util.GetGameObject(self.gameObject, "Bg/getBoxReward/time/Text"):GetComponent("Text")
this.chapterRedPoint = Util.GetGameObject(self.gameObject, "Bg/btnGroup/btnRewrdChapter/redPoint")
this.btnRewrdChapter = Util.GetGameObject(self.gameObject, "Bg/btnGroup/btnRewrdChapter")
this.btnRewrdChapterText = Util.GetGameObject(self.gameObject, "Bg/btnGroup/btnRewrdChapter/Image/Text"):GetComponent("Text")
@ -111,8 +109,6 @@ function InvadeMonsterView.UpdataBoxStateShow()
-- 避免频繁使用SetActive
-- 判断当前挂机使用,发出冲击状态发生改变时,设置一下宝箱状态
local state = this.GetBoxShowState(AdventureManager.stateTime)
this.rewardBoxTimeObj:SetActive(true)
this.rewardBoxTime.text = TimeToFelaxible(AdventureManager.stateTime)
this.SetBoxShow(state)
end