Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local

# Conflicts:
#	Assets/ManagedResources/Atlas/TagAtlas/r_shangdian_xuanyuan.png.meta
dev_chengFeng
ZhangBiao 2020-10-27 16:16:10 +08:00
commit 35f6a6c430
4 changed files with 97 additions and 86 deletions

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 105d8c271c1e0af44b3c584b906323e3 guid: 0becfb702d9034b42a066aa225fdeb27
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
externalObjects: {} externalObjects: {}
@ -75,7 +75,7 @@ TextureImporter:
outline: [] outline: []
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: 22b3e79e6a9f35344a54d4dd209879b9 spriteID: c9e50b79681466840af4ae85b937b4d3
vertices: [] vertices: []
indices: indices:
edges: [] edges: []

View File

@ -5010,7 +5010,7 @@ ParticleSystem:
--- !u!199 &391347278 --- !u!199 &391347278
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}
@ -11402,7 +11402,7 @@ ParticleSystem:
--- !u!199 &85288511972748413 --- !u!199 &85288511972748413
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}
@ -16145,7 +16145,7 @@ ParticleSystem:
--- !u!199 &85288512077974317 --- !u!199 &85288512077974317
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}
@ -20843,7 +20843,7 @@ ParticleSystem:
--- !u!199 &85288512168349841 --- !u!199 &85288512168349841
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}
@ -25541,7 +25541,7 @@ ParticleSystem:
--- !u!199 &85288512214742610 --- !u!199 &85288512214742610
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}
@ -30404,7 +30404,7 @@ ParticleSystem:
--- !u!199 &85288513168343927 --- !u!199 &85288513168343927
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}
@ -35102,7 +35102,7 @@ ParticleSystem:
--- !u!199 &85288513351305705 --- !u!199 &85288513351305705
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}
@ -40871,7 +40871,7 @@ ParticleSystem:
--- !u!199 &414691610813295580 --- !u!199 &414691610813295580
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}
@ -45569,7 +45569,7 @@ ParticleSystem:
--- !u!199 &414691611028988226 --- !u!199 &414691611028988226
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}
@ -50267,7 +50267,7 @@ ParticleSystem:
--- !u!199 &414691612045800100 --- !u!199 &414691612045800100
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}
@ -55010,7 +55010,7 @@ ParticleSystem:
--- !u!199 &414691612085578008 --- !u!199 &414691612085578008
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}
@ -59708,7 +59708,7 @@ ParticleSystem:
--- !u!199 &414691612257095240 --- !u!199 &414691612257095240
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}
@ -64406,7 +64406,7 @@ ParticleSystem:
--- !u!199 &5899601245091579705 --- !u!199 &5899601245091579705
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}
@ -69652,7 +69652,7 @@ ParticleSystem:
--- !u!199 &5567085447044821671 --- !u!199 &5567085447044821671
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}
@ -74513,7 +74513,7 @@ ParticleSystem:
--- !u!199 &5045489869960765571 --- !u!199 &5045489869960765571
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}
@ -81453,7 +81453,7 @@ ParticleSystem:
--- !u!199 &7424551215614179344 --- !u!199 &7424551215614179344
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}
@ -87611,7 +87611,7 @@ ParticleSystem:
--- !u!199 &6924675644743089439 --- !u!199 &6924675644743089439
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}
@ -88868,7 +88868,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 0.9 m_LineSpacing: 0.9
m_Text: "\u6BCF\n\u65E5\n\u4EC5\n\u9700\n\u5145\n\u503C\n$1" m_Text: "\u6BCF\n\u65E5\n\u4EC5\n\u9700\n\u5145\n\u503C\n$0.99"
--- !u!1 &1599836006760387995 --- !u!1 &1599836006760387995
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -93991,7 +93991,7 @@ ParticleSystem:
--- !u!199 &7275324880265961258 --- !u!199 &7275324880265961258
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}
@ -99671,7 +99671,7 @@ ParticleSystem:
--- !u!199 &7918083443768115927 --- !u!199 &7918083443768115927
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}
@ -104992,7 +104992,7 @@ ParticleSystem:
--- !u!199 &4249202741276730180 --- !u!199 &4249202741276730180
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}
@ -109818,7 +109818,7 @@ ParticleSystem:
--- !u!199 &7446892149717719861 --- !u!199 &7446892149717719861
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}
@ -116444,7 +116444,7 @@ ParticleSystem:
--- !u!199 &7994448136678369462 --- !u!199 &7994448136678369462
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}
@ -121891,7 +121891,7 @@ ParticleSystem:
--- !u!199 &6366831406703767530 --- !u!199 &6366831406703767530
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}
@ -126706,7 +126706,7 @@ ParticleSystem:
--- !u!199 &7647035856671918723 --- !u!199 &7647035856671918723
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}
@ -132563,7 +132563,7 @@ ParticleSystem:
--- !u!199 &3442100318452166299 --- !u!199 &3442100318452166299
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}
@ -137528,7 +137528,7 @@ ParticleSystem:
--- !u!199 &6225703503371946647 --- !u!199 &6225703503371946647
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}
@ -144029,7 +144029,7 @@ ParticleSystem:
--- !u!199 &3736263280892008042 --- !u!199 &3736263280892008042
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}
@ -148801,7 +148801,7 @@ ParticleSystem:
--- !u!199 &3736263281027369366 --- !u!199 &3736263281027369366
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}
@ -153719,7 +153719,7 @@ ParticleSystem:
--- !u!199 &3736263281144678159 --- !u!199 &3736263281144678159
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}
@ -158417,7 +158417,7 @@ ParticleSystem:
--- !u!199 &3736263281160650038 --- !u!199 &3736263281160650038
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}
@ -163120,7 +163120,7 @@ ParticleSystem:
--- !u!199 &3736263281325203082 --- !u!199 &3736263281325203082
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}
@ -168258,7 +168258,7 @@ ParticleSystem:
--- !u!199 &3736263282101879313 --- !u!199 &3736263282101879313
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}
@ -172956,7 +172956,7 @@ ParticleSystem:
--- !u!199 &3736263282140865173 --- !u!199 &3736263282140865173
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}
@ -177729,7 +177729,7 @@ ParticleSystem:
--- !u!199 &3736263282223057855 --- !u!199 &3736263282223057855
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}
@ -182472,7 +182472,7 @@ ParticleSystem:
--- !u!199 &3736263282260434226 --- !u!199 &3736263282260434226
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}
@ -188067,7 +188067,7 @@ ParticleSystem:
--- !u!199 &8736007889913585379 --- !u!199 &8736007889913585379
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}
@ -193068,7 +193068,7 @@ ParticleSystem:
--- !u!199 &6218818886541518366 --- !u!199 &6218818886541518366
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}
@ -199933,7 +199933,7 @@ ParticleSystem:
--- !u!199 &3061375693970565652 --- !u!199 &3061375693970565652
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}
@ -205362,7 +205362,7 @@ ParticleSystem:
--- !u!199 &6371239923318808130 --- !u!199 &6371239923318808130
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}
@ -213838,7 +213838,7 @@ ParticleSystem:
--- !u!199 &1315029844154324974 --- !u!199 &1315029844154324974
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}
@ -218637,7 +218637,7 @@ ParticleSystem:
--- !u!199 &8071948387418332622 --- !u!199 &8071948387418332622
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}
@ -225578,7 +225578,7 @@ ParticleSystem:
--- !u!199 &3296716962752466389 --- !u!199 &3296716962752466389
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}
@ -230978,7 +230978,7 @@ ParticleSystem:
--- !u!199 &5208671054231575281 --- !u!199 &5208671054231575281
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}
@ -235814,7 +235814,7 @@ ParticleSystem:
--- !u!199 &6800295426981046828 --- !u!199 &6800295426981046828
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}
@ -246840,7 +246840,7 @@ ParticleSystem:
--- !u!199 &7443524496537394543 --- !u!199 &7443524496537394543
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}
@ -253314,7 +253314,7 @@ ParticleSystem:
--- !u!199 &3952339559707849751 --- !u!199 &3952339559707849751
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}
@ -259703,7 +259703,7 @@ ParticleSystem:
--- !u!199 &2759699216698959261 --- !u!199 &2759699216698959261
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}
@ -266791,7 +266791,7 @@ ParticleSystem:
--- !u!199 &4947693289891535506 --- !u!199 &4947693289891535506
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}
@ -275608,7 +275608,7 @@ ParticleSystem:
--- !u!199 &2910122108993515360 --- !u!199 &2910122108993515360
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}
@ -280872,7 +280872,7 @@ ParticleSystem:
--- !u!199 &2442695948598551547 --- !u!199 &2442695948598551547
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}
@ -288146,7 +288146,7 @@ ParticleSystem:
--- !u!199 &2047885427326027412 --- !u!199 &2047885427326027412
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}
@ -292844,7 +292844,7 @@ ParticleSystem:
--- !u!199 &7335579053258334880 --- !u!199 &7335579053258334880
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}

