Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
0b58f64ff2
Binary file not shown.
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 4.0 KiB |
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 308a28cba6275ae45818a4e4cb5c59e2
|
||||
guid: 123117b7df67f024cb06add84054c99a
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
|
@ -97,7 +97,7 @@ TextureImporter:
|
|||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5c1ed125ea9ea0242a54268c516bb7db
|
||||
spriteID: 6544874d5a9258544b9d62a6fa1d81cb
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.9 KiB |
Binary file not shown.
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.7 KiB |
|
@ -28,7 +28,7 @@ function this.UpdateMonthCardData(msg)
|
|||
--当我数据没有 后端推过来的有数据 此时需要弹窗
|
||||
this.showStr = ""
|
||||
for i = 1, #msg.monthinfos do
|
||||
if monthCardData[i].endingTime <= 0 then
|
||||
if monthCardData[i].endingTime <= 0 and msg.monthinfos[i].endingTime > 0 then
|
||||
this.showStr = string.format("恭喜您成功激活%s功能,是否立即前往月卡界面领取奖励。", MonthCardText[i])--Language[11384]
|
||||
break
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue