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

dev_chengFeng
ZhangBiao 2021-03-31 18:40:34 +08:00
commit 2204717b5a
9 changed files with 603 additions and 594 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 23 KiB

View File

@ -5064,7 +5064,7 @@ ParticleSystem:
--- !u!199 &5334060731107251703 --- !u!199 &5334060731107251703
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -9820,7 +9820,7 @@ ParticleSystem:
--- !u!199 &5332641021689053063 --- !u!199 &5332641021689053063
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -14585,7 +14585,7 @@ ParticleSystem:
--- !u!199 &5333979277941964751 --- !u!199 &5333979277941964751
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -19377,7 +19377,7 @@ ParticleSystem:
--- !u!199 &5333985691008173741 --- !u!199 &5333985691008173741
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -24253,7 +24253,7 @@ ParticleSystem:
--- !u!199 &5332806956907430209 --- !u!199 &5332806956907430209
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -24347,7 +24347,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 901.2, y: 84.1} m_SizeDelta: {x: 790.1, y: 84.1}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1726476276234419736 --- !u!222 &1726476276234419736
CanvasRenderer: CanvasRenderer:
@ -24379,7 +24379,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 34 m_FontSize: 32
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 0 m_MinSize: 0
@ -24390,7 +24390,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: m_Text: "\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684\u554A\u5B9E\u6253\u5B9E\u7684"
LanguageIndex: 0 LanguageIndex: 0
--- !u!1 &6530305934527102091 --- !u!1 &6530305934527102091
GameObject: GameObject:
@ -29154,7 +29154,7 @@ ParticleSystem:
--- !u!199 &7579811982226720454 --- !u!199 &7579811982226720454
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -33897,7 +33897,7 @@ ParticleSystem:
--- !u!199 &7579811982277037910 --- !u!199 &7579811982277037910
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -38642,7 +38642,7 @@ ParticleSystem:
--- !u!199 &7579811983695870973 --- !u!199 &7579811983695870973
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -43398,7 +43398,7 @@ ParticleSystem:
--- !u!199 &7579811983716787155 --- !u!199 &7579811983716787155
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -48163,7 +48163,7 @@ ParticleSystem:
--- !u!199 &7579811983751610752 --- !u!199 &7579811983751610752
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -52977,7 +52977,7 @@ ParticleSystem:
--- !u!199 &7778740257475676156 --- !u!199 &7778740257475676156
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -57713,7 +57713,7 @@ ParticleSystem:
--- !u!199 &7779025947944666632 --- !u!199 &7779025947944666632
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -57968,7 +57968,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 144.84991} m_AnchoredPosition: {x: 0, y: 144.8501}
m_SizeDelta: {x: 938, y: 290.4} m_SizeDelta: {x: 938, y: 290.4}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7649130033976078510 --- !u!222 &7649130033976078510
@ -63031,7 +63031,7 @@ ParticleSystem:
--- !u!199 &8021848360285411260 --- !u!199 &8021848360285411260
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -67787,7 +67787,7 @@ ParticleSystem:
--- !u!199 &8021848360315991535 --- !u!199 &8021848360315991535
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -72422,7 +72422,7 @@ ParticleSystem:
--- !u!199 &8021848360328621505 --- !u!199 &8021848360328621505
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -77187,7 +77187,7 @@ ParticleSystem:
--- !u!199 &8021848360678375395 --- !u!199 &8021848360678375395
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -81943,7 +81943,7 @@ ParticleSystem:
--- !u!199 &8021848361077211518 --- !u!199 &8021848361077211518
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -86699,7 +86699,7 @@ ParticleSystem:
--- !u!199 &8021848361077821130 --- !u!199 &8021848361077821130
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -91334,7 +91334,7 @@ ParticleSystem:
--- !u!199 &8021848361253068666 --- !u!199 &8021848361253068666
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -96125,7 +96125,7 @@ ParticleSystem:
--- !u!199 &8021848361379968434 --- !u!199 &8021848361379968434
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -100890,7 +100890,7 @@ ParticleSystem:
--- !u!199 &8021848361398611002 --- !u!199 &8021848361398611002
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -105646,7 +105646,7 @@ ParticleSystem:
--- !u!199 &8021848361456544082 --- !u!199 &8021848361456544082
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -110402,7 +110402,7 @@ ParticleSystem:
--- !u!199 &8021848361456808830 --- !u!199 &8021848361456808830
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -115167,7 +115167,7 @@ ParticleSystem:
--- !u!199 &8021848361560776379 --- !u!199 &8021848361560776379
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -119957,7 +119957,7 @@ ParticleSystem:
--- !u!199 &8021848361825854830 --- !u!199 &8021848361825854830
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -124600,7 +124600,7 @@ ParticleSystem:
--- !u!199 &8021848362016640960 --- !u!199 &8021848362016640960
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -129343,7 +129343,7 @@ ParticleSystem:
--- !u!199 &8021848362028390762 --- !u!199 &8021848362028390762
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -133951,7 +133951,7 @@ ParticleSystem:
--- !u!199 &8021848362078736634 --- !u!199 &8021848362078736634
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -138741,7 +138741,7 @@ ParticleSystem:
--- !u!199 &8021848362201013453 --- !u!199 &8021848362201013453
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -143484,7 +143484,7 @@ ParticleSystem:
--- !u!199 &8021848362302878163 --- !u!199 &8021848362302878163
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -143658,7 +143658,7 @@ RectTransform:
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}
m_AnchoredPosition: {x: 0.000076293945, y: 8.4} m_AnchoredPosition: {x: 23.5, y: 8.4}
m_SizeDelta: {x: 1082.1, y: 141.2} m_SizeDelta: {x: 1082.1, y: 141.2}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &489433429541810365 --- !u!114 &489433429541810365
@ -143679,7 +143679,7 @@ MonoBehaviour:
m_Top: 3 m_Top: 3
m_Bottom: 0 m_Bottom: 0
m_ChildAlignment: 3 m_ChildAlignment: 3
m_Spacing: 0 m_Spacing: -91.4
m_ChildForceExpandWidth: 1 m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1 m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0 m_ChildControlWidth: 0