View File

@ -663,7 +663,7 @@ function BattleUtil.RandomDot(rand, dot, caster, target, round, interval, damage
caster.Event:DispatchEvent(BattleEventName.PassiveRandomDot, _CallBack, dot) caster.Event:DispatchEvent(BattleEventName.PassiveRandomDot, _CallBack, dot)
target.Event:DispatchEvent(BattleEventName.PassiveBeRandomDot, _CallBack, dot) target.Event:DispatchEvent(BattleEventName.PassiveBeRandomDot, _CallBack, dot)
rand = BattleUtil.CountChangeList(rand, cl) rand = BattleUtil.CountChangeList(rand, cl)
damage = BattleUtil.CountChangeList(damage, dcl) damage = floor(BattleUtil.CountChangeList(damage, dcl))
return BattleUtil.RandomAction(rand, function() return BattleUtil.RandomAction(rand, function()
local buff = Buff.Create(caster, BuffName.DOT, round, interval, dot, damage) local buff = Buff.Create(caster, BuffName.DOT, round, interval, dot, damage)

View File

@ -4,8 +4,7 @@ local _ShopTypeConfig = ConfigManager.GetConfig(ConfigName.StoreTypeConfig)
local ShopView = {} local ShopView = {}
local this = ShopView local this = ShopView
this.sortingOrder = 0 this.sortingOrder = 0
-- 保存商品中的物品节点 local isPlayShow = true
local _GoodsItemList = {}
---===============================生命周期函数================================ ---===============================生命周期函数================================
function this:New(gameObject) function this:New(gameObject)
local o = {} local o = {}
@ -80,6 +79,8 @@ end
function this:BindEvent() function this:BindEvent()
local localSelf = self local localSelf = self
Util.AddOnceClick(self.refreshBtn, function() Util.AddOnceClick(self.refreshBtn, function()
PlaySoundWithoutClick("UI_refresh")
isPlayShow = true
local isPopUp = RedPointManager.PlayerPrefsGetStr(PlayerManager.uid .. localSelf.ShopType) local isPopUp = RedPointManager.PlayerPrefsGetStr(PlayerManager.uid .. localSelf.ShopType)
local currentTime = os.date("%Y%m%d", PlayerManager.serverTime) local currentTime = os.date("%Y%m%d", PlayerManager.serverTime)
local shopType = localSelf.ShopType local shopType = localSelf.ShopType
@ -136,12 +137,14 @@ function this:OnClose()
-- 物品节点回收 -- 物品节点回收
for _, item in pairs(_GoodsItemList) do if self._GoodsItemList then
Util.SetColor(item.gameObject, Color.New(1,1,1,1)) for _, item in pairs(self._GoodsItemList) do
Util.SetGray(item.gameObject, false) Util.SetColor(item.gameObject, Color.New(1,1,1,1))
SubUIManager.Close(item) Util.SetGray(item.gameObject, false)
SubUIManager.Close(item)
end
self._GoodsItemList = {}
end end
_GoodsItemList = {}
-- 红点销毁 -- 红点销毁
-- if self.ShopType == SHOP_TYPE.GENERAL_SHOP then -- if self.ShopType == SHOP_TYPE.GENERAL_SHOP then
@ -189,8 +192,10 @@ function this:RefreshShopInfo(isRefresh, isTop)
if isRefresh then if isRefresh then
-- 物品节点播放特效 -- 物品节点播放特效
for _, item in pairs(_GoodsItemList) do if self._GoodsItemList then
item:OnShowUIeffectItemViewSaoguang() for _, item in pairs(self._GoodsItemList) do
item:OnShowUIeffectItemViewSaoguang()
end
end end
end end
end end
@ -382,17 +387,17 @@ function this:RefreshItemList(isTop)
self.RechargeScrollView:SetData(itemlist, function(index, shopItem) self.RechargeScrollView:SetData(itemlist, function(index, shopItem)
local itemData = itemlist[index] local itemData = itemlist[index]
self:RechargeShopItemAdapter(shopItem, itemData) self:RechargeShopItemAdapter(shopItem, itemData)
if isPlayShow then
shopItem.gameObject:SetActive(false)
end
end) end)
if isTop then if isTop then
self.RechargeScrollView:SetIndex(1) self.RechargeScrollView:SetIndex(1)
end end
self.RechargeScrollView:ForeachItemGO(function (index, go) if isPlayShow then
Timer.New(function () SecTorPlayAnimByScroll(self.RechargeScrollView,0.03)
go.gameObject:SetActive(true) isPlayShow = false
PlayUIAnim(go.gameObject) end
end, 0.03*(index-1)):Start()
end)
else else
-- 重置列表 -- 重置列表
self.RechargeScrollView.gameObject:SetActive(false) self.RechargeScrollView.gameObject:SetActive(false)
@ -401,17 +406,17 @@ function this:RefreshItemList(isTop)
self.ScrollView:SetData(itemlist, function(index, shopItem) self.ScrollView:SetData(itemlist, function(index, shopItem)
local itemData = itemlist[index] local itemData = itemlist[index]
self:ShopItemAdapter(shopItem, itemData) self:ShopItemAdapter(shopItem, itemData)
if isPlayShow then
shopItem.gameObject:SetActive(false)
end
end) end)
if isTop then if isTop then
self.ScrollView:SetIndex(1) self.ScrollView:SetIndex(1)
end end
self.ScrollView:ForeachItemGO(function (index, go) if isPlayShow then
Timer.New(function () SecTorPlayAnimByScroll(self.ScrollView,0.03)
go.gameObject:SetActive(true) isPlayShow = false
PlayUIAnim(go.gameObject) end
end, 0.03*(index-1)):Start()
end)
end end
end end
@ -481,14 +486,17 @@ function this:ShopItemAdapter(shopItem, itemData)
empty:SetActive(isEmpty) empty:SetActive(isEmpty)
-- 数据匹配 -- 数据匹配
if not _GoodsItemList[shopItem] then if not self._GoodsItemList then
_GoodsItemList[shopItem] = SubUIManager.Open(SubUIConfig.ItemView, item.transform) self._GoodsItemList = {}
end end
Util.SetGray(_GoodsItemList[shopItem].gameObject, not _IsUnLock) if not self._GoodsItemList[shopItem] then
self._GoodsItemList[shopItem] = SubUIManager.Open(SubUIConfig.ItemView, item.transform)
end
Util.SetGray(self._GoodsItemList[shopItem].gameObject, not _IsUnLock)
if isEmpty or not _IsUnLock then -- 物品空或者未解锁不现实物品特效 if isEmpty or not _IsUnLock then -- 物品空或者未解锁不现实物品特效
_GoodsItemList[shopItem]:OnOpen(false, goods[1],1,false,false,false) self._GoodsItemList[shopItem]:OnOpen(false, goods[1],1,false,false,false)
else else
_GoodsItemList[shopItem]:OnOpen(false, goods[1],1,false,false,false,this.sortingOrder) self._GoodsItemList[shopItem]:OnOpen(false, goods[1],1,false,false,false,this.sortingOrder)
end end
-- 商品颜色显示 -- 商品颜色显示
@ -547,6 +555,8 @@ function this:RechargeShopItemAdapter(shopItem, itemData)
self:RechargeSuccessFunc(itemData.goodsId) self:RechargeSuccessFunc(itemData.goodsId)
end) end)
end) end)
end end
-- 充值成功回调 -- 充值成功回调
@ -579,6 +589,7 @@ function this:ShowShop(shopType,_sortingOrder)
-- 刷新显示 -- 刷新显示
self.ShopType = shopType self.ShopType = shopType
isPlayShow = true
self.ShopId = ShopManager.GetShopDataByType(self.ShopType).id self.ShopId = ShopManager.GetShopDataByType(self.ShopType).id
self.ShopConfig = _ShopTypeConfig[self.ShopId] self.ShopConfig = _ShopTypeConfig[self.ShopId]
-- 显示帮助按钮 -- 显示帮助按钮
@ -624,8 +635,8 @@ end
-- 设置层级 -- 设置层级
function this:SetSortLayer(sortLayer) function this:SetSortLayer(sortLayer)
-- --
Log("sortLayer _GoodsItemList "..sortLayer.." "..LengthOfTable(_GoodsItemList)) Log("sortLayer _GoodsItemList "..sortLayer.." "..LengthOfTable(self._GoodsItemList))
for _, item in pairs(_GoodsItemList) do for _, item in pairs(self._GoodsItemList) do
item:SetEffectLayer(sortLayer)--this.sortingOrder) item:SetEffectLayer(sortLayer)--this.sortingOrder)
end end