From 0fad37c72f5ff83434e922a455d90f51550ceaba Mon Sep 17 00:00:00 2001
From: "Eric.Lee" <liwei7016@vip.qq.com>
Date: Fri, 12 Jun 2020 12:20:48 +0800
Subject: [PATCH] dev commit

---
 src/app/play/play.component.ts                | 110 ++++++++++++++++--
 src/app/play/resources.js                     |   3 +
 src/assets/play/bg_card_down.png              | Bin 0 -> 2017 bytes
 src/assets/play/border_left.png               | Bin 0 -> 1822 bytes
 src/assets/play/border_right.png              | Bin 0 -> 1822 bytes
 .../play/default/formData/defaultData.js      |   9 +-
 .../{icon_laba (4).png => icon_laba (2).png}  | Bin
 .../{icon_laba (5).png => icon_laba (3).png}  | Bin
 8 files changed, 112 insertions(+), 10 deletions(-)
 create mode 100644 src/assets/play/bg_card_down.png
 create mode 100644 src/assets/play/border_left.png
 create mode 100644 src/assets/play/border_right.png
 rename src/assets/play/frame/{icon_laba (4).png => icon_laba (2).png} (100%)
 rename src/assets/play/frame/{icon_laba (5).png => icon_laba (3).png} (100%)

diff --git a/src/app/play/play.component.ts b/src/app/play/play.component.ts
index ea102f1..2e5af5b 100644
--- a/src/app/play/play.component.ts
+++ b/src/app/play/play.component.ts
@@ -40,10 +40,10 @@ import TWEEN from "@tweenjs/tween.js";
 import defauleFormData from '../../assets/play/default/formData/defaultData.js'
 
 const zIndexMap = {
-  startButton: 900,
-  startButtonBubbing: 850,
-
-  audioSlider: 900
+  longAudioPlay: 110,
+  cardUp: 110,
+  lianzi: 100,
+  window: 50
 }
 
 @Component({
@@ -182,6 +182,7 @@ export class PlayComponent implements OnInit, OnDestroy {
     this.initXuanZhuanTai()
     this.initTable()
     this.initShowWindow()
+    this.initCard_up()
   }
 
   cleanGameVar(){
@@ -505,7 +506,6 @@ export class PlayComponent implements OnInit, OnDestroy {
       longAudio.refreshAudioProgress = ()=>{
         slider.enableSlider = false;
         let dis = slider.ref.x + (527/2)
-        console.log(dis)
         let per = dis / 527
         longAudio.audio.currentTime = longAudio.audio.duration * per
       }
@@ -556,7 +556,7 @@ export class PlayComponent implements OnInit, OnDestroy {
         }
         this.g_enableMapDown = true;
       })
-      this.render(longAudio.ref, 110)
+      this.render(longAudio.ref, zIndexMap.longAudioPlay)
     }
     if(enableShortAudio){
       // 音乐内容
@@ -571,7 +571,7 @@ export class PlayComponent implements OnInit, OnDestroy {
           y: -80
         }
       })
-      shortAudio.play = this.g_cartoon.createAnimation("icon_laba", 3, 200)
+      shortAudio.play = this.g_cartoon.createAnimation("icon_laba", 3, 500)
       shortAudio.play.x = -50;
       shortAudio.play.y = -7;
       shortAudio.ref.addChild(shortAudio.play)
@@ -600,13 +600,105 @@ export class PlayComponent implements OnInit, OnDestroy {
       element.ref.addChild(shortAudio.ref)
     }
 
-    this.render(lianzi.ref, 100)
-    this.render(element.ref, 50)
+    this.render(lianzi.ref, zIndexMap.lianzi)
+    this.render(element.ref, zIndexMap.window)
+    
+  }
+
+  initCard_up(){
+    
+
+
+    let xuanzhuanTai = this.g_cartoon.getCartoonElement("XuanZhuanTai")
+    let cardAll = []
+    this.g_formData.textUp.forEach(item => {
+      let labelText = this.g_cartoon.createLabel(item.text, "BRLNSR_1", "#634846", 50)
+      labelText.setScaleXY(this.g_mapScale)
+      labelText.refreshSize();
+      cardAll.push(labelText)
+    });
+
+    let spaceing = 10 * this.g_mapScale;
+    let totalWidth = 0
+    let totalNum = cardAll.length
+    cardAll.forEach((element, index) => {
+      console.log("Label width:" + element.width)
+      if(index==0 || index==(totalNum-1)){
+        totalWidth += (element.width/2) + spaceing
+      }else{
+        totalWidth += (element.width) + spaceing
+      }
+    });
+    let baseFontsize = 50
+
+    let fontSize = 50;
+    let adjustSX  = 1
+    if(totalWidth > 1214){
+      // adjustSX = (1200 / totalWidth)
+      fontSize = baseFontsize * (1214 / (totalWidth * 1.65))
+    }
+    console.log(totalWidth, fontSize)
+    cardAll.forEach((card, index)=>{
+      card.fontSize = fontSize
+      card.refreshSize()
+    })
+
+    let lastWidth = 0
+    let cardX =  xuanzhuanTai.ref.x - (xuanzhuanTai.ref.width*this.g_mapScale)/2 + 100 * this.g_mapScale
+    cardAll.forEach((card, index)=>{
+      let pos = {x:0, y:0}
+      if(index!=0){
+        pos = {
+          x: cardX + ((card.width + 20) * this.g_mapScale)/2, y: xuanzhuanTai.ref.y + 10 * this.g_mapScale
+        }
+        cardX = cardX + (card.width + 20) * this.g_mapScale + 20 * this.g_mapScale
+      }else{
+        pos = {
+          x: cardX, y: xuanzhuanTai.ref.y + 10 * this.g_mapScale
+        }
+        cardX = cardX + ((card.width + 20) * this.g_mapScale)/2 + 20 * this.g_mapScale
+      }
+
+      this.createCardUp(index, card, pos)
+    })
     
   }
 
+  createCardUp(index, label, pos){
+    pos.y = pos.y + 20*this.g_mapScale
+    label.x = pos.x
+    label.y = pos.y
+    let card = this.g_cartoon.createCartoonElementImageFunc(`card-up-${index}`, "bg_kuang1", (w, h)=>{
+      return {
+        sx: (label.width + 20)*this.g_mapScale / w,
+        sy: 84*this.g_mapScale / h
+      }
+    }, (w, h)=>{
+      return {
+        x: pos.x,
+        y: pos.y
+      }
+    })
+
+    let panzi = this.g_cartoon.createImage("pan_zi", (w, h)=>{
+      return {
+        sx: 98*this.g_mapScale / w,
+        sy: 70*this.g_mapScale / h
+      }
+    }, (w, h)=>{
+      return {
+        x: pos.x,
+        y: pos.y + (84*this.g_mapScale)/2
+      }
+    })
 
+    card.text = label;
+    card.panzi = panzi;
 
+    this.render(panzi, zIndexMap.cardUp)
+    this.render(card.ref, zIndexMap.cardUp)
+    this.render(label, zIndexMap.cardUp)
+  }
 
 
 