View File

@ -285,7 +285,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &224496853897836366 --- !u!224 &224496853897836366
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1168,7 +1168,7 @@ RectTransform:
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}

View File

@ -2792,10 +2792,10 @@ RectTransform:
m_Father: {fileID: 7135539297195909275} m_Father: {fileID: 7135539297195909275}
m_RootOrder: 1 m_RootOrder: 1
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, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: -278, y: 88} m_AnchoredPosition: {x: 249.33, y: 88}
m_SizeDelta: {x: 475.51, y: 103.1} m_SizeDelta: {x: 414.19, y: 103.1}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1146278160188031124 --- !u!222 &1146278160188031124
CanvasRenderer: CanvasRenderer:
@ -4801,9 +4801,9 @@ RectTransform:
m_Father: {fileID: 4397527884034618620} m_Father: {fileID: 4397527884034618620}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 2, y: 19.585968} m_AnchoredPosition: {x: -538, y: 19.585968}
m_SizeDelta: {x: 484, y: 2} m_SizeDelta: {x: 484, y: 2}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2421783758546065711 --- !u!222 &2421783758546065711
@ -7134,10 +7134,10 @@ RectTransform:
m_Father: {fileID: 1094151485460785958} m_Father: {fileID: 1094151485460785958}
m_RootOrder: 7 m_RootOrder: 7
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: 1, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 287.9, y: -524.15} m_AnchoredPosition: {x: -252.1, y: -524.15}
m_SizeDelta: {x: 494.3, y: 525.5} m_SizeDelta: {x: 494.30005, y: 525.5}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4478420677075010499 --- !u!1 &4478420677075010499
GameObject: GameObject:
@ -15784,10 +15784,10 @@ RectTransform:
m_Father: {fileID: 3526964488070769769} m_Father: {fileID: 3526964488070769769}
m_RootOrder: 1 m_RootOrder: 1
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, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: -528} m_AnchoredPosition: {x: 0, y: -528}
m_SizeDelta: {x: 1080, y: 678} m_SizeDelta: {x: 0, y: 678}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1278418163100822379 --- !u!222 &1278418163100822379
CanvasRenderer: CanvasRenderer:
@ -17443,10 +17443,10 @@ RectTransform:
m_Father: {fileID: 1094151485460785958} m_Father: {fileID: 1094151485460785958}
m_RootOrder: 4 m_RootOrder: 4
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, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 2.3, y: -447.8} m_AnchoredPosition: {x: 2.3000488, y: -447.8}
m_SizeDelta: {x: 1080, y: 482.1} m_SizeDelta: {x: 0, y: 482.1}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &950465297144531787 --- !u!222 &950465297144531787
CanvasRenderer: CanvasRenderer:

View File

@ -4,7 +4,7 @@ local this = NotEnoughPopup
-- 跳转商店购买窗口物品id对应界面及参数 -- 跳转商店购买窗口物品id对应界面及参数
local _JumpConfig = { local _JumpConfig = {
[16] = {36010}, [16] = 36010,
--[15] = {36010}, --[15] = {36010},
--[16] = {36010}, --[16] = {36010},
} }

View File

@ -20,14 +20,14 @@ local leftTime=0 --特权剩余时间
local YaojingCallPrivilegeId = 2006 local YaojingCallPrivilegeId = 2006
function PokemonSummonPanel:InitComponent(gameObject) function PokemonSummonPanel:InitComponent(gameObject)
self.btn_back=Util.GetGameObject(self.transform, "btngroup/btn_back") self.btn_back=Util.GetGameObject(self.transform, "btn_back")
self.buffImg=Util.GetGameObject(self.transform, "tokenImg"):GetComponent("Image") self.buffImg=Util.GetGameObject(self.transform, "tokenImg"):GetComponent("Image")
self.infoTxt=Util.GetGameObject(self.transform,"hint"):GetComponent("Text") self.infoTxt=Util.GetGameObject(self.transform,"hint"):GetComponent("Text")
self.leftTimeObj=Util.GetGameObject(self.transform, "leftTimeObj") self.leftTimeObj=Util.GetGameObject(self.transform, "leftTimeObj")
self.leftTimeTxt=Util.GetGameObject(self.transform,"leftTimeObj/leftTimeTxt"):GetComponent("Text") self.leftTimeTxt=Util.GetGameObject(self.transform,"leftTimeObj/leftTimeTxt"):GetComponent("Text")
self.btn_shop=Util.GetGameObject(self.transform,"btngroup/btn_shop") self.btn_shop=Util.GetGameObject(self.transform,"btn_shop")
self.btn_reward=Util.GetGameObject(self.transform,"btngroup/btn_rewardPool") self.btn_reward=Util.GetGameObject(self.transform,"btn_rewardPool")
self.btn_one=Util.GetGameObject(self.transform,"btngroup/once") self.btn_one=Util.GetGameObject(self.transform,"btngroup/once")
self.oneHintTxt=Util.GetGameObject(self.btn_one,"Tip"):GetComponent("Text") self.oneHintTxt=Util.GetGameObject(self.btn_one,"Tip"):GetComponent("Text")
@ -65,6 +65,7 @@ function PokemonSummonPanel:BindEvent()
end) end)
Util.AddClick(self.btn_activate,function() Util.AddClick(self.btn_activate,function()
--激活特权 --激活特权
DynamicActivityManager.SetSelectIndex(DataType.Direct,{7105})
JumpManager.GoJump(MazeTreasureSetting[1].Jump) JumpManager.GoJump(MazeTreasureSetting[1].Jump)
end) end)
end end

View File

@ -181,6 +181,13 @@ function GiftPre:SetData(data,_parent,_rechargeNum,sortingOrder)
self.tipImage.gameObject:SetActive(false) self.tipImage.gameObject:SetActive(false)
end end
Util.SetParticleSortLayer(self.UI_Effect_MianBan_LiBao_button_01, sortingOrder or 0) Util.SetParticleSortLayer(self.UI_Effect_MianBan_LiBao_button_01, sortingOrder or 0)
self:SetIcon(self.data)
self:SetContent1()
self:Effect()
end
function GiftPre:Effect()
local isshow = false local isshow = false
if self.data.DataType == DynamicActivityManager.selectIndex.dataType then if self.data.DataType == DynamicActivityManager.selectIndex.dataType then
for i = 1 , #DynamicActivityManager.selectIndex.goodsId do for i = 1 , #DynamicActivityManager.selectIndex.goodsId do
@ -190,9 +197,10 @@ function GiftPre:SetData(data,_parent,_rechargeNum,sortingOrder)
end end
end end
end end
if self.isCanBuy == 2 then
isshow = false
end
self.UI_Effect_MianBan_LiBao_button_01.gameObject:SetActive(isshow) self.UI_Effect_MianBan_LiBao_button_01.gameObject:SetActive(isshow)
self:SetIcon(self.data)
self:SetContent1()
end end
function GiftPre:SetContent1() function GiftPre:SetContent1()