|
@@ -60,7 +60,7 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
|
|
|
var lastJumpSpeedSelectIndex: Int = 0
|
|
|
|
|
|
- var lastCyclesSelectIndex: Int = 0
|
|
|
+ var lastCyclesSelectIndex: Int = -1
|
|
|
|
|
|
|
|
|
var currentCreateStickersModel: createStickersModel = .createStickersModelSpeed
|
|
@@ -316,7 +316,7 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
lazy var speedSettingView: PQSpeedSettingView = {
|
|
|
let speedSettingView = PQSpeedSettingView()
|
|
|
speedSettingView.backgroundColor = .clear
|
|
|
- speedSettingView.selectSpeedCallBack = { [weak self] maxSpeed, minSpeed, selectIndex, isSettingPlayer in
|
|
|
+ speedSettingView.selectSpeedCallBack = { [weak self] maxSpeed, minSpeed, selectIndex, isSettingPlayer,isCancle in
|
|
|
BFLog(message: "固定maxSpeed is\(maxSpeed) minSpeed \(minSpeed)")
|
|
|
|
|
|
if speedSettingView.viewType == 1 {
|
|
@@ -330,7 +330,7 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
self?.minSpeed = minSpeed
|
|
|
if maxSpeed == -1.0 && minSpeed == -1.0 {
|
|
|
self?.customSpeedSettingView.isHidden = false
|
|
|
- self?.customSpeedSettingView.isJumpSpeedModel = speedSettingView.viewType == 2
|
|
|
+ self?.customSpeedSettingView.viewType = speedSettingView.viewType
|
|
|
}
|
|
|
if isSettingPlayer {
|
|
|
self?.settingPlayerView()
|
|
@@ -344,8 +344,7 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
lazy var customSpeedSettingView: PQCustomSpeedSettingView = {
|
|
|
let customSpeedSettingView = PQCustomSpeedSettingView(frame: CGRect(x: 0, y: cScreenHeigth - 354, width: cScreenWidth, height: 354))
|
|
|
customSpeedSettingView.isHidden = true
|
|
|
- customSpeedSettingView.isJumpSpeedModel = false
|
|
|
- customSpeedSettingView.selectSpeedCallBack = { [weak self] maxSpeed, minSpeed, isJumpSpeedModel in
|
|
|
+ customSpeedSettingView.selectSpeedCallBack = { [weak self] maxSpeed, minSpeed, isJumpSpeedModel ,isCancle in
|
|
|
self?.maxSpeed = maxSpeed
|
|
|
self?.minSpeed = minSpeed
|
|
|
BFLog(message: "自定义速度maxSpeed is\(maxSpeed) minSpeed \(minSpeed) \(isJumpSpeedModel)")
|
|
@@ -494,7 +493,7 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
|
|
|
if sender.tag == 1 || sender.tag == 2 {
|
|
|
speedSettingView.viewType = sender.tag
|
|
|
- customSpeedSettingView.isJumpSpeedModel = speedSettingView.viewType == 2
|
|
|
+ customSpeedSettingView.viewType = speedSettingView.viewType
|
|
|
|
|
|
speedSettingView.snp.remakeConstraints { make in
|
|
|
make.left.equalToSuperview().offset(16)
|
|
@@ -515,7 +514,7 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
|
|
|
if selectedDataCount == selectedImageDataCount {
|
|
|
speedSettingView.viewType = 3
|
|
|
- customSpeedSettingView.isJumpSpeedModel = false
|
|
|
+ customSpeedSettingView.viewType = speedSettingView.viewType
|
|
|
speedSettingView.snp.remakeConstraints { make in
|
|
|
make.left.equalToSuperview().offset(16)
|
|
|
make.right.equalToSuperview()
|
|
@@ -527,7 +526,7 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
editModelLineView.isHidden = false
|
|
|
speedTitleLab.isHidden = false
|
|
|
sustomSwitchView.isHidden = false
|
|
|
- speedSettingView.setSelectItem(index: lastCyclesSelectIndex, isSettingPlayer: false)
|
|
|
+
|
|
|
|
|
|
} else {
|
|
|
if sender.tag == 1 {
|
|
@@ -535,7 +534,7 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
} else if sender.tag == 2 {
|
|
|
speedSettingView.setSelectItem(index: lastJumpSpeedSelectIndex, isSettingPlayer: false)
|
|
|
} else if sender.tag == 3 {
|
|
|
- customSpeedSettingView.isJumpSpeedModel = false
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1223,6 +1222,7 @@ extension PQStuckPointEditerController {
|
|
|
|
|
|
|
|
|
var useAssestDuration: Float = 0.0
|
|
|
+ selectedTotalDuration = 0.0
|
|
|
switch model {
|
|
|
case .createStickersModelPoint:
|
|
|
stuckPointsTemp = getUsedStuckPoint(seed: stuckPointMusicData?.speed ?? 0)
|
|
@@ -1384,20 +1384,23 @@ extension PQStuckPointEditerController {
|
|
|
speedSettingView.viewType = 3
|
|
|
|
|
|
|
|
|
- if lastCyclesSelectIndex != 0 {
|
|
|
- for i in 0 ... lastCyclesSelectIndex - 1 {
|
|
|
- var pointIndex = stuckPointsTemp.firstIndex(where: { (point) -> Bool in
|
|
|
- (point == (finallyStuckPoints.last ?? 0).truncatingRemainder(dividingBy: (stuckPointsTemp.last ?? 0)))
|
|
|
- })
|
|
|
- pointIndex = (pointIndex ?? 0) + 1
|
|
|
- for i in 0 ... selectedImageDataCount {
|
|
|
- let a = stuckPointsTemp[(i + Int(pointIndex ?? 0)) % stuckPointsTemp.count]
|
|
|
- let b = Float((i + Int(pointIndex ?? 0)) / stuckPointsTemp.count) * (stuckPointsTemp.first ?? 0)
|
|
|
- finallyStuckPoints.append(a + b)
|
|
|
+ if lastCyclesSelectIndex != -1 {
|
|
|
+ if(lastCyclesSelectIndex != 0){
|
|
|
+ for i in 0 ... lastCyclesSelectIndex - 1{
|
|
|
+ var pointIndex = stuckPointsTemp.firstIndex(where: { (point) -> Bool in
|
|
|
+ (point == (finallyStuckPoints.last ?? 0).truncatingRemainder(dividingBy: (stuckPointsTemp.last ?? 0)))
|
|
|
+ })
|
|
|
+ pointIndex = (pointIndex ?? 0) + 1
|
|
|
+ for i in 0 ... selectedImageDataCount {
|
|
|
+ let a = stuckPointsTemp[(i + Int(pointIndex ?? 0)) % stuckPointsTemp.count]
|
|
|
+ let b = Float((i + Int(pointIndex ?? 0)) / stuckPointsTemp.count) * (stuckPointsTemp.first ?? 0)
|
|
|
+ finallyStuckPoints.append(a + b)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
} else {
|
|
|
- lastCyclesSelectIndex = 0
|
|
|
+ lastCyclesSelectIndex = 1
|
|
|
while selectedTotalDuration < 10 {
|
|
|
|
|
|
var pointIndex = stuckPointsTemp.firstIndex(where: { (point) -> Bool in
|