Commit 27d276db authored by 李维's avatar 李维

dev done

parent cbb980a3
...@@ -440,8 +440,8 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -440,8 +440,8 @@ export class PlayComponent implements OnInit, OnDestroy {
// 可移动卡片 // 可移动卡片
let cardContent = this.g_cartoon.createCartoonElementImageFunc(`card-content-${index}`, "card", (w,h)=>{ let cardContent = this.g_cartoon.createCartoonElementImageFunc(`card-content-${index}`, "card", (w,h)=>{
return { return {
sx: (180*this.g_mapScale)/w, sx: (184*this.g_mapScale)/w,
sy: (180*this.g_mapScale)/h sy: (185*this.g_mapScale)/h
} }
}, (w,h)=>{ }, (w,h)=>{
return { return {
...@@ -490,19 +490,22 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -490,19 +490,22 @@ export class PlayComponent implements OnInit, OnDestroy {
if(!isSaveCurrentPickupCardID){ if(!isSaveCurrentPickupCardID){
this.disableMoveAsstant() this.disableMoveAsstant()
this.g_enableMapUp = true; this.g_enableMapUp = true;
// this.g_cartoon.playAudio(data.audio_url)
} }
} }
this.subscribeMapDownEvent(`card-content-${index}`, ()=>{ this.subscribeMapDownEvent(`card-content-${index}`, ()=>{
if(this.m_endGame){ if(this.m_endGame){
if(cardContent.parentID.indexOf("hot") != -1){ if(cardContent.parentID.indexOf("pos") != -1){
this.g_cartoon.playAudio(data.audio_url); this.g_cartoon.playAudio(data.audio_url);
} }
this.g_enableMapDown = true; this.g_enableMapDown = true;
return return
} }
if( cardContent.parentID.indexOf("hot") != -1 ){ if( cardContent.parentID.indexOf("pos") != -1 ){
// if( this.m_renderArr.indexOf(cardContent.ref) == this.m_renderArr.length-1 ){
this.g_cartoon.playAudio(data.audio_url) this.g_cartoon.playAudio(data.audio_url)
// }
cardContent.clickTime = new Date().getTime() cardContent.clickTime = new Date().getTime()
}else{ }else{
cardContent.handleClick() cardContent.handleClick()
...@@ -541,7 +544,9 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -541,7 +544,9 @@ export class PlayComponent implements OnInit, OnDestroy {
if(cardContent.parentID){ if(cardContent.parentID){
if(cardContent.parentID.indexOf("pos_") == -1){ if(cardContent.parentID.indexOf("pos_") == -1){
this.g_cartoon.getCartoonElement(cardContent.parentID).setContent(cardContent) this.g_cartoon.getCartoonElement(cardContent.parentID).setContent(cardContent)
tweenChange(cardContent.ref, { scaleX: cardContent.ref.initScaleX, scaleY: cardContent.ref.initScaleY }, 0.1)
}else{ }else{
tweenChange(cardContent.ref, { scaleX: cardContent.ref.initScaleX*0.7, scaleY: cardContent.ref.initScaleY*0.7 }, 0.1)
tweenChange(cardContent.ref, {x:cardContent.parentID.split("_")[1], y:cardContent.parentID.split("_")[2]}, 0.1) tweenChange(cardContent.ref, {x:cardContent.parentID.split("_")[1], y:cardContent.parentID.split("_")[2]}, 0.1)
} }
} }
......
src/assets/play/box.png

144 KB | W: | H:

src/assets/play/box.png

134 KB | W: | H:

src/assets/play/box.png
src/assets/play/box.png
src/assets/play/box.png
src/assets/play/box.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/play/card.png

9.63 KB | W: | H:

src/assets/play/card.png

9.74 KB | W: | H:

src/assets/play/card.png
src/assets/play/card.png
src/assets/play/card.png
src/assets/play/card.png
  • 2-up
  • Swipe
  • Onion skin
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