|
@@ -47,9 +47,9 @@ func GetHappyOrchardUserSeedRecordData(engine *xorm.Engine, record models.HappyO |
|
|
} |
|
|
} |
|
|
seedState, nextSeedStateWaters := getHappyOrchardUserSeedStage(record, *happyOrchardSeed) |
|
|
seedState, nextSeedStateWaters := getHappyOrchardUserSeedStage(record, *happyOrchardSeed) |
|
|
resp.RecordPlantingStage = seedState |
|
|
resp.RecordPlantingStage = seedState |
|
|
resp.RecordPlantingStageZh = stageNameCustomData[resp.RecordPlantingStage] |
|
|
|
|
|
|
|
|
resp.RecordPlantingStageZh = stageNameCustomData[resp.RecordPlantingStage+1] |
|
|
resp.RecordPlantingNextStage = resp.RecordPlantingStage + 1 |
|
|
resp.RecordPlantingNextStage = resp.RecordPlantingStage + 1 |
|
|
resp.RecordPlantingNextStageZh = stageNameCustomData[resp.RecordPlantingNextStage] |
|
|
|
|
|
|
|
|
resp.RecordPlantingNextStageZh = stageNameCustomData[resp.RecordPlantingNextStage+1] |
|
|
resp.RecordPlantingNextStageNeedWaterNums = nextSeedStateWaters / happyOrchardBasicSetting.WateringEveryTimeWaterDroplet |
|
|
resp.RecordPlantingNextStageNeedWaterNums = nextSeedStateWaters / happyOrchardBasicSetting.WateringEveryTimeWaterDroplet |
|
|
resp.RecordPlantingNextStageNeedWater = nextSeedStateWaters |
|
|
resp.RecordPlantingNextStageNeedWater = nextSeedStateWaters |
|
|
} |
|
|
} |
|
@@ -161,7 +161,7 @@ func UserReplaceSeed(engine *xorm.Engine, record models.HappyOrchardUserSeedReco |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
_, err = happyOrchardUserWatersDb.UpdateHappyOrchardUserWatersBySess(uid, happyOrchardUserWaters, "replace_seed_nums") |
|
|
|
|
|
|
|
|
_, err = happyOrchardUserWatersDb.UpdateHappyOrchardUserWaters(uid, happyOrchardUserWaters, "replace_seed_nums") |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return err |
|
|
return err |
|
|
} |
|
|
} |
|
|