From 038d8735fb8336a1ff8da8729ac8fe5750316213 Mon Sep 17 00:00:00 2001
From: ddg <1453062510@qq.com>
Date: Sun, 28 Sep 2025 15:59:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0=E4=BF=AE=E6=94=B9=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Art/Timeline/插管_TimeLine.playable    | 106 ++++++++++++++++++
 .../daoNiaoShu/ExcelData/Excel/BaseData.xlsx  | Bin 13994 -> 13808 bytes
 Assets/_Scenes/daoNiaoShu.unity               |   4 +-
 .../daoNiaoShu/FSMManager/FSMManager.cs       |  69 ++++++++----
 .../FSMManager/State/BingLiState.cs           |   2 +-
 .../FSMManager/State/ChaGuanState.cs          |   2 +-
 .../FSMManager/State/WuPinZhunBeiState.cs     |   4 +-
 .../daoNiaoShu/UI/ImgSelectQuestionPanel.cs   |  20 +++-
 .../Application/daoNiaoShu/UI/TipPanel.cs     |  52 +++++++--
 .../狗/Materials/pasted__M_shengzhixitong.mat |   2 +-
 msc/2aae4e51c4e2dd03beb0e4c8c8d7affe/kivw.dat | Bin 197 -> 197 bytes
 11 files changed, 218 insertions(+), 43 deletions(-)

diff --git a/Assets/Art/Timeline/插管_TimeLine.playable b/Assets/Art/Timeline/插管_TimeLine.playable
index 7af2d26..f493b24 100644
--- a/Assets/Art/Timeline/插管_TimeLine.playable
+++ b/Assets/Art/Timeline/插管_TimeLine.playable
@@ -618,12 +618,118 @@ MonoBehaviour:
   - {fileID: -4415988120714926337}
   - {fileID: -304499637217331559}
   - {fileID: 8387026910049780223}
+  - {fileID: 1817393580930511363}
   m_FixedDuration: 0
   m_EditorSettings:
     m_Framerate: 60
     m_ScenePreview: 1
   m_DurationMode: 0
   m_MarkerTrack: {fileID: 0}
+--- !u!114 &746876422758225837
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+  m_Name: ActivationPlayableAsset
+  m_EditorClassIdentifier: 
+--- !u!114 &1817393580930511363
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+  m_Name: Activation Track (2)
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 1
+    m_ClipIn: 0
+    m_Asset: {fileID: 746876422758225837}
+    m_Duration: 6.708333333333335
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 1817393580930511363}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: Active
+  m_Markers:
+    m_Objects: []
+  m_PostPlaybackState: 3
 --- !u!114 &3170496518164281449
 MonoBehaviour:
   m_ObjectHideFlags: 1
diff --git a/Assets/Resources/daoNiaoShu/ExcelData/Excel/BaseData.xlsx b/Assets/Resources/daoNiaoShu/ExcelData/Excel/BaseData.xlsx
index 5eda61170ca3577f361534fe5c850c7ad7a9c0a8..b5088904a8efff408bcde277977ba2bec81fd850 100644
GIT binary patch
delta 8814
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

delta 9063
zcmZ8{WlWtx6E*Jc?iY7=cZcHcP~5#dI24DALyNl>cekP!FQvFsoMOekzHdI?ACt-1
zvon*;CVMiOE2nCg#&l@--M=Py(%>9uN<d|p6K`}2zF+2hP@c_(tjzij<^8_Jw(K<<
zouBbHCFQiW^Yy$o<8#g69-*VRi_R>Y+lcC7j>dXkVFg}lMi{mP);oTMhTn3*@ia%B
znLXSjp5AaVhog78^p5liQ5k%E2Ik@MFiIlyr)1|n4a8&WXObRSa4{IWV+Nz27=d$w
zRg>Twwryl;0fVrkw4fwo3lmIPZ)s&Ns^7hJ!l8IX%$kM0!@Nb0<G%-)AM9l+67sA6
zj0>N6$BEdf%*RJOZ%+>X;8j~FHBCq<*nK#-RcUuLIlb3|(M(kujD){PWV?X3@z-f@
zuj#m*az9i<zS%LTt?m^deq)1ECzR@r2}_X1S{WB-aXZ;t3=E4y&MD>UOgwQ`)0Qt!
zNJ;j+kON3-0nLh&cU*g}PN&c5jZC)bNwM~l^9Ow|Xrltnk1%b}7=u(>)u^aYQ2Ja@
zP()DR0X`D&3LHPsrD0zBEu&ikpup^<wEeWEU-2wXD*I{{@Kbm0dGYtBck_3XH?H3g
z>@)X&dc<@pZu;J9dj7lzKmInq5U>9Gd{D=lN5PrT{_xsfE(DNZaCEodbo8QCdj-Hu
zspwL+qrVvRV{jaG{Sv>8Pl~Z5lLPN~bW7a94_EvpNIE?LZ2MW79UnqiH4>?+riR;~
z-#Of#Z{@zd2KRlw?A#2ItevEs8dWvmrBo4pPkJ^rHLcFFYph9<*~z6m2p06)6}=EG
z4mB8ed3}9-LBuMc?r?h^?t2;?*2Tz3+<AI@Bnr;wh}cjHv_u{$A8s=2G0#2CcFA*j
z-$}CHb`lE)I)XMM;<EpmnfCp9kZ9J((^^7=jd=+&4>75|?6rG7uM$n~E)R}2I(Z1u
zU%vj>E+%Qp$=??8CSvzWrJr}&!(^T-7Z94E(1E6MWUTv1;SDC6=IW$JETh+4!yf6j
zui#J6tXu(ct+U_Eo5B;m`@^f7F6<5!OT#QerrGH!;1{sl=S4`(m>~1%atGleDqOQ8
zqnU~GHLE6cYiFToW#Fy;kHJmXo6*D9sjTzoB14^+_p^e$_UE^rhLtz1Px}XNcjz=$
zC4)pte#_8A+gqC+$*(Jy<n0nqM=>3NqOo?(HsTZ-;~vvivCj)H(qVfcZsTCacFQz%
ztgsARV6cMD>bnKboV+vtSI|7~u1hfNydutE1x+qm+IP`7hCLhpoH5*UY)N5Jn7K}c
zE2htOums6=xAUwd$;D52>{&%VxKgGbG><y6RO@Qhp$#wEkLg)S6%q64YIdxadjX<|
zovt+DyW6t=j_%rUCZ*A-moKh)54qkUEew1Hwm;w`ra|M#;_@rxBr<Ox$1v~xhiUK!
z0Ob#k9H~CaX>C-aj<K;vbDUZ!rsLszZfQ}Y`C=0e69#ZamNbk~;JprsV8^Tuo0@+5
zW6@Z$`C>lE(WS*IQ&Mt*3z4ayer%SEM;M7pXJ;K5ihRJM;qD6cLUlkNPh+n=mIl-b
zQM#_8*lSOQ#*B!h&y1j^H4UK11g!H(p{Yl7HAh1`Lq#Phio16(mkgCN{vsXH5Wqmg
z*9ut?rar}{#{2*AQ!*J@P)INxnN(0Uk-eZTXD`0O<{`WuRhTv%`KiE3b1E<C{5@N1
zS&5|$2r|m~n*O&BXSTU8%x*!*iVje!`h}dkX`z@)AYjo%%9#x9H=#H6J7w8NF@#*(
zBqq2M!_Yj&84j+(QPG0o_m8@r+L&B}!Y})27fPU_W`UCeIV2fjMpR2hOfiIC)M_ng
zl8S_N!HTL~jF^(Dgx6B$a8#ui{r?QXDl`(dKP{EIr!{RO*rbE}hG8Ik5TGs0ne_VP
zH>4ZfH|(Jbqnt6bq^auJf`wJdZ)%5^22aHs4-@|2B_p#)<Q`qh^*~LVHYP2_X@VP1
zODt|(-My;%JF-TZA#GV_E#ZNd=3rNt4i`&7x%dNx1y`S-)PO0$?N?d#pLG>DP{;m?
z$mNrEqcT*e(BHn0r!vn3D*~#!0eD!!c#8p)Insxwt!RSQIOEhTN_+k?ZIiIPr9&w2
zgFmUvYNOb8T%?^zZJWb6Gfr&aU5C0_YE8DAs@aOIs+|dhW}-rW%rlgp@lZ;8r9P8_
zN@G#srNUxyoh)%-u-E0+RMC`F)^>3_PQ_HHO!Q!|?>^Y_?9(>AO9PT*VMuhh)L$jv
z<dK#1il~ZEaN6AAneskUb6E=GN6MJ9*p%a%>!GCHE4I!<f^d}35)?K*Bkz2t8(T?@
z`@_hkuEJ1Cm<1h!vyc#gw78)A@<Lik(pN7_EnfQ50p?y#>xeRfcyTsObfXxF;zcY?
z&rdbiiP+u2xl0zU3k!(W@uV1n2rp-AGN@R0WVFu9E*Mq&Um=yrktvSQA}R&NMGYHo
zTs?opCVKf&kh=H>HH#T6yAhBodu17`xXb}dk*LIVK#lgf7LpBdPZ_)NhRE;PuD^`%
z7-@Q$=+{~Nj8)0FiHA5mewu-YmQK`(WCY9dM`Of_Hm*hf(E*CM25<1bwxm~ZlW-VM
z;T9C@1{i^LL`|j;t#%FL*n(R{;iCtKb2A;KyTrh<rrKi4Xl?n_G_;n)R}Q<0a9h7W
z6C+=|!snt;l352=YMn|#pPJjPVM10ev28$1H6A}2=)yb>uDkR@yAD!ilSIuP{!*wZ
zKGeIXNNRui`4vdHp8-v{rXg3oOItU(A`cpo$Ze#t2>f)2bgDD1teHitl7SK4dEJG#
z?Kc{Li2%|eJ_4XGDN4l`Xi799G9MO@r$QAzXz$lxjj?!2G*vNqniWJHBGW5kwa_UN
zC(_j+J35hjsHcFVItp$ipiN1K!Uxq7R)t}fz7Q$x(*a{n<OdDN0m?=SFFTWWfyyZT
zkW_d%!n~H)`h>9vz4_||>|Fi(oT$`5#hj*G^p^k-XZ>+0z@xOp)<xGOSCHCfgdm!m
znq(NoS!#WQ6`gKU#Fb5CWujs|<)Rk}(~d7jWmKSe<y?Yey<vA=f<w!f&uuA3`3E7y
ziVi7G7KpH;8_uygRi0M1I-3`#r8uBY_(*g_KoXPe5KL?wHD~Kp*Wsnig29N3cG4CF
zBZLk1ouaGcu{w`$C1yGi4b91O^r4MTTM=rbAh0r7r3O1_f9%C+Ds=C1QzxMTtC~_v
zRBseIv<!GH@Tr_PMo}kzL$Op`{`X?4Dy6NZfenVlor}f)JQ;(8qRMUx0*EWOtTI!^
z3JWm~o@=yXfPGq(h)mkV*JLkkUX_Ei8D55vBVlG*NPfCs5f`HbSACh*#O1q`nxLbG
z1VL*nf*^@Ay2)yt)V+qarB9?iHq&#I?3#9CY`QlA)I85x$%w`H?@bGArk65lAu4U)
zsfH@{F&$CL4ETY99o=e!g-kP+$e-)*^FsXvpU}szi6Kjv%hCtZ4`24eEXes|SU81Z
zaEBM6=i|;Bv;f$|7w7dwk-nS9V81o`W-W4tW`TsIlU%1U<D+&+0FrEXA*68o1*flN
zn!~o`lf!RH(Yz>}(peu-sZyQ=gRjRxJso3YvHed~Pag(FZlR`y=2dO(PO1gl04&+A
zT1a8x{ZJ0UdB!!t`SmpJ0>$d`S)9^C*$a8y?-^>L{Iv49u$=wV6*KP6rZj$IWqLwc
zVMfewMMQj($e%oEeXT8R8$yu{n(ulKt-9hAA=0PuGO7Ma3E$tC-h0va$1)QDu7&OR
zJk1>0HJvwyv`xWw3}MbJM+uROY+e@%xYSc-UPgnbA!2Ir&I0HCjP{SoM|mmtyT52#
z8BBA=CLL|F=pC@(u*+4$yVB<(Wa*BjBf>qA0b_(H?pzBaw_<-R)G82$gErf)5eZAp
z8q_Al`!Wd?IlRc0WGrY<GQ0~|Mmd-N+YezcGAg}USzuiH&+U^)tW$j7!9SW+@NCID
zQ9d-NuCt>x=Y#ij6r+z|1y{1KQGgKMVJtzR3E;Aya|rVS95+<4)1lH4(!?oa?m<o^
z2gehoO8NSu#>=~=v(|?FnU8OGW$iVa8dww&C7ou=m!-o_X^-rc{PqK+OGoEUPwg(R
zT@t2&i2mqgW;B$lMe<J9U9FGMo74)EU;T~qflm?dp_)U_UtY=*vZ@`IFdLyg#WQA}
zi8t{jvhEh&1bTeY<&2ku9vcu|0HR+HbGjQ#>z^VhkefjEQiylJ=jItqSp<~9L`2I*
z6euW6dN3&g2{2=1tU;<o5MuuE9rk9}L7&Ac&xF4lHUW<Y2ehWeZIhv7CQp8~yE(W)
zY;MQHLg75%N9xs|BjU@6<qUgx_<Q&boKs(YQSlNbw(KIR-a0d)t>;7s`>FbLsp`X4
zXIpoFpcCoI<GhvMRWZbxbBmK$n02U7a0GQ&EV^If61ePfI(8QnvWz9ghF3}6VTd2T
z(!IO{R?po9MJ(#JkGTxK%nAT}B;*l#@rho)u(k}~h@N5`+C9|$TQEt<-OdPHCoEeH
z^4qYjv%Y(eJM8%nLbw>a;Ovu&ro6`?J2;P&CYj=iR(%1BkoEKJpzbfdjFd9pZe2^7
z+t(GD0Fn&2*(*!!HI2e5Mv-WYirl1~LQ?WNuv~)<MxICwAc03~y8Pa4U?<2ghZE4V
ztq>D`mYpx8!>_)7i^i<cXl=tD1!LI6EfpT5{ZUVVOnBH8Qzc_#&;J&t8<la}dOS4p
zs9D%C&{Un0p8~vS%qf`^x(?l)M3~R|eWzs@=xx>si7o5dIU^W+;<ImVq?LxvedHLl
zvS$$9I`xamTXg~Ty)ks-Z67bWoDt!jXI}QTpVEH_l-c!5YG>VeS|r^tL8m%Xy&Z=O
za%+EOdhvYe-cxXeJDYIky!XY7qb=?oM%IIlF3~=FE#6)#FZ3poEK+aw^o=P~=HKc8
z<UUrj8Mfr`n_-=&JLo*P-*3u~f8~(RH?MvPI?F8Li2h>k2%{xc-PBX=Ofq3j8M0x0
z97BowqS;oUzz7l#+vwI|En(J|$szfE`*asEEalCm4lw8qG)m3HNd(^BKMY@m?&i5v
z2$Nl>3>7`GPmW#f5}W-RVYqDq%)1zY?eE0tbuCfaTK9^xks%(*JKxB00vnt)z$%!z
z7%AUt=|Mm13N_`JpSGc>c*RA^y@9Wrl3c64%2~Zxlm5!}BL{UzQ2O^}>G<Zx4u1*T
z71q`UE|axFBJfr;S!I)^=sJ^<BPKf#T_w9Fih_|YJFew%Xcl93m7hPZ9%YUL$>|ZG
zbRee33<t9%%25Ij_U1xlfa~)SmDLAI+Y6EwXxVl32*x%<&)r3=eL|PwZVQpqlQ#kX
zDl|Q+npiN)8_BMuQBN1gWgsIOk9Z-Aija=5Bd&{lB|1moJ`cyw?`d@{`RXm?NZ&-N
z{>nQ}3wFfBIbOZ=Bl>e%-`2eYtefYB<?ET1OQ8%wM=5itA$ezZg-8Qo@Y>lR7pple
z#mWdn!F2W;7ZlN4`E*a4kWMyL0yVX^5?DG!OFS1g+2Ha7z{T(@Qrb{cIwmAoqysJ|
z_9VIrRrzInc(SK}bxg`~VU$}OnQ1e__=}(OFsF3gD*rF*F3YyW(5E*5xyhTixuKTr
z9hx9d#EI;!5@hdrh-4e5+*kNmSp|ln`<~~?8g5^r{jv2tMMe4JzFMx@t8ddm#`v71
zZzxxow8?7)TMAmaISb)$VP={9N4~kwuzFb@p)0!>CA*2ze+TipXE%c&Apapu-s<7+
z^4ie`q~`i<la#9yvzz*WUdX_tg!eV33Hqv|KwP-i{zFk@fhqgt1>+l*%IKis@zlhD
zA*Acu&m=9%5Z?wGx6o-9h^Pf?R2qoS$5&+(-*%a;KjNR7JcblVov2;SGWI4BD*t5L
zSw=H$J&h(wm`$j#Br%&Tl%|+g>w@|#KKb`_iY&XZLmzLBm9-Q|V`tC|>=9=QLy@8I
zTRbmTn7pAtihy0z-Vqa)Kv3lwa)4yrhzEzr;${U%{6Nh8yi^<amC-#E=UMPfF5{X+
zK#+Vg6Aw^j$Cp&+_C=PF=w3Bw<?D7beTbj_vZo1iPUe8lS%n85nOwY&jB>tX(eZWi
z;ySi{;FCa)BU1ywztqF<<J>N5zB~JlcWeN4^@Ewetq<}8Ya($;qUf5ZlcE)Ii6Zni
zB>P$=v|Ns;FRAs=cYlLRN66ODNzTK11%gQDRpHMa6%Lh4^osx`=|iw=j}0i%O2k1p
zYF7xQ@CjvBvw%rqj0yCvUh~1#FIUYmg9blMQ*GXCOIaN-6dNNn%fBsDq;PQ_;4AqK
z(+FAz55Q3v66cvdsrl~85Hg5H%=t`e+T9+T*zZ6I>~l!=u^lXiiob-QE-2`pGqr?-
z7T>bP`o!bce8m*GU%HDWB%!V2Ma{N7GC$(mpYDuyaonkP3JpQzO$|l=dcV`jO{dD}
zOOxTJ<xL30))D`3(MvyiiKjOh3p3$cf*)qA`YpC~^hj8*z-~Ff-1RkL-E}_+n%ZU(
zv2y$bz9rx4p`IMS2YxeKrp7SP4n6C`qT>**<cCG~5WMwOVS4`^97e2mXh^6|m5$aV
zDPwAcoichB+pimPy;6H4=lO(GU}a?T)3{)JB{B-2#6ML+5p7Dpj+9^ENG%@KER^Dc
zhw(kFDj*Qdmz2^*>w_8G0{@1DQ7u;N4QGGYs*2UI4aS>P54D2E-zF$~p<}jF3`Wju
zFN}~#=I5E|KKowzqg72oB5*+#YW@e`Cp|5qx6J<W&l*w%`JBJdn5sECZ<M}4GK`g{
ztdTPT``&221m;@^*`IA^1gR0_hV3s@ImMPA@f5=0HZ|xx1$Xtkb+P|i(e<jM7AM<B
zWHyKzeZkx0NjHG>6dfXJ@xt|z&d7xq54weu!V?=qI@XqS4(v?Zh82aBOUyc8j>_C}
zW?=+*h8<(9h{6l1ug9&xHVU^JYbd2?Sg-~F!MioQxr<6rV)av7aZml><l<;rHM4_R
zKml$Z^PV$W47-*^@(Rp6o5O;6Me^T(iGBnnUzUa6d&(PaBqF}INA>-mH6EYYuelzY
zl(Gk}$&y^nkLs^I!dO|uy;9gQprz5t{=zCsI-I?_G=z{uqc!LmHtsHL>v;pG?y$*#
zM?ui^wY%w`6^c+vbaI3^Hc7w!6ZSi(H$MCh=4hi%PSX+Rt|K1(g5^77Pix%(tg&r2
z)Ec4Kn{DS7;>r6+o#`REO2>mmFG0-2XZ>i{zBoJ>-QAz*O$FgANn|7u5s535y={^L
zSJyOpX?ECy!4;j?e95$Src@`*qD4hOq4_Isk2zU*J*5tgmLLWTdD0BTA;2f^tkJ}9
z9IOOVN2Lo8nZ{UskwC9WaWnZgScAAvMQf_MqUV@k1U+T`W9FD^kWgZmk8nw_V4(Va
zut+YKX`lZ<TmF93K>coYQq@Ijh#hw-YiAVW!_jTFyh|<)dPg60P%wmb{X-1^bL=^V
zZAx&ZM9jf-Hk7AGk62nYZ<CF1Bz$lBr5(}5{Y+0;#ndJW>S+X?0^jq2UP;LrL71Ud
z{tvO7SX}9l&CD@xzN4-`zVm6Gl1~13g{IZvwNX<>_oD9jC%yWrh>@Mn-(+;mK~n1e
zYH>YGieLEx9CK`E7!^GTg4)9X!gSxd*y{L^hYk&oB*zcvrIMeK6?1%Y3+Ad0WKq%t
ze9!Plk8s~Wba@;k6{1G3=$}O*C47Ba-`)r&uk4UNsI`>Q^74#wcVKM&6;E05E+T&U
zfwAOIBJI#%<|432pBTsonJ;onuP4*-(IxjUl!5I?V|UPq4cSw4VI6c*G9+UiW?m~;
z+$_{|)z9BS1*L2aFmrpz<DbVDPlGgDUJB*F3m~3P`HzzzaXeGao(F-x=+ocU4<t<c
zA<M<seURm6b4?XkI50IINwXsrDh#0TSLliMUza!A0tyNp3JS{KnZwIFz}eP|-QUIe
zz|<{yU6B|_9`S258AKg%bsm3eZ(m!OsV@U#cx%T;!d2eT&(=rbB91e4$Ecsqv!KSr
zMWW!TGkE-}N+<LVgY{VUIRBJGzwv2Qe>;bGod-AB`Vwb6=|@Ia(%#YgWdQK?diuvk
zUx=uCsYs?k+lHmFo&dgKQ?zNjJtpS*O}iU0shT0l^I@aC@CC$iiebf|ukZGN!zK9@
zcf2dW#;^~LHF~ctc>lSiPTBUCSQEmb|021e%wzdwAnamH@}{M&=nZSLfV?bhMKP0d
zFE{6Tk*c6GdY54~n(8GYcpi{nB~MV@5^p45ml*7^`3Ttve04t#JPd=arU<G_;UOC{
zz&xuzO4{h_N3Lad?RWF5%Z_&J-8J-c-v5%>(=3*cmJlY9*>z!a+-@r-3`%t~yBt)~
z&5WHVZ%1_emDxvc`uw-mY0~9{&-<kp{eDp&5cGIm<)5Go9u;s^@dQA4qc_WkPdLTz
z!PnVjjaF9X-?XjG({OXrD`#1-6*qJa&q^2sFIF2k__Yg;C_fMcaqLq(^EdKbKf_Pz
zgdblxKWtE=H|a$&mhgzI@3ohTl*4{3E=KY(9lxWagkWfm*+(A^(CDkqg<Rh}$pkN_
zo+MH$AzA7w9J$BA=>r(fP^`j+)ZB-3OnI$6wrVNzFjGCl5pB*yC@(|^+BD0epga#I
zm^`Y+&xUL&+c3XlKTWk<g!<UydK`vo&(NvNpy1_Yj16!jnGH+!=g8WjQP`W2<*D!|
zgQEkEPE^%N_NJ-Evz*sqbo3Id=PQp0_{UnH7!)n|B=Se#NdN(oph<18D3gC!6vCTf
zxeDQko6m}A^{b8Q^}jw+ikhkG4+117pF&(#K2!pfn$??jR-{$!Fb-~JOoLK-A`&JW
z<;LlaL;*G*!IUr#3fn|WNqZ4>-lT?=c`VG?Gv{HkD7OF^SaHR{>pCzt+Eujsb3{T-
z%5Uv@@juhJy1?)`7wO;+pEHVu-NuNR45?+uk3q`lB6n1eLlpP5)~FXer~ZtFmUy$(
zCgH3)R7y}@>G)8%7t_I{8`4a9KN845+;{zpQrIR@wdxhiMyaebp<BxnU0O2zHL1&0
zm!w}_mnXOr)UAD*?){7d_Bbb+dOon=;DWqLmL2()1A*o>=M!C@yBjB}eqEQgQ<BP}
zee~syS6!^F%H>?X*0K}FO%PQ|KMjvliya}3oqPzjrQQBNM-*rFTL8R6H6hvm#t!9Y
z#W;|>O13$9ZcveVX!}z*_i_ebnu#;rhQfTQ<?>R^6|;$-q9Oz2WS|a1s#E^)fd3HR
z0W_XI(-`D%*wx>IO_g}8cU36A^1)sr>q*NGJMs(7n8^_HE%Ksu<<$pEY7hHv`@EP7
zi1&6Qj&>w~4XUjeTKH&upKNi$V?xf!&_`NJqYIIPepqt)hG7u3q#`w=Ikn{UnM=O~
z)Umg@4B<Gnt0EX>(mspBEd>k-D<&LiiKybdkB7sSn;9Y)Q|85>ktK#?yGR=tX_(K2
zyUrI#yA~i$MqeI9YXXYM$;e>c<_}70scjgWqEe_Qh@_*fi1`=Fl56?7@z$Jekhp(N
zXqv2yeH95i$Hb<HP~=8~KLBOWyV^5<9$3)Ht!*pck2grN9GK)b`wWCP1!wf&*`Z`z
zp748RacI*zkV8IqW$yiwW!n>Ztt3Bj5Sa8RSfhX;^@FTHx4^=a554%fD;i-wH8#5l
z-|x6vpj*m>A3XUIy4W8NDa4;i30};7TfUA?=Iu)pA`xOhm>6I9&Y&3<@^kb&J){r&
zR7#`wq_c1N?pmI1$pzr3W8M^LBB&m62Z<RRxHE6gv=FE-Un5ktYGx?um9_{PD!ugc
z5tA8w4fC6yH{sIzVv;acNmH9OrYaSwBx-~;_|TyPddz0A7s6v5tElv@%hDK3bt>ml
zJ*&$Z<5U1G5pla?yLSFe;c&GKEZZk3)?=Auo#;q=<W!Pj!~}BqOa`yws`NOCafI-j
z;s|sYQBZYe3F8`>1hi3bVwmAc2rBRvH-*Yj?(h}|sl%!&B!_oJGnQbahT)ZoSy+7?
zwdW$x*yH0=!LW4>4upi@jhD;WA2)-4_;i$&t3iwFnl4OLnW_((ML*I%s3d+QV%90(
zgWybR3AIL=f&i@o8T^mvE&F3gw$-v^?455WMr@t`Bqp1XNoM;4=UPOu`RtjcM^#4K
zgS$~?+e2eVr2UgJiHG{s!aW81ZrQn5e&#=8GNQ5`B*^y9bi`);V;SlFbAQC@|3Bz|
z1Gr;z^gQVN&<$vkpJSZ^hQa1uzmHQci1mV#pY=^E`pE!pQ@O)gs?qEHWmir_ybwD(
zCtX**w~4#6b_<t;HQ^Kw9w`KnRN!%BMiqP>lXe8|V!SyI+84b*2D1?3QQh!1Pa8I_
zNS0O8GmH9)QOE<(Q2K{<j%=eT$#NKbZ2^D1lg^iAHFD~7Wj7t@sWu*5^QH$~==FeU
zYE$+9{jvQ<>Rr3=WtywgcfoQ$ZC4mRfZ5v-=Mhfj4AHqx<Mr-u!^~4LOy&RDEJ(~8
zRF>B_Pc<Or_{?_MqCa*#4+U#Gf8_Iq@3K>_s99OXdqus_Wcpbb^vy`BY41C1HoL|B
z{jJDz$#;0<-rI73O`||e1h`@Math}BM($q^o+gl7PQn)Lc({3rIGGCxynbtt;Z`(?
zPUul(3vQuG@p_wMShT;4ggYjPoE+rv%Fenyec+IsIBQ77;`J`$eVl>2<^3Sve#yLr
zSw?N3rTo(PEDF*}E|OZ5Oh=FqA}@JbeT|Rdu<H*do0I}jVbY^}3f*SW7d0e=B%XJ7
z=htc;w!{i56h7RgQ%GzHad_P)OPJ^P5u(U8AEra`_aN>1y#3KwH18F7K0i5&=#TVv
zpvWttz0}NG^uFIY8CB><WxBE>iIzQnyJet^@NDkZ@c-x^k6KoTd@VJir1dl|qRyDg
zoM0pg=RgDSi1@=I$<U!0OTxLM#QOVJ4t2oGx_^`$*@LyilB)-<-2)}05wiyZ$;;(&
z71br;ORr)>?~Jg&uTh$R5sOpwS9N&&+)ETE-Y4=rymu0@rFyxQ_vtY}c4`kMlNWv$
zY2UiVp*(9aoqqacZA-)6@0~nucxsN<X#b1eZM8Z;DUn=%R1-}fIr3+*`8cr8%0Zgf
z<k#!>DSHiC917H2EY!t036b}8v4O`wCnfR8;)3r_40vr8a7PH#?7Rmo3(+kp=*jp7
z3)r&K8ur6`h$|*=&Zj5N{;IlB**Mv_2W4ZhHOz2&#rib-{<iTj(LEF16r7*UikuIB
zW;A93puni6Fj|D`t8#%bFL<-hD3~2#)>I?*#rlk-6wSKScDTLLYgZF>D5-hJ_><8J
z_3X0s11ws$bvM~jerBk@a{q&lvx*LaEWrOIu!}Y`{&O>8(L2J>TiI)qU>YP<75k+c
z-s}d-QMvvbWxSSs#QDD&fX*(g&i_<1AW^F&y^qoZgN51yQ)_@AJx%|wvK=m!&A9B&
zdQE;&Pbca9|3az8!xLrk;hZfG^Tx;5UfuIQD6W>9{~nH9yUCfi*#^F-y)Z+^hPW^1
z-IK45v;O233xVzR4M%IWczaId>S2L-Q^uWhos!txa%s8OyGM5^sXF5q_*1RB?y&6p
z!0#An@8>q>z?8cXKuQx~w$|@cd#WGA*0)gIGEwtvne$<}eGH>VbPF{BJ-uIPuGRJs
zR*TZs0e*@8-HMiZ@3<fD#}h{i37C@`u6c+}1P=NR{Kh2-W5y1a<mQG6X9s(8r~S`i
z6;vJ_=m)R`k0i7<xQK@nrkVr1$ioLc4@Tx?BmF<EXDBGVf5QAf3mS^*pTz}h@iH*{
z|HA$M>|@dXUoswy#Z3k7=f!~D2G8>H!ysaT5%?tj)g;d+3hf1s;G-t}f9E{@6Xt&<
PDggKMu^=RJ{|EUWm0Tmp

diff --git a/Assets/_Scenes/daoNiaoShu.unity b/Assets/_Scenes/daoNiaoShu.unity
index 13d5a2b..96d846c 100644
--- a/Assets/_Scenes/daoNiaoShu.unity
+++ b/Assets/_Scenes/daoNiaoShu.unity
@@ -72598,6 +72598,8 @@ PlayableDirector:
     value: {fileID: 1631532823}
   - key: {fileID: 8387026910049780223, guid: 7673c770b56d14045bb43ddb3c306327, type: 2}
     value: {fileID: 1631532822}
+  - key: {fileID: 1817393580930511363, guid: 7673c770b56d14045bb43ddb3c306327, type: 2}
+    value: {fileID: 96000086}
   m_ExposedReferences:
     m_References: []
 --- !u!114 &745638600
@@ -245403,7 +245405,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 10, y: -20}
-  m_SizeDelta: {x: 100, y: 25}
+  m_SizeDelta: {x: 123.3156, y: 25}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!1 &2445884765684690209
 GameObject:
diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/FSMManager.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/FSMManager.cs
index 8f5b1e0..78e6f99 100644
--- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/FSMManager.cs
+++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/FSMManager.cs
@@ -317,30 +317,30 @@ namespace DongWuYiXue.DaoNiaoShu
             };
         }
 
-        public void ShowImgQuestion(int id, int score, int scoreId, Action nextFun)
-        {
-            ImgSelectQuestionPanel imgSelectQuestionPanel = GameManager.Instance.uiManager.GetUI<ImgSelectQuestionPanel>();
-            imgSelectQuestionPanel.ShowImgQuestion(id);
-            imgSelectQuestionPanel.nextAction = nextFun;
-            imgSelectQuestionPanel.subAction = isTrue =>
-            {
-                //if (main_gameModel.modeType == ModeType.KaoHe)
-                //{
-                if (isTrue)
-                {
-                    AddScore(score, scoreId);
-                }
-                else
-                {
-                    AddScore(0, scoreId);
-                }
-                //}
-                //else
-                //{
-                //    Game.Instance.eventManager.Raise(new PlayTrueOrFalseEvent() { isTrue = isTrue });
-                //}
-            };
-        }
+        //public void ShowImgQuestion(int id, int score, int scoreId, Action nextFun)
+        //{
+        //    ImgSelectQuestionPanel imgSelectQuestionPanel = GameManager.Instance.uiManager.GetUI<ImgSelectQuestionPanel>();
+        //    imgSelectQuestionPanel.ShowImgQuestion(id);
+        //    imgSelectQuestionPanel.nextAction = nextFun;
+        //    imgSelectQuestionPanel.subAction = isTrue =>
+        //    {
+        //        //if (main_gameModel.modeType == ModeType.KaoHe)
+        //        //{
+        //        if (isTrue)
+        //        {
+        //            AddScore(score, scoreId);
+        //        }
+        //        else
+        //        {
+        //            AddScore(0, scoreId);
+        //        }
+        //        //}
+        //        //else
+        //        //{
+        //        //    Game.Instance.eventManager.Raise(new PlayTrueOrFalseEvent() { isTrue = isTrue });
+        //        //}
+        //    };
+        //}
         //public void ShowDragQuestion(int id, int score, int scoreId, Action nextFun)
         //{
         //    DragQuestionPanel dragQuestionPanel = GameManager.Instance.uiManager.GetUI<DragQuestionPanel>();
@@ -359,6 +359,27 @@ namespace DongWuYiXue.DaoNiaoShu
         //    };
         //}
 
+        public void ShowImgQuestion(string stepName, int id, int score, int scoreId, Action nextFun)
+        {
+            ImgSelectQuestionPanel imgSelectQuestionPanel = GameManager.Instance.uiManager.GetUI<ImgSelectQuestionPanel>();
+            imgSelectQuestionPanel.ShowImgQuestion(id, stepName);
+            imgSelectQuestionPanel.nextAction = nextFun;
+            imgSelectQuestionPanel.subAction = isTrue =>
+            {
+                if (isTrue)
+                {
+                    GameManager.Instance.kaoheManager.AddScore(score, scoreId, (s, t) => {
+                        GameManager.Instance.uiManager.GetUI<ScorePanel>().SetScore(s.ToString(), t.ToString());
+                    });
+                }
+                else
+                {
+                    GameManager.Instance.kaoheManager.AddScore(0, scoreId, null);
+                }
+            };
+        }
+
+
         public void ShowDragQuestion(string stepName, int id, int scoreId, int score, Action nextFun)
         {
             DragQuestionPanel dragQuestionPanel = GameManager.Instance.uiManager.GetUI<DragQuestionPanel>();
diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BingLiState.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BingLiState.cs
index fcb538d..37609f3 100644
--- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BingLiState.cs
+++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BingLiState.cs
@@ -58,7 +58,7 @@ namespace DongWuYiXue.DaoNiaoShu
                 avPro.PlayVideo("daoNiaoShu/Videos/��ͷ����.mp4", () =>
                 {
                     GameManager.Instance.transform.FindFirst("��ʼ����").gameObject.SetActive(false);
-                    fsm.ShowTip(0);
+                    //fsm.ShowTip(0);
                     if (fsm.main_gameModel.modeType == ModeType.ShiXun)
                     {
                         fsm.nextState = true;
diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/ChaGuanState.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/ChaGuanState.cs
index 2729b17..d034696 100644
--- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/ChaGuanState.cs
+++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/ChaGuanState.cs
@@ -23,7 +23,7 @@ namespace DongWuYiXue.DaoNiaoShu
             cor = Game.Instance.IEnumeratorManager.Run(3.0f, () =>
                   {
                       isChaGuan = true;
-                      avProValue.gameObject.SetActive(true);
+                      //avProValue.gameObject.SetActive(true);
                   });
         }
         public override void OnStateStay()
diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/WuPinZhunBeiState.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/WuPinZhunBeiState.cs
index 11f93b5..0986a0b 100644
--- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/WuPinZhunBeiState.cs
+++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/WuPinZhunBeiState.cs
@@ -11,14 +11,14 @@ namespace DongWuYiXue.DaoNiaoShu
             fsm.ShowCamera("WuPinZhunBei_Camera");
             if (fsm.main_gameModel.modeType == ModeType.ShiXun)
             {
-                fsm.ShowImgQuestion(0, 3, 0, () =>
+                fsm.ShowImgQuestion("����ǰ׼������Ʒ׼��", 0, 3, 0, () =>
                 {
                     fsm.nextState = true;
                 });
             }
             if (fsm.main_gameModel.modeType == ModeType.KaoHe)
             {
-                fsm.ShowImgQuestion(0, 3, 0, () =>
+                fsm.ShowImgQuestion("����ǰ׼������Ʒ׼��", 0, 3, 0, () =>
                 {
                     fsm.nextState = true;
                 });
diff --git a/Assets/_Scripts/Application/daoNiaoShu/UI/ImgSelectQuestionPanel.cs b/Assets/_Scripts/Application/daoNiaoShu/UI/ImgSelectQuestionPanel.cs
index 361df29..7b02124 100644
--- a/Assets/_Scripts/Application/daoNiaoShu/UI/ImgSelectQuestionPanel.cs
+++ b/Assets/_Scripts/Application/daoNiaoShu/UI/ImgSelectQuestionPanel.cs
@@ -15,6 +15,9 @@ namespace DongWuYiXue.DaoNiaoShu
         Button subBtn;
         Button resetBtn;
         int id;
+
+        string stepName;
+
         public override void Init(IUIManager uictrl)
         {
             base.Init(uictrl);
@@ -32,11 +35,20 @@ namespace DongWuYiXue.DaoNiaoShu
             if (imgSelectManagers[id].Check())
             {
                 subAction?.Invoke(true);
+                Game.Instance.eventManager.Raise(new PlayTrueOrFalseEvent() { isTrue = true });
             }
             else
             {
-                subAction?.Invoke(false);
-                
+                //subAction?.Invoke(false);
+                Game.Instance.eventManager.Raise(new PlayTrueOrFalseEvent() { isTrue = false });
+                if (MVC.GetModel<Main.GameModel>().modeType == ModeType.ShiXun)
+                {
+                    ChatUI.Instance.SendAI("�û�λ�ڣ�" + stepName + "���û�������Ϊ��" + imgSelectManagers[id].GetYourAnswer() + "������û���������н����������ܱ�������ȷ�𰸺�����,����������100�����ڡ�", null);
+                }
+                else
+                {
+                    subAction?.Invoke(false);
+                }
             }
             subBtn.interactable = false;
             resetBtn.interactable = false;
@@ -44,6 +56,7 @@ namespace DongWuYiXue.DaoNiaoShu
         }
         private void Next()
         {
+            ChatUI.Instance.CloseChatTxt();
             SetActive(false);
             subBtn.interactable = true;
             resetBtn.interactable = true;
@@ -64,13 +77,14 @@ namespace DongWuYiXue.DaoNiaoShu
                 }
             }
         }
-        public void ShowImgQuestion(int id)
+        public void ShowImgQuestion(int id,string stepName)
         {
             SetActive(true);
             nextBtn.gameObject.SetActive(false);
             subBtn.interactable = true;
             resetBtn.interactable = true;
             this.id = id;
+            this.stepName = stepName;
             for (int i = 0; i < imgSelectManagers.Length; i++)
             {
                 if (i == id)
diff --git a/Assets/_Scripts/Application/daoNiaoShu/UI/TipPanel.cs b/Assets/_Scripts/Application/daoNiaoShu/UI/TipPanel.cs
index 1350cff..05467ca 100644
--- a/Assets/_Scripts/Application/daoNiaoShu/UI/TipPanel.cs
+++ b/Assets/_Scripts/Application/daoNiaoShu/UI/TipPanel.cs
@@ -9,7 +9,7 @@ using UnityEngine;
 using UnityEngine.UI;
 using ZXKFramework;
 using static System.Net.Mime.MediaTypeNames;
-namespace DongWuYiXue.DaoNiaoShu 
+namespace DongWuYiXue.DaoNiaoShu
 {
     public class TipPanel : UIBase
     {
@@ -25,6 +25,8 @@ namespace DongWuYiXue.DaoNiaoShu
         Button downBtn;
         ScrollRect scrollRect;
         Coroutine coroutine;
+
+        float hei;
         public override void Init(IUIManager uictrl)
         {
             base.Init(uictrl);
@@ -32,6 +34,7 @@ namespace DongWuYiXue.DaoNiaoShu
             upBtn = transform.FindFirst<Button>("upBtn");
             downBtn = transform.FindFirst<Button>("downBtn");
             scrollRect = transform.FindFirst<ScrollRect>("Scroll View");
+
             upBtn.onClick.AddListener(MoveUp);
             downBtn.onClick.AddListener(MoveDown);
         }
@@ -44,6 +47,7 @@ namespace DongWuYiXue.DaoNiaoShu
         public void ShowTip(int i)
         {
             SetActive(true);
+
             Game.Instance.IEnumeratorManager.Stop(coroutine);
             tip.text = str[i].Replace("<br>", "\n");
             //Debug.Log(Regex.Replace(Regex.Replace(tip.text, @"<color=[^>]*>", ""), @"</color>", "").Length + "==" + (Regex.Replace(Regex.Replace(tip.text, @"<color=[^>]*>", ""), @"</color>", "").Length + 70 - 1) / 70);
@@ -51,6 +55,8 @@ namespace DongWuYiXue.DaoNiaoShu
             //{
             //    coroutine = Game.Instance.IEnumeratorManager.Run(Scroll((int)(scrollRect.content.rect.height + 56 - 1) / 56));
             //}
+            scrollRect.normalizedPosition = new Vector2(0, 1);
+            hei = scrollRect.content.rect.height;
             container.position = p1.position;
             coroutine = Game.Instance.IEnumeratorManager.Run(Scroll());
         }
@@ -79,18 +85,44 @@ namespace DongWuYiXue.DaoNiaoShu
         }
         IEnumerator Scroll()
         {
-            scrollRect.normalizedPosition = new Vector2(0, 1);
+            //scrollRect.normalizedPosition = new Vector2(0, 1);
             yield return new WaitForSeconds(1);
-            //Debug.Log(scrollRect.content.rect.height);
-            if (scrollRect.content.rect.height > 57)
+            //Debug.Log(scrollRect.content.rect.height)
+            //if (scrollRect.content.rect.height > 57)
+            //{
+            //    int i = (int)(scrollRect.content.rect.height + 56 - 1) / 56;
+            //    for (int j = 0; j < i; j++)
+            //    {
+            //        //Debug.Log((int)scrollRect.normalizedPosition.y);
+            //        if ((int)scrollRect.normalizedPosition.y == 0) yield break;
+            //        yield return new WaitForSeconds(13f);
+            //        scrollRect.normalizedPosition -= new Vector2(0, 1 - (1 / i));
+            //    }
+            //}
+
+            //--------------------------------------------------------------------�޸ĺ�-----------------------------------------
+            if (scrollRect.content.rect.height > 80)
             {
-                int i = (int)(scrollRect.content.rect.height + 56 - 1) / 56;
-                for (int j = 0; j < i; j++)
+                if (scrollRect.normalizedPosition.y > 0)
                 {
-                    //Debug.Log((int)scrollRect.normalizedPosition.y);
-                    if ((int)scrollRect.normalizedPosition.y == 0) yield break;
-                    yield return new WaitForSeconds(13f);
-                    scrollRect.normalizedPosition -= new Vector2(0, 1 - (1 / i));
+                    yield return new WaitForSeconds(17.0f);
+                    float y = (hei - 80) / scrollRect.content.rect.height;
+                    hei -= 80;
+                    if (hei <= 80 && hei > 0)
+                    {
+                        hei = 80;
+                    }
+                    scrollRect.normalizedPosition = new Vector2(0, y);
+                    if (null != coroutine)
+                    {
+                        Game.Instance.IEnumeratorManager.Stop(coroutine);
+                        coroutine = null;
+                    }
+                    coroutine = Game.Instance.IEnumeratorManager.Run(Scroll());
+                }
+                else
+                {
+                    Game.Instance.IEnumeratorManager.Stop(coroutine);
                 }
             }
         }
diff --git a/Assets/犬导尿术/狗/Materials/pasted__M_shengzhixitong.mat b/Assets/犬导尿术/狗/Materials/pasted__M_shengzhixitong.mat
index 4572e44..08d2f73 100644
--- a/Assets/犬导尿术/狗/Materials/pasted__M_shengzhixitong.mat
+++ b/Assets/犬导尿术/狗/Materials/pasted__M_shengzhixitong.mat
@@ -115,7 +115,7 @@ Material:
     - _Parallax: 0.02
     - _QueueOffset: 0
     - _ReceiveShadows: 1
-    - _Smoothness: 0.8
+    - _Smoothness: 0.25
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
diff --git a/msc/2aae4e51c4e2dd03beb0e4c8c8d7affe/kivw.dat b/msc/2aae4e51c4e2dd03beb0e4c8c8d7affe/kivw.dat
index 021c26885366f31e66cbba05bcb2557e4da934b0..bb1025e6eb19fedbd7eddbf18adc40a5b8734a79 100644
GIT binary patch
delta 173
zcmV;e08;<O0mT6mGB7eVFEBYTGB_YHH99pjIy5(t6C!`zE*Wq$x4qn0WF@ER@o$XH
zVX1?|3w>&4hiQZ$VScEUSeO%<vMPQCRd*fC7sg>fk2Mrkw&NotgjE&ANY$+J8Py$2
zg-D42SR|^##UooNsFU$`nHwH$=v0nI?D|%1m-{-5`#Du<pGIM-=M{H7v9mH{(u<fi
bgsg{Zfh7?Zz@q~enyq#`(s$ISV_m#^d0a}h

delta 173
zcmV;e08;<O0mT6mGB7eVFEBYTGBzMFHaapnIx#ho6C!_BQ}>?lgaC@Z$u1QW(rhV?
zI#@qt!Fo-vl+ta1XCSvz--MVjOfp@Y;%E|$XpK6Vtq$ot?+y_n%gk-3aM^|-JH7w<
z-mBM<_c5hl2B+<#9&~nf!E_e#pF!y8Y8r@&(=Km;^A2y)2mcKn%%>dDTbCC-*A(Yl
bn-q~ze83UPU2gI#=)jpR5vh#Yu>nE-aQaS_