Merge branch 'master' of http://zhi-edu.com:3000/lan/zedu_client

assets/script/rule/DragRule.ts

@@ -138,7 +138,7 @@ export default class DragRule extends BaseRule {
         let isValid = false
         if (endRule.containValue != '-1') {
             let tempArr = endRule.containValue.split(',')
-            isValid = tempArr.filter(value1 => value1 == this.value).length > 0
+            isValid = tempArr.filter(value1 => value1 == curValue).length > 0
         }
         // 返回结果
         let result: IRuleResult = {fo: this.node, to: this.endNode, isValid: isValid}

gulpfile.js

@@ -13,6 +13,7 @@ const https = require('https')
 const minimist = require('minimist')
 const GulpSSH = require('gulp-ssh')
 const vinylPaths = require('vinyl-paths')
+const rename = require('gulp-rename')
 // 配置
 const knownOptions = {
     string: 'version',
@@ -613,3 +614,10 @@ gulp.task('modifyDataJson', cb => {
     }
     cb()
 })
+
+gulp.task('copyMp3', () => {
+    return gulp.src([`D:/zedu_jxb/gameRes/gameChildSeme/**/**~1.mp3`]).pipe(rename(function (path) {
+        // Updates the object in-place
+        path.basename = path.basename.replace("~1", "")
+    })).pipe(gulp.dest('D:/zedu_jxb/gameRes/gameChildSeme/'))
+})

package.json

@@ -21,6 +21,7 @@
     "gulp": "^4.0.2",
     "gulp-plumber": "^1.2.1",
     "gulp-replace": "^1.0.0",
+    "gulp-rename": "^2.0.0",
     "gulp-shell": "^0.6.5",
     "gulp-ssh": "^0.7.0",
     "gulp-tinypng-extended": "^3.0.1",