Commit eb3457c9 authored by LWD's avatar LWD

代码提交

parent dfa7aac1
...@@ -214,7 +214,7 @@ var game = cc.Class({ ...@@ -214,7 +214,7 @@ var game = cc.Class({
this.dragonCat.playAnimation(name); this.dragonCat.playAnimation(name);
}, },
//播放猫动画 //播放猫动画 normal wrong right waiting
playLionDragon(name) { playLionDragon(name) {
this.dragonLion.armatureName = "armatureName"; this.dragonLion.armatureName = "armatureName";
this.dragonLion.playAnimation(name); this.dragonLion.playAnimation(name);
......
...@@ -40,7 +40,7 @@ cc.Class({ ...@@ -40,7 +40,7 @@ cc.Class({
OP26.game.inst.handTween && OP26.game.inst.handTween.stop() && (OP26.game.inst.handTip.active = false); OP26.game.inst.handTween && OP26.game.inst.handTween.stop() && (OP26.game.inst.handTip.active = false);
//狮子猫动画 //狮子猫动画
OP26.game.inst.playLionDragon("openmouth"); OP26.game.inst.playLionDragon("waiting");
OP26.res_mgr.playAudioByUrl(this.itemInfo.audio_url, (url) => { OP26.res_mgr.playAudioByUrl(this.itemInfo.audio_url, (url) => {
OP26.snd_mgr.playEffect(url, null); OP26.snd_mgr.playEffect(url, null);
...@@ -143,16 +143,16 @@ cc.Class({ ...@@ -143,16 +143,16 @@ cc.Class({
OP26.data_mgr.nowNum -= 1; OP26.data_mgr.nowNum -= 1;
//狮子猫动画 //狮子猫动画
OP26.game.inst.playLionDragon("chew"); OP26.game.inst.playLionDragon("right");
//先播放错误声音 //先播放正确声音
OP26.speaker.inst.playEffect(OP26.enum.E_Audio.Right); OP26.speaker.inst.playEffect(OP26.enum.E_Audio.Right);
this._timeoutIds.push(setTimeout(() => { this._timeoutIds.push(setTimeout(() => {
OP26.game.inst.playCatDragon("right"); OP26.game.inst.playCatDragon("right");
//先播放错误声音 //先播放正确声音
OP26.speaker.inst.playErrorEffect(); OP26.speaker.inst.playRightEffect();
//当前关卡是否结束 //当前关卡是否结束
if (OP26.data_mgr.nowNum <= 0) { if (OP26.data_mgr.nowNum <= 0) {
...@@ -165,7 +165,7 @@ cc.Class({ ...@@ -165,7 +165,7 @@ cc.Class({
errorEffect: function () { errorEffect: function () {
//狮子猫动画 //狮子猫动画
OP26.game.inst.playCatDragon("wrong"); OP26.game.inst.playCatDragon("wrong");
OP26.game.inst.playLionDragon("no"); OP26.game.inst.playLionDragon("wrong");
//先播放错误声音 //先播放错误声音
OP26.speaker.inst.playEffect(OP26.enum.E_Audio.Error); OP26.speaker.inst.playEffect(OP26.enum.E_Audio.Error);
......
...@@ -91,9 +91,9 @@ cc.Class({ ...@@ -91,9 +91,9 @@ cc.Class({
setDragon() { setDragon() {
//先设置节点大小为0, //先设置节点大小为0,
var Info = { var Info = {
tex_json: OP26.data_mgr.data.tex_json, tex_json: OP26.data_mgr.data.tex_json1,
ske_json: OP26.data_mgr.data.ske_json, ske_json: OP26.data_mgr.data.ske_json1,
tex_png: OP26.data_mgr.data.tex_png, tex_png: OP26.data_mgr.data.tex_png1,
} }
OP26.res_mgr.loadSpine(this.dragonItem, Info); OP26.res_mgr.loadSpine(this.dragonItem, Info);
this.playDragon("normal"); this.playDragon("normal");
......
...@@ -44,11 +44,11 @@ OP26.data_mgr = { ...@@ -44,11 +44,11 @@ OP26.data_mgr = {
"tex_png_name": "lion_tex.png", "tex_png_name": "lion_tex.png",
"ske_json1": "http://staging-teach.cdn.ireadabc.com/7355648029551e6848a2cf36ea8a6ba6.json", "ske_json1": "http://staging-teach.cdn.ireadabc.com/7355648029551e6848a2cf36ea8a6ba6.json",
"ske_json_name1": "lion_ske.json", "ske_json1_name": "lion_ske.json",
"tex_json1": "http://staging-teach.cdn.ireadabc.com/511fe163f2df10925e3da82f0f69590b.json", "tex_json1": "http://staging-teach.cdn.ireadabc.com/511fe163f2df10925e3da82f0f69590b.json",
"tex_json_name1": "lion_tex.json", "tex_json1_name": "lion_tex.json",
"tex_png1": "http://staging-teach.cdn.ireadabc.com/2fd2a53fcb36d36281a6ded9500dd54f.png", "tex_png1": "http://staging-teach.cdn.ireadabc.com/2fd2a53fcb36d36281a6ded9500dd54f.png",
"tex_png_name1": "lion_tex.png", "tex_png1_name": "lion_tex.png",
"guideBegin_audio_url": "http://staging-teach.cdn.ireadabc.com/bd6e2b3a870ef3f9ee9ad9c0fda79228.mp3", "guideBegin_audio_url": "http://staging-teach.cdn.ireadabc.com/bd6e2b3a870ef3f9ee9ad9c0fda79228.mp3",
"guideEnd_audio_url": "http://staging-teach.cdn.ireadabc.com/bd6e2b3a870ef3f9ee9ad9c0fda79228.mp3", "guideEnd_audio_url": "http://staging-teach.cdn.ireadabc.com/bd6e2b3a870ef3f9ee9ad9c0fda79228.mp3",
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
"compressing": "^1.5.0", "compressing": "^1.5.0",
"ng-zorro-antd": "^8.5.2", "ng-zorro-antd": "^8.5.2",
"rxjs": "~6.5.4", "rxjs": "~6.5.4",
"node-sass": "^4.0.0",
"spark-md5": "^3.0.0", "spark-md5": "^3.0.0",
"tslib": "^1.10.0", "tslib": "^1.10.0",
"zone.js": "~0.10.2" "zone.js": "~0.10.2"
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
(nzChange)="handleChange($event, item,'ske_json1')"> (nzChange)="handleChange($event, item,'ske_json1')">
<button nz-button><i nz-icon nzType="upload"></i>Upload</button> <button nz-button><i nz-icon nzType="upload"></i>Upload</button>
</nz-upload> </nz-upload>
<span style="margin-left: 10px;">{{item["ske_json_name1"]}}</span> <span style="margin-left: 10px;">{{item["ske_json1_name"]}}</span>
</div> </div>
<div style="display: flex 1;margin-bottom: 10px;margin-left: 10px;"> <div style="display: flex 1;margin-bottom: 10px;margin-left: 10px;">
...@@ -52,16 +52,17 @@ ...@@ -52,16 +52,17 @@
(nzChange)="handleChange($event, item,'tex_json1')"> (nzChange)="handleChange($event, item,'tex_json1')">
<button nz-button><i nz-icon nzType="upload"></i>Upload</button> <button nz-button><i nz-icon nzType="upload"></i>Upload</button>
</nz-upload> </nz-upload>
<span style="margin-left: 10px;">{{ item["tex_json_name1"] }}</span> <span style="margin-left: 10px;">{{ item["tex_json1_name"] }}</span>
</div> </div>
<div style="display: flex 1;margin-bottom: 10px;margin-left: 10px;"> <div style="display: flex 1;margin-bottom: 10px;margin-left: 10px;">
<span>上传结束 tex_png 文件</span><span> : </span> <span>上传结束 tex_png 文件</span><span> : </span>
<nz-upload nzAccept=".png" [nzAction]="uploadUrl" [nzData]="uploadData" [nzShowUploadList]="false" <nz-upload nzAccept=".png" [nzAction]="uploadUrl" [nzData]="uploadData" [nzShowUploadList]="false"
(nzChange)="handleChange($event, item,'tex_png1')"> (nzChange)="handleChange($event, item,'tex_png1')">
<button nz-button><i nz-icon nzType="upload"></i>Upload</button> <button nz-button><i nz-icon nzType="upload"></i>Upload</button>
</nz-upload> </nz-upload>
<span style="margin-left: 10px;">{{ item["tex_png_name1] }}</span> <span style="margin-left: 10px;">{{ item["tex_png1_name"] }}</span>
</div> </div>
<div *ngFor="let q of questionArr; let i = index;" <div *ngFor="let q of questionArr; let i = index;"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
{ {
"name": "publish", "name": "ng-template-generator",
"version": "1.0.0", "version": "0.0.1",
"description": "",
"main": "build.js",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1", "start": "ng serve",
"publish": "node ./bin/build.js", "build": "ng build --build--optimizer --aot --base-href /JGT/v3/",
"start": "node ./bin/app.js" "publish": "node ./bin/publish.js",
"ng": "ng",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e"
}, },
"author": "", "private": true,
"license": "ISC",
"dependencies": { "dependencies": {
"base-64": "^1.0.0", "@angular/animations": "~9.0.2",
"compressing": "^1.5.1", "@angular/common": "~9.0.2",
"js-base64": "^3.7.2", "@angular/compiler": "~9.0.2",
"uuid": "^8.3.2", "@angular/core": "~9.0.2",
"child_process": "^1.0.2", "@angular/forms": "~9.0.2",
"express": "^4.17.1" "@angular/platform-browser": "~9.0.2",
"@angular/platform-browser-dynamic": "~9.0.2",
"@angular/router": "~9.0.2",
"@fortawesome/angular-fontawesome": "^0.6.0",
"@fortawesome/fontawesome-svg-core": "^1.2.27",
"@fortawesome/free-regular-svg-icons": "^5.12.1",
"@fortawesome/free-solid-svg-icons": "^5.12.1",
"@tweenjs/tween.js": "~18.5.0",
"ali-oss": "^6.5.1",
"compressing": "^1.5.0",
"ng-zorro-antd": "^8.5.2",
"rxjs": "~6.5.4",
"spark-md5": "^3.0.0",
"tslib": "^1.10.0",
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.900.3",
"@angular/cli": "~9.0.3",
"@angular/compiler-cli": "~9.0.2",
"@angular/language-service": "~9.0.2",
"@types/jasmine": "~3.5.0",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.1",
"codelyzer": "^5.1.2",
"jasmine-core": "~3.5.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~4.3.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~2.1.0",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.2",
"protractor": "~5.4.3",
"ts-node": "~8.3.0",
"tslint": "~5.18.0",
"typescript": "~3.7.5"
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment