-a

src/custom/jiugong-turntable-change/debug/main.js

@@ -10,7 +10,6 @@
 	function getTextureByName(name) {
 	    return getTexture(engine.getAssetByName(name).uuid);
 	}
-	//# sourceMappingURL=utils.js.map
 
 	var props = {};
 	function prepareProps() {
@@ -20,7 +19,6 @@
 	function injectProps(p) {
 	    engine.injectProp(props, p);
 	}
-	//# sourceMappingURL=props.js.map
 
 	var Turntable = (function (_super) {
 	    tslib.__extends(Turntable, _super);
@@ -81,7 +79,7 @@
 	                var titleLabel = new engine.Label();
 	                titleLabel.fillColor = props.prizeName_color;
 	                titleLabel.size = props.prizeName_size;
-	                titleLabel.width = unchecked.width;
+	                titleLabel.width = tmpNode.width;
 	                titleLabel.textAlign = engine.TEXT_ALIGN.CENTER;
 	                titleLabel.x = 0;
 	                titleLabel.y = props.prizeName_Ypos;
@@ -216,7 +214,6 @@
 	    };
 	    return Turntable;
 	}(engine.Container));
-	//# sourceMappingURL=turntable.js.map
 
 	var GameView = (function (_super) {
 	    tslib.__extends(GameView, _super);
@@ -248,7 +245,6 @@
 	    };
 	    return GameView;
 	}(engine.Container));
-	//# sourceMappingURL=GameView.js.map
 
 	var GameWrapper = (function (_super) {
 	    tslib.__extends(GameWrapper, _super);
@@ -282,7 +278,6 @@
 	    };
 	    return GameWrapper;
 	}(engine.Container));
-	//# sourceMappingURL=GameWrapper.js.map
 
 	function index (props) {
 	    prepareProps();
@@ -290,7 +285,6 @@
 	    var instance = new GameWrapper();
 	    return instance;
 	}
-	//# sourceMappingURL=index.js.map
 
 	return index;
 

src/custom/jiugong-turntable-change/src/game/Turntable.ts

@@ -72,7 +72,7 @@ export class Turntable extends engine.Container{
                 let titleLabel = new engine.Label();
                 titleLabel.fillColor = props.prizeName_color;
                 titleLabel.size = props.prizeName_size;
-                titleLabel.width = unchecked.width;
+                titleLabel.width = tmpNode.width;
                 titleLabel.textAlign = engine.TEXT_ALIGN.CENTER;
                 titleLabel.x = 0;
                 titleLabel.y = props.prizeName_Ypos;

src/custom/recycling/debug/main.js

@@ -18,6 +18,7 @@
 	    inst.source = 'asset://' + engine.getAssetByName(name).uuid;
 	    return inst;
 	}
+	//# sourceMappingURL=utils.js.map
 
 	var props = {};
 	function prepareProps() {
@@ -27,6 +28,7 @@
 	function injectProps(p) {
 	    engine.injectProp(props, p);
 	}
+	//# sourceMappingURL=props.js.map
 
 	var Conveyor = (function (_super) {
 	    tslib.__extends(Conveyor, _super);
@@ -62,6 +64,7 @@
 	    };
 	    return Conveyor;
 	}(engine.Sprite));
+	//# sourceMappingURL=Conveyor.js.map
 
 	var GarbageTypes;
 	(function (GarbageTypes) {
@@ -70,6 +73,7 @@
 	    GarbageTypes["wetWaste"] = "wetWaste";
 	    GarbageTypes["dryWaste"] = "dryWaste";
 	})(GarbageTypes || (GarbageTypes = {}));
+	//# sourceMappingURL=GarbageTypes.js.map
 
 	var GarbageConfig = (function () {
 	    function GarbageConfig() {
@@ -92,7 +96,7 @@
 	        { name: "锅具", source: "g15", type: GarbageTypes.recoverableWaste, width: 119, height: 149 },
 	        { name: "果核", source: "g16", type: GarbageTypes.wetWaste, width: 99, height: 95 },
 	        { name: "果皮", source: "g17", type: GarbageTypes.wetWaste, width: 115, height: 127 },
-	        { name: "化妆品", source: "g18", type: GarbageTypes.harmfulWaste, width: 67, height: 151 },
+	        { name: "化妆品", source: "g18", type: GarbageTypes.dryWaste, width: 67, height: 151 },
 	        { name: "鸡蛋壳", source: "g19", type: GarbageTypes.wetWaste, width: 99, height: 107 },
 	        { name: "剪刀", source: "g20", type: GarbageTypes.recoverableWaste, width: 96, height: 127 },
 	        { name: "胶带", source: "g21", type: GarbageTypes.dryWaste, width: 87, height: 113 },
@@ -128,6 +132,7 @@
 	    ];
 	    return GarbageConfig;
 	}());
+	//# sourceMappingURL=GarbageConfig.js.map
 
 	var transStores = (function (list) {
 	    var tmp = [];
@@ -182,11 +187,12 @@
 	        case GarbageTypes.harmfulWaste:
 	            return '有害垃圾';
 	        case GarbageTypes.wetWaste:
-	            return '湿垃圾';
+	            return '厨余垃圾';
 	        case GarbageTypes.dryWaste:
 	            return '其他垃圾';
 	    }
 	};
