From e987bc09f955e01c2835f01e3a6af20723a579f9 Mon Sep 17 00:00:00 2001
From: 杨锴 <841720330@qq.com>
Date: 星期三, 09 十月 2024 17:29:36 +0800
Subject: [PATCH] add OBS + upgrade level sounds
---
XQMuse/Root/TreeGroup/TreeTeskVC.swift | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/XQMuse/Root/TreeGroup/TreeTeskVC.swift b/XQMuse/Root/TreeGroup/TreeTeskVC.swift
index f1b18ba..3610f34 100644
--- a/XQMuse/Root/TreeGroup/TreeTeskVC.swift
+++ b/XQMuse/Root/TreeGroup/TreeTeskVC.swift
@@ -55,6 +55,11 @@
private var treeInfoModel:TreeInfoModel?
+ private lazy var voicePlayer:AVPlayer = {
+ let p = AVPlayer()
+ return p
+ }()
+
override func viewDidDisappear(_ animated: Bool) {
super.viewDidDisappear(animated)
player.pause()
@@ -258,21 +263,27 @@
alert(msg: "已经没有能量值了，快去做任务吧");return
}
- Services.watering().subscribe(onNext: {data in
+ Services.watering().subscribe(onNext: {[weak self] data in
+ guard let weakSelf = self else { return }
if let m = data.data{
+ sender.isUserInteractionEnabled = true
if m.isNext{
- let type = self.treeInfoModel?.treeLevelType ?? .level_1
- self.treeInfoModel!.treeLevelType = TreeLevel(rawValue: type.rawValue + 1) ?? .level_1
+ let type = weakSelf.treeInfoModel?.treeLevelType ?? .level_1
+ weakSelf.treeInfoModel!.treeLevelType = TreeLevel(rawValue: type.rawValue + 1) ?? .level_1
let h = (JQ_ScreenW - 90) * 0.7729
- TreeTeskFirstRuleView.show(title: "升级", content:"恭喜！你的树苗已升级为\(self.treeInfoModel!.treeLevelType.title)阶段！",textAlignment: .center,height: h,textTopOffset: 57)
+ TreeTeskFirstRuleView.show(title: "升级", content:"恭喜！你的树苗已升级为\(weakSelf.treeInfoModel!.treeLevelType.title)阶段！",textAlignment: .center,height: h,textTopOffset: 57)
- self.updateAni()
+ if let soundURL = URL(string:weakSelf.treeInfoModel?.treeLevelType.sound){
+ weakSelf.voicePlayer.replaceCurrentItem(with: AVPlayerItem(url: soundURL))
+ weakSelf.voicePlayer.play()
+ }
+ weakSelf.updateAni()
}
- self.treeInfoModel?.currentEnergyValue = 0
- self.treeInfoModel?.growthValue = m.growthValue
- self.treeInfoModel?.nextLevel = m.nextLevel
- self.updateTreeInfo()
+ weakSelf.treeInfoModel?.currentEnergyValue = 0
+ weakSelf.treeInfoModel?.growthValue = m.growthValue
+ weakSelf.treeInfoModel?.nextLevel = m.nextLevel
+ weakSelf.updateTreeInfo()
}
}).disposed(by: disposeBag)
--
Gitblit v1.7.1