diff --git a/src/app/play/resources.js b/src/app/play/resources.js
index 33115cf..ab0a575 100644
--- a/src/app/play/resources.js
+++ b/src/app/play/resources.js
@@ -63,6 +63,9 @@ const localImages = {
   'bg_main_window': 'assets/play/bg_main_window.png',
   'default_Image': 'assets/play/Default_Image.png',
   'audio_play_click': 'assets/play/audio_play_click.png',
+  'bg_card_down': 'assets/play/bg_card_down.png',
+  'border_left': 'assets/play/border_left.png',
+  'border_right': 'assets/play/border_right.png',
 
   'bg_star (1)': 'assets/play/frame/bg_star (1).png',
   'bg_star (10)': 'assets/play/frame/bg_star (10).png',
diff --git a/src/assets/play/bg_card_down.png b/src/assets/play/bg_card_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9a85501d832708cbbf69da8c34eda27204577a2
GIT binary patch
literal 2017
zcmd5-Ux?g99L^oJ)GMV(eULs#Ob@YWHj}@bgyzcLX4?yx^SE2+N<o~=Om@R<GBL^B
z?p_h34?;oua0)^xDAH$r6%>5%!AGGW`k?qA;!`QU6a_&io9y<K_PiItg=}Uf-+aGs
ze!p*KZfvYyKDBgqiQ~9a-kQ6~-mkG|cw({qU)=wIy`D_hUd=h~<eBnW;BMW1hU1RE
z8FhO_&wtrQG;Tml1JW4BDMNGIg^S}9qHR*}0qIAHBi#S&3xSWYBV5sa;HPaeh}QNp
zvbDF~MSI)G!otNB{=(R11TiTfKaPh<ZjT*d%4@TBIV=hM6jE$ELaPkO_xugMO*6vl
z4MRk-X7Wv|AsZS{jhA=@$d&|5NmfN5+rY5(CSU&q7A?b}z3E=6W3iqi42mMPC22Go
zHAZTKW_?MvEXJWoiXt+Em`{=dj>RNDH)C)~j<P5%BAW0eBMj(H;RsA=wS+jG(<XVH
zCYCU13{y#NfO1JQpzj|JjpI2wFFLy{O0D;i#Cdm;5^0m<bSFckvrCfV+$>l+pasnb
z^fB7zpZ}&1qj|t|CmT-FgONmrBxc+>!^%^Asol;9ENIrHbT}*2#w;SQFdYBFl_<e<
zl%FpZ)f0#d3*rb0P=E*wQC7OZvVmr6`isD{0jQup^8tnhJQ|qdD4ZMx>if2r<ONI+
z@mxn>q8d?zZBsP>Kmin+O+^!tsX-B9*%AW{H_bp-G}Sbwy4ZY|qMb4m<^0OFm?Fk8
z&!*jk09aO27j+GrVyI|HG=VCM7=;1GA<{uWW^Auy5!*R%c#ySJg&CvXG&RCpE*hGF
z#30asXd=yIBC&}BJwUpO1^!{&HXYK;r<i3|Jvi>Q+Z!1Tqapi{Z(d&Iy-wSZEyEC%
zhAi+H*&)qh$cz@nuur5k>6f-=GT3t0qMX%uQg5U!@<!bnM*P&BHbmv7a0FDkfiOYU
zaP){YA8kR^{Lz3g(nDNQ!EzcFBbbp^pOxfaT_`<Hd=7UHmwq&d{D;!(w4wn_`h=aZ
zl29&2D$k;-DAGUc_0SkIbG4Z5%WCFz8dhO{o{*K9>&%X!t-8Q8-42lDPOBxWirZ<*
zrlK}i%}Z7la~RE{S0vKm(WW{NoT0PH>|idN^BaM6=64E7*fKMAV>nO$@+`+KEO~CL
zJHCDIuKd(ui#yi(@aD1epZ<Pg;k&)lgXbpdGJWgD{p-mSSGTVH@Z%>Z|NK5Y-Fsj2
zZY}#~zrMF}?aPlof8Kldj(2xC+MkZ@|Bt&r{q{#ld+&W)Y1M9iHG1%NXX4kA@0|Jd
Xo8v!6?<DM=<~Xmj?tZ-b`t`p6_b!Zh

literal 0
HcmV?d00001

diff --git a/src/assets/play/border_left.png b/src/assets/play/border_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..65cef6ef84954e5f0d28bb08d7c7db66bd757ae1
GIT binary patch
literal 1822
zcmcIl&yU+g6gC_xXthF!3o0CpD<M#EJmX)nt)^8HXE#B3S?xyZazHSd87J1-9%Flx
z>`F)oaoH0f#0B-nffGH^3n2AB;4j!q1spgbAvhxOoH*$M?XnjVB_5Bz`QG>5`#f{9
zv%R%(`RZj!k~Ri?e;2ORIDYC$_&@#go3G*Wbk={XkfbZmRlg^sFYY`qNtfP_hWq7y
z@P<c4(jZKXcw?SqfR>~ix8@n42fUO=d>o}M<=5}-D{{nI%55t^LDuDysDGUEz2og6
zJwBi=Q*PaqZ_GU)NO(!)c@n3EH*YBmUJu6Aw5G@lNO{mw+EqY#KiHAGBImNzuvLmp
zM{c?eY@5iiUz2r&T@5)JHdKT?WP4Uqu0IMy%US5{`kQquxN9ksvdlb9o6Tm8nb8pW
zSi`Oh9J;3KDj?M2C@slcO^a(Q2A>x+kFqinsa!FVkvJ?{3MgHskYsDxw5ZDj1=Hpv
z({KY-DXoA(a6U9i*65<_O(9CH_mRZK@F?TjE-%DkPI+(2)AHIXST+%*C??`D+SZT%
zrjXHf!0a%O7v*78<1tTwy8tX+=*zrr&Pgfqp%C$^Q9G-MvJN=;mD^Fu#H@I=QdBSC
zJ}G%i(UFc+WUE*oBG*HfXW;9|@eo=<1MmSOCAk<_uqZsb2s8-1L0Xg~rF`JG6cE*j
zBIaQoH4QT)Dn&X|nPHkL2~nsrJq(#K(ydXg3)cIB9#)m8)-P?#1O<+DH9dWVN66q*
zwQbu{nQ2nhu^`ov=@P;i#kxfnSpwUec?53`iO;fDsu(bmri%z7po&vh9a$z*i4G1m
znuM5^X}P)y)p{7WD`Jrcf<bkSv-5*)cPAHN6vKmJcdH{0dR-g4wyo+7tjLUdp~w>g
zMvD?M=317HE8Bw%5ZI3j=<!kgBJJ__>QNlY3wL^iRxd?Mp_LmrQ|jsH5oNwuLQC4&
zgahe0E?L3~5tcKO^Y$28@}Dl$9w)va)AOZY%pw1y^t!BcLeepZ9adASWVC88S~f-d
zXTKgAV`Z*3*uLs!QJ0}Z#_NLIT)EEa*=EN_j^p<b#=UkM8@k_XVn;Wc9cR;B#*Cv?
z^d*UQezb+oGkfT2F>K7$aD5`c&H7B?DWsXhiE-LJeE_G;*1&HM`zQ3yXD|Nn!3*fY
zr(fPPuUviS`X`^K(~n>O_xG92=y&_Kdw<;jC2YR*)!RRQ>+DSTUfz(tfA-SPAKm@w
Qq&mR{y>0()=iLwg0)FN|M*si-

literal 0
HcmV?d00001

diff --git a/src/assets/play/border_right.png b/src/assets/play/border_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0b1fb46aea6af93194e65074da643c92539622b
GIT binary patch
literal 1822
zcmcIl&yU+g7&RO!TGSI4M0>E@ORF;RjDN&G)U-<CbQ6S^)i$Dw1X3q6<HTCq<J#U$
zb`cWdRyd*FP!C8PIKicGp#qNF_yZ6U;>ZPVNFX6Pli2A3?RGCDN<1FFdEfiK?|J6V
z*5=09GcTP{6y@w_7;KBH94F5`EB=4{>x<9C<#axLqg0gVUy#3Nl#lMcs3@o2iN`zD
zPWY-%c-q30PgrY_<^ruKSFSB`Om<nNPS`ZgI@)g!zSY#2cC?#z2*bS3X7TW_U^fmo
z$K-IAcvQP~RlTzC1wqOxtS-_dEB!@BTk`s1ET?r%T|%nej@Fd{)tzul?el`EcB>5t
zvRu{iTBvP7v;DGaK;-Gr)sYDx@?qPz9ku>wB3eNse>=Ed#}aoPZB|veuj}*qyfrsl
zyqN09^8|;X8wL;vP#$CzUVyB;&@cq7Bt@K8G0#-Vh$non>S#jgDupy((`IE|CQ&eb
zfpZ<TpiHR&hT-whG+m?1YOpV&)OsIFT#gTNrf;*7?-hg%_E}b4XoBT4Uh#6qpP+61
z_#X->SqIGbiey<HN_3X6RB)F9i<bIwzh5w1@nXz*(llzTiKrR^r(V1nXOz#&OHxt2
zfCac>9nF9S1h5T|F@~NGZ6Bh`(Dfl)K||pKiYt6FFsE^Ja1v-3`lGC@a7NfD=x9Pz
zD~_p;3~WVS<NzBp3s7WDz{JKLz!5dEXF}WYqNOgeKHy|eRzj{{*_Lu5IM&tlX@sfe
zq6m<Q8v%=09&jDo1lVIFa)?O{(`ndVD`N5H;N&Q)R7IsKZ(=Y*YJt=R4zU<;iOT>r
zJ>(Ia86FipkK*=u!i$hoQC;)s{HWjGDtHtp;z7B+(Njl*ej9o1HZWR9Qz`KyUZhwU
zEl%;2>3KGlwihx)y2H2>JwB*kq#NvZJxXGA=}sRL`BHQ=BHh5KR!_%|EAxpGTG7sD
zOpqSqk`=7vQ8mW}>rO>Wp6WvVN#aYq{}kyba>)NEy)G-6;cUvp4y$W28C~v0tETAx
z?$;w@H0J6G+skg2bs2hix-Q7o#&zzXZS?}^y1@V<H0XAbX#@iYxx%$Q_qw-=nZ!->
z6^VX)w584?duX#*Y|L`FJ`u#t`b=S&NV5<p#+zT=Iwww>jZx4Y5ATqBch7(S?m77L
zho5|Deek+^+4%d1KYyz3zdb(u?-#yu|6}|8Ut*{G>Fu}9Uwm-s?kVNhuTQh@{`mbH
Pd4i1wo5AP3Tkkyt%)&vX

literal 0
HcmV?d00001

diff --git a/src/assets/play/default/formData/defaultData.js b/src/assets/play/default/formData/defaultData.js
index 0ec5eda..d022fdd 100644
--- a/src/assets/play/default/formData/defaultData.js
+++ b/src/assets/play/default/formData/defaultData.js
@@ -8,8 +8,15 @@ export default {
     shortAudio_url: "default_short_audio",
     longAudio_url: "default_long_audio"
   },
+  // textUp:[
+  //   {text:"make friends", lineTo:""},{text:"lound", lineTo:""},{text:"we eat ice cream", lineTo:""},{text:"very happy", lineTo:""},
+  //   {text:"make friends", lineTo:""},{text:"lound", lineTo:""},{text:"we eat ice cream", lineTo:""},{text:"very happy", lineTo:""},
+  //   {text:"make friends", lineTo:""},{text:"lound", lineTo:""},{text:"we eat ice cream", lineTo:""},{text:"very happy", lineTo:""}
+  // ],
   textUp:[
-    {text:"make friends", lineTo:""},{text:"lound", lineTo:""},{text:"we eat ice cream", lineTo:""},{text:"very happy", lineTo:""}
+    {text:"make friends", lineTo:""},{text:"lound", lineTo:""},{text:"we eat ice cream", lineTo:""},{text:"very happy", lineTo:""},
+    {text:"make friends", lineTo:""},{text:"lound", lineTo:""},{text:"we eat ice cream", lineTo:""},{text:"very happy", lineTo:""},
+    {text:"make friends", lineTo:""}
   ],
   textDown:[
     {text:"it's so much fun", lineTo:""},{text:"lound", lineTo:""},{text:"very happy", lineTo:""},{text:"sun", lineTo:""},{text:"at the park", lineTo:""}
diff --git a/src/assets/play/frame/icon_laba (4).png b/src/assets/play/frame/icon_laba (2).png
similarity index 100%
rename from src/assets/play/frame/icon_laba (4).png
rename to src/assets/play/frame/icon_laba (2).png
diff --git a/src/assets/play/frame/icon_laba (5).png b/src/assets/play/frame/icon_laba (3).png
similarity index 100%
rename from src/assets/play/frame/icon_laba (5).png
rename to src/assets/play/frame/icon_laba (3).png
-- 
2.21.0