+	//# sourceMappingURL=transStores.js.map
 
 	var checkHit = (function (view, rect) {
 	    var x = view.x, y = view.y;
@@ -196,12 +202,14 @@
 	    }
 	    return false;
 	});
+	//# sourceMappingURL=checkHit.js.map
 
 	var removeChild = (function (d) {
 	    if (d && d.parent) {
 	        d.parent.removeChild(d);
 	    }
 	});
+	//# sourceMappingURL=removeChild.js.map
 
 	var removeEle = (function (e, arr) {
 	    var index = arr.indexOf(e);
@@ -209,6 +217,7 @@
 	        arr.splice(index, 1);
 	    }
 	});
+	//# sourceMappingURL=removeEle.js.map
 
 	var shuffle = (function (arr) {
 	    var _a;
@@ -219,6 +228,7 @@
 	    }
 	    return arr;
 	});
+	//# sourceMappingURL=shuffle.js.map
 
 	var WrongTips = (function (_super) {
 	    tslib.__extends(WrongTips, _super);
@@ -263,6 +273,7 @@
 	            return gameview.recoverableWaste;
 	    }
 	};
+	//# sourceMappingURL=WrongTips.js.map
 
 	var Conveyors = (function (_super) {
 	    tslib.__extends(Conveyors, _super);
@@ -532,6 +543,7 @@
 	    };
 	    return Conveyors;
 	}(engine.Sprite));
+	//# sourceMappingURL=Conveyors.js.map
 
 	var uiConfig = (function () {
 	    return [
@@ -583,6 +595,7 @@
 	        },
 	    ];
 	});
+	//# sourceMappingURL=uiConfig.js.map
 
 	var setGuide = function () {
 	    try {
@@ -594,6 +607,7 @@
 	        console.log("setguide--err", e);
 	    }
 	};
+	//# sourceMappingURL=getGuideInfo.js.map
 
 	var createBg = (function (a) {
 	    if (a === void 0) { a = 1; }
@@ -604,10 +618,12 @@
 	    rect.alpha = a;
 	    return rect;
 	});
+	//# sourceMappingURL=createBg.js.map
 
 	var createImg = (function (texture) {
 	    return new engine.Sprite(getTextureByName(texture));
 	});
+	//# sourceMappingURL=createImg.js.map
 
 	var CountDownGroup = (function (_super) {
 	    tslib.__extends(CountDownGroup, _super);
@@ -691,6 +707,7 @@
 	    };
 	    return CountDownGroup;
 	}(engine.Sprite));
+	//# sourceMappingURL=CountDownGroup.js.map
 
 	var GuideView = (function (_super) {
 	    tslib.__extends(GuideView, _super);
@@ -775,6 +792,7 @@
 	    };
 	    return GuideView;
 	}(engine.Sprite));
+	//# sourceMappingURL=guideView.js.map
 
 	var RightTips = (function (_super) {
 	    tslib.__extends(RightTips, _super);
@@ -813,6 +831,7 @@
 	    };
 	    return RightTips;
 	}(engine.Sprite));
+	//# sourceMappingURL=RightTips.js.map
 
 	var GameView = (function (_super) {
 	    tslib.__extends(GameView, _super);
@@ -974,6 +993,7 @@
 	    };
 	    return GameView;
 	}(engine.Container));
+	//# sourceMappingURL=GameView.js.map
 
 	var GameWrapper = (function (_super) {
 	    tslib.__extends(GameWrapper, _super);
@@ -998,6 +1018,7 @@
 	    };
 	    return GameWrapper;
 	}(engine.Container));
+	//# sourceMappingURL=GameWrapper.js.map
 
 	function index (props) {
 	    prepareProps();
@@ -1005,6 +1026,7 @@
 	    var instance = new GameWrapper();
 	    return instance;
 	}
+	//# sourceMappingURL=index.js.map
 
 	return index;
 

src/custom/recycling/src/game/datas/GarbageConfig.ts

@@ -18,7 +18,7 @@ export default class GarbageConfig {
         { name: "锅具", source: "g15", type: GarbageTypes.recoverableWaste, width: 119, height: 149 },
         { name: "果核", source: "g16", type: GarbageTypes.wetWaste, width: 99, height: 95 },
         { name: "果皮", source: "g17", type: GarbageTypes.wetWaste, width: 115, height: 127 },
-        { name: "化妆品", source: "g18", type: GarbageTypes.harmfulWaste, width: 67, height: 151 },
+        { name: "化妆品", source: "g18", type: GarbageTypes. dryWaste, width: 67, height: 151 },
         { name: "鸡蛋壳", source: "g19", type: GarbageTypes.wetWaste, width: 99, height: 107 },
         { name: "剪刀", source: "g20", type: GarbageTypes.recoverableWaste, width: 96, height: 127 },
         { name: "胶带", source: "g21", type: GarbageTypes.dryWaste, width: 87, height: 113 },

src/custom/recycling/src/game/datas/transStores.ts

@@ -68,7 +68,7 @@ const getTargetName = (type: GarbageTypes) => {
             break;
 
         case GarbageTypes.wetWaste:
-            return '湿垃圾'
+            return '厨余垃圾'
             break;
 
         case GarbageTypes.dryWaste: