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

dev_chengFeng
ZhangBiao 2021-07-02 14:48:41 +08:00
commit 21f8259143
6 changed files with 16 additions and 86 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 159 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 0a16e9bf3b6d5ed47afbe820463dbd45 guid: 5e1fb525d399713498e544618ad00bac
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
externalObjects: {} externalObjects: {}
@ -97,7 +97,7 @@ TextureImporter:
outline: [] outline: []
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: 8cc7b9d0c07dedd4688e5e50b4406133 spriteID: ab5bc4ad4994a4e47b85f6e78c386da5
vertices: [] vertices: []
indices: indices:
edges: [] edges: []
@ -106,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
userData: userData:
assetBundleName: lz4/dynamicatlas/artfont/l_mrlb_banner_zh assetBundleName:
assetBundleVariant: unity3d assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 634 KiB

View File

@ -5043,7 +5043,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 2367105735144841237} - {fileID: 2367105735144841237}
m_Father: {fileID: 7849088405690101068} m_Father: {fileID: 7849088405690101068}
m_RootOrder: 4 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
@ -5214,7 +5214,6 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 8252699432383455269}
- {fileID: 7410245404359298873} - {fileID: 7410245404359298873}
- {fileID: 5847388856942350495} - {fileID: 5847388856942350495}
- {fileID: 2252884229931705644} - {fileID: 2252884229931705644}
@ -10734,7 +10733,7 @@ RectTransform:
- {fileID: 5847555686718925997} - {fileID: 5847555686718925997}
- {fileID: 6362890770084270319} - {fileID: 6362890770084270319}
m_Father: {fileID: 7849088405690101068} m_Father: {fileID: 7849088405690101068}
m_RootOrder: 2 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5} m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
@ -21080,80 +21079,6 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null Culture=neutral, PublicKeyToken=null
--- !u!1 &6974412338561168170
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8252699432383455269}
- component: {fileID: 651432611527113706}
- component: {fileID: 8408451526431149350}
m_Layer: 5
m_Name: Tip
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8252699432383455269
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6974412338561168170}
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: 7849088405690101068}
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: -7, y: -113}
m_SizeDelta: {x: 659, y: 59}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &651432611527113706
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6974412338561168170}
m_CullTransparentMesh: 0
--- !u!114 &8408451526431149350
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6974412338561168170}
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: 7069c1e839fa22a47aef174ab0296454, 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 &7138505660982474824 --- !u!1 &7138505660982474824
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -21308,7 +21233,7 @@ RectTransform:
- {fileID: 8737620584903165049} - {fileID: 8737620584903165049}
- {fileID: 9069308257944265737} - {fileID: 9069308257944265737}
m_Father: {fileID: 7849088405690101068} m_Father: {fileID: 7849088405690101068}
m_RootOrder: 1 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5} m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
@ -21420,7 +21345,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 7849088405690101068} m_Father: {fileID: 7849088405690101068}
m_RootOrder: 3 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5} m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}

View File

@ -53,7 +53,7 @@ function EveryDayGift:InitComponent()
self.store = Util.GetGameObject(self.extra, "store") self.store = Util.GetGameObject(self.extra, "store")
self.UI_Effect_jinkuang_Yuan = Util.GetGameObject(self.store, "UI_Effect_jinkuang_Yuan") self.UI_Effect_jinkuang_Yuan = Util.GetGameObject(self.store, "UI_Effect_jinkuang_Yuan")
self.UI_Effect_jinkuang_Yuan.gameObject:SetActive(false)
self.endTimeBg = Util.GetGameObject(self.bg,"tiao") self.endTimeBg = Util.GetGameObject(self.bg,"tiao")
self.endTime = Util.GetGameObject(self.endTimeBg,"time"):GetComponent("Text") self.endTime = Util.GetGameObject(self.endTimeBg,"time"):GetComponent("Text")

View File

@ -57,9 +57,10 @@ end
function TeHuiShenZhuang:OnSortingOrderChange() function TeHuiShenZhuang:OnSortingOrderChange()
Util.SetParticleSortLayer(self.effect,self.sortingOrder + 1) Util.SetParticleSortLayer(self.effect,self.sortingOrder + 1)
end end
local fun
--界面打开时调用(用于子类重写) --界面打开时调用(用于子类重写)
function TeHuiShenZhuang:OnOpen() function TeHuiShenZhuang:OnOpen(_fun)
fun = _fun
end end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写) --界面打开或者重新打开后,界面刷新时调用(用于子类重写)
@ -180,6 +181,10 @@ function TeHuiShenZhuang:OnClose()
self.Live = nil self.Live = nil
PatFaceManager.RefreshPatface() PatFaceManager.RefreshPatface()
self.sortingOrder = 0 self.sortingOrder = 0
if fun then
fun()
fun = nil
end
end end
--界面销毁时调用(用于子类重写) --界面销毁时调用(用于子类重写)