From 0f3c3819fd882c81c480b7be5894751b62c73dc6 Mon Sep 17 00:00:00 2001 From: liuweilhy Date: Mon, 12 Nov 2018 00:14:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Linux=E4=B8=8Bg++=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E5=87=BA=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?= =?UTF-8?q?=20=E4=BF=AE=E6=AD=A3Linux=E4=B8=8B=E9=83=A8=E5=88=86=E9=9F=B3?= =?UTF-8?q?=E6=95=88=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- History.txt | 2 +- NineChess/Resources/sound/choose.wav | Bin 862 -> 6660 bytes NineChess/Resources/sound/drog.wav | Bin 1410 -> 6650 bytes NineChess/Resources/sound/move.wav | Bin 1962 -> 6652 bytes NineChess/ninechess.pro | 45 ++++++++++--------- NineChess/ninechess.pro.user | 62 ++++++++++++++++++--------- NineChess/src/gamecontroller.cpp | 2 +- NineChess/src/ninechess.h | 1 + 8 files changed, 68 insertions(+), 44 deletions(-) diff --git a/History.txt b/History.txt index 9296c117..0bb116cf 100644 --- a/History.txt +++ b/History.txt @@ -2,7 +2,7 @@ ## 更新历史: ### 2018/11/8 v1.2 1. 添加动画功能 - 2. 程序优化及bug修复 + 2. 程序优化及bug修复 ### 2018/9/14 v1.1 1. 添加棋谱及历史纪录浏览功能。 diff --git a/NineChess/Resources/sound/choose.wav b/NineChess/Resources/sound/choose.wav index 59f1d0064adb1e9b696e5d98fc5aba840a22d544..a579c8246575c15b08848d69cf1f90444e6f4638 100644 GIT binary patch literal 6660 zcmZvgPme4|5yY#ydwTXg8!$p(aWdk{r{I7ku0EKvCB%)JKP=zC7m#JiZ+B+8{t&;4 zO{#arShL+dU6~aT8JXSB-~9FKugmXK`rDts{mVc8`TZZhNGWCg_v=5U^v7>gTGAKk z@85m@-M_RZrQX-{=pWLj{!z!QyH$VrEa~Xi{@gzHM_YR8t*xo;={NbS_SN#+oXdYM zKhz)6zn7odr+iOGew5qgcKo#cSbtofOJA?;rJwuH={Y~A z=l+uFl1tw6yx%ML;?YGOX*cLCuG)PorCjPmn&({8B`a6&Rdlp&>$QnN zNhMWrsKVb?-Q4n#w-p^8{UUmK%a?x1yKZc45iFsVQb&1Qj-za?sjgx^T%g*Jqpjj_ zP4~XRtghm)FUPWOX{*a+DM?90e}TKcOM0}u*2i-1Fa0IorTUR;R_3*Xv*@UE{UjyV zj)vk~TW(7&$6jt_hr8BDP<<8El~*=gL~N01O5NM7Ud4LRlCGVl{J`3KPuud6KVLrO zr(EP@X{*(bx+$Lu?W`U5gL%zI+NI+~KHvM%F5@fwI-=;N$h{pzQ(U2dA(~~~-TPf% zq3Ei&jzsV33`MKTf+9<}4q~8-(yvJ_SJXAV^ba~3RYz|jqob4==Zvo|6sKyu<|p^2 zmF%Qy4@T@vB$X1zp#{7u#&-SWBdJf_h@+ne>j(AJ$Fd9L}#Z9w9)lBl89O{)6Da$!{x|g-q|9zL5np9RcCV~D8_{l*?re@rRqDDJJw6|On?HciIMn3L{vyPS1h9J|&&+EaQ_2JJiW2QO)@ zYjv3Oj-0U6SAl3FLdv`k-77WLwdyvsz;~mkv_hJrf@0Jsnoyx3JJ4ZNRV2qpxpmD% zQe(;&ccFWz27IUmE7_mjlsVyYcC_}IJ7ZF)hqU8;V54S6Of7^!*RQ#>JIJWA&xQ+m zmMAuU_g=V&wRVm=4J@xH!~q_<>m8$~p8Mx|R(%-wLBJEs9mjgE$up?w59i@|Tpd}# z3mZ+h;i93L?z*pxgc0PBk-Kfl1!QRCB$b@mkZA97gtT11D4ZqnX05W4cD-?WowL&? zbSF+ji^vbEw>t;7@eVND;0S9#7kZ|G!6-sUcLVvNON||5Q8RZJPRFaBY%peu;Zd@> zhUZ?xqu$p~Uh>-e?)bnF74f{YxBZ*d2J!i0?l{P-J%QcHc9v&==MesM{fyNZSPeh- ziM!k#GClkp6lj`cg>y((|Mthqt1@< zGsm+!9Pge$=g^FEzmIuZ`;N1rhbzrQi)W`<+KAVb&s`HW1h@4FWWmn$a}7aCO`Pl8Y0<}X7dza29NEcvUWuPPA6-{F!)o(h;i(gS zZiZxZ#d)uAM(Q8$E$(bP#~G+bRCMNoXMFI9yT{Y-X($$%;2s{TvU_-g?(>IucC_DE z?{D~*RcEE6_t@d>8tZ43921fJ=9)(rMunV%J>Kpg>!;%9HRowz*7GS4QwMDRfd2g% z*KaYLuQ;CyJN7-o>AC1TWA$7K#k^`>`EKX}uIY?e_5ZQLIePu9y`Q#zUz~mHDx#th z(8b30-ubiQ=gJ3Xt1{~x7<~*)td%S1bK+-3<33UFowFZ=cyiX+3Qbk!+55f2RrKNX zi=WF=;fV4t?my2n&$#z~fpN^daHoF@)gyQ4#W7gK1U|pP8{KsNRP&rEoMFD!2o2vV zJ*yR2qWIIkqin{IipecVUi$(Ssm;M=qF9C~{PC88P}!DE$-Ir7i?#15=t x&ACs{ip4y1EzSt6FnW5u-&f-*YD50{0kv5>ZtiUb^LWRL{|`0w58Sc;e*sK8ip~H4 literal 862 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 E4+EE+IRF3v literal 1410 zcmZ`&O>Z1U5Zy>b;tE%!2#$zfkpn@wL=i|vkqKgDd!0C5ud#P$rl-5BKWApY#_NqG zCs+t64nhdw0}|qv|B*v3Iq*Mt)q`__+8y`UO0<`{O>Z7H0m(`0l^VIh-0I(l9JU*9ma$*!(-| zw%Pp0eKGg`shGvXA6`7DmXG|NINMsQ(Ns^)M^ctmT`WbMDyl-HrmD0lV-U_6zd5Av z_uEge_KL^tM}IbZPo5O7j@@i`es5a*{?%{P%;R^Y-OIW?Sy4mts2A2#X8nmbIwxCK z!IWbXetO!_=vcU_3N}}|1aDMQ;gRE9_{zC)o(pXZDJ9D+JDLblY7_PAk&ZsXUuxd65efy;dl_l+u_|Nu_PjWl_lQJFzEmZX(1f#VJ0S(krkw*`t(7vvsvj)S1!NK3)6@J?K;BlOW zhbPOr;7AHdI3uYPg}SM{OCCI~gn$?@nT>6%XRPPuyj0Qsh=Bme*a diff --git a/NineChess/Resources/sound/move.wav b/NineChess/Resources/sound/move.wav index aaeeb5f41835dd3ad43f791499c21c032e95cc74..86f03480711bc93a955df5ecabe5d9e56e821941 100644 GIT binary patch literal 6652 zcmZ`-$&MUF6wIZ176V=pG6E#Tl@mXJ!~rBYasaND5I1iAG57#JfCJ(KkT|f|mhmRr zGt*s_nMAzE*I8|b9`$r}X1*oj#d}pVUw;1CXD{9k;p z_$q`Hu7_{$+`aQF&a{@p(xy-vPt=yMg5$U@SY5E&@QPf*Rl*5f^8~MBt2MV$6FyUG zH8idqUPY`&oY}OwPWY5n!d3467{T5lVzb7aYL1(5Qm>_V!$<9l^iBCVb{yZRo3v{W;-Bqt*v8yW zVhW|sIhEJa&G33V4}Zts>jNOUn%-&eg*U@%;Ur7|eHQMu-_jrTS&H>IU8z^nran)9 z)qAPbo9UhMR=!?Oz{z=inE$Hx+|>wXwJi&ma@Qq0kd+;YmO1Y+YP^hAXNUku0ybe2@O10IkxbHyHxk!ZdFFa&s5(k9Jef@^gS z)~QTH0iufY5it_l3EP$f_G!w#Kz8t`-fPALdl22&Na*fb22%ib#f)SE(h`L+5$j?NB>_QO)sDPsV2_dsVPTlignYJ2WC}-o{12ls8Mtd=O`SKSF1h48waK~bsAA( zA}~vQ5)k@>48jfX5!l=3&cxVB^av|7xb7MdyLFBA67h){X^kA<9HJQl_(ZXKmq%&< zdx#HPsuSJ61f69T;)7CR$6{WA73(l=;Kd5TJ3WKR3McSFB=Ez`*D=u@R$r@#Y%~Xm z9o=j*p`)|XF`tf@+@NRovjLHj*Qbt$oQneH_=m(oVd(StXuc+8yUqJXAYd#QRvaVWPy2^(hVIeq^hZR7y_t!6^IyKOhu+dDUF(u zA7Cz=AsM?%JHpNTxa~BtVFj#MXLREZ^N1{1bo0t@%l`QeJ~@w(Kvy<#p_!E}Cp4pT zOv!_4t?9Qxbf2^ZsL2XzWHsenr5&xIzA1om^)vah5z1E!bmUSY>F(yb;^F zWX}M0xn~&>7gcBsv&Wg?$WsVdZ6LF3`ZXsi@5RtMwbvt>bw>@)rZ}KuouDIK;f!%< zyO=(97bPY}Jva-`R);=4c*mnh@%{&>xrqT<&Pk6w>QLRfq|y0q31^_Q~J+ zS_syWl^<7>t1DLd`>HIYaG~XF9jiPCeoX-zdnVCY?}Ar9`%`eQDtGDCPkGO*`DQFK z)t~2ao>=t~gKO->yngq}VwHCC)3ssWwdV0IueNx+4410U>{X3XQO{|3_ABl1_Zls$ zA&g>Co{5ri#j^em;hI(tqiKEpTii14xZ=K8IQ$QZSDpJF(W|03%viRL#B=01_v+jV z%^~Y<=clD7X_fc8S38LOV1`3m{xt7QD2nf?#_AUCtUJ(=Yh7FnFZv(Rx^|x1Vefd3 zUI*`cGQyV_x-2%=$p67KHH9)4XI4y$&vDIY^sRbu*K32P&d!Ux@SI-sNPK+B`}poP z(bJcE_85MC{hg5y->+J&_t$%V&6vzpe?^lw#Ua1K;P*r3IbyA+g0BzD!9Ov2zl$HL zW?YRp`g_T_Wb7mSi%8l!tna#CsLBn_@lHs!97fhR^{uA-I!7_-Gi6j)wGmdoKC~lZ z?r3%Bm6aP^;s4)c@9@0OVdd!_=woCe{$Gu)Sp2PiQAF3#*yYt)Rq7m9qd(! z8X2vns>Q0X_9hEOmr}eo%7>NF|6xXVF)vzp{_Cs5xbmSG&XZ0!ABstj!n%GwaAdr1 ztgU(0;~e_dx50~FDT>?p=kTJc3kNy&$m#{2TTlMOD2`sM)F#!Xe4V+0Qjz|z#zf|w zu1{7&Z)NMXmxBF_D`(V*-E4ms*rb*ZWu?r-KcfjN=blf1F=M5i|Hk6FzgT18yIjGl HYYP7Y+5IL@ literal 1962 zcmah|OKuZE5OpLZ*un|evw{mC7DR#t3l^|KQIrpmkMd#S@pz`EdwOOZPd>!?NPvP^ za05=j0k{Ci;k~ME+d)E%D&R>goD+a{peh*IU5n?t`9u z7kYOPSzlgBZeiU8a&j^>56-FZ{^lZ%tV`qG9yyZ&}{JZ@b7?VFYTYJ7CuCTs7^ z<@KjY=hCgU_aFS()%kH-rb#~=>~Fr`bEg-RqplmdVKyuZW2`l$^X>Sk8+p^;+1|_C zs2jJwIN09UO53x`%gMM*`3b_gm zp|*IqC}t{OHz-9Cab)rf6{1jsIfQ8d1S3<7w+*@)?_NYf7j1}xk4b7{5W*lSBYa?# zz)C=}kYt(XjM#>l;L)h)u&%Tx4e=OM;mL&rB{m_2AYyoGA~Y*I<;Qu>p9^;;Bdjn{ z9k-N*G@k%Qzy*WmxMW8?y4dSr(H#3`IflugLpIvrj?kI7TwN$dAfeEZI?9}hlLo^} z;Rs?2VW1#VS{0-+3&Gd~OkFl4FDZt!Jwa$l`Xg=L;i=|~TH!T@frd1BdU+x+r3jy_ zn~~`bPRvmWa5Coc5vnQ8g{HW~Ft1i8qYj$HR4Op1 z&p`Uty!0y_NDG97xl9EJk#1C*k`WT*XL=$k*(d|H@@D - + EnvironmentId - {fba36f69-c7a3-4c3f-91d4-7c71ad79549c} + {9a8c5f9d-1814-40d9-ab01-983c45f229c5} ProjectExplorer.Project.ActiveTarget @@ -54,19 +54,22 @@ ProjectExplorer.Project.PluginSettings - + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.11.0 MSVC2017 64bit - Desktop Qt 5.11.0 MSVC2017 64bit - qt.qt5.5110.win64_msvc2017_64_kit + Desktop Qt 5.12.0 GCC 64bit + Desktop Qt 5.12.0 GCC 64bit + qt.qt5.5120.gcc_64_kit 0 0 0 - E:/My program/QT/NineChess/build-ninechess-Desktop_Qt_5_11_0_MSVC2017_64bit-Debug + /media/sniper/Work/My program/QT/NineChess/build-ninechess-Desktop_Qt_5_12_0_GCC_64bit-Debug true @@ -84,7 +87,10 @@ Make Qt4ProjectManager.MakeStep - + + -w + -r + false @@ -100,7 +106,10 @@ Make Qt4ProjectManager.MakeStep - + + -w + -r + true clean @@ -120,7 +129,7 @@ true - E:/My program/QT/NineChess/build-ninechess-Desktop_Qt_5_11_0_MSVC2017_64bit-Release + /media/sniper/Work/My program/QT/NineChess/build-ninechess-Desktop_Qt_5_12_0_GCC_64bit-Release true @@ -131,14 +140,17 @@ false false - false + true true Make Qt4ProjectManager.MakeStep - + + -w + -r + false @@ -154,7 +166,10 @@ Make Qt4ProjectManager.MakeStep - + + -w + -r + true clean @@ -174,7 +189,7 @@ true - E:/My program/QT/NineChess/build-ninechess-Desktop_Qt_5_11_0_MSVC2017_64bit-Profile + /media/sniper/Work/My program/QT/NineChess/build-ninechess-Desktop_Qt_5_12_0_GCC_64bit-Profile true @@ -185,14 +200,17 @@ false true - false + true true Make Qt4ProjectManager.MakeStep - + + -w + -r + false @@ -208,7 +226,10 @@ Make Qt4ProjectManager.MakeStep - + + -w + -r + true clean @@ -236,7 +257,7 @@ ProjectExplorer.BuildSteps.Deploy 1 - 部署设置 + Deploy Configuration ProjectExplorer.DefaultDeployConfiguration @@ -286,13 +307,12 @@ ninechess - Qt4ProjectManager.Qt4RunConfiguration:E:/My program/QT/NineChess/NineChess/ninechess.pro + Qt4ProjectManager.Qt4RunConfiguration:/media/sniper/Work/My program/QT/NineChess/NineChess/ninechess.pro true ninechess.pro - false - E:/My program/QT/NineChess/build-ninechess-Desktop_Qt_5_11_0_MSVC2017_64bit-Debug + 3768 false true diff --git a/NineChess/src/gamecontroller.cpp b/NineChess/src/gamecontroller.cpp index 362b166f..f2a166b9 100644 --- a/NineChess/src/gamecontroller.cpp +++ b/NineChess/src/gamecontroller.cpp @@ -47,7 +47,7 @@ GameController::~GameController() // 清除棋子 qDeleteAll(pieceList); pieceList.clear(); - currentPiece = NULL; + currentPiece = nullptr; } const QMap GameController::getActions() diff --git a/NineChess/src/ninechess.h b/NineChess/src/ninechess.h index 932f4c15..713648db 100644 --- a/NineChess/src/ninechess.h +++ b/NineChess/src/ninechess.h @@ -9,6 +9,7 @@ #include #include +#include #include using std::string;