From 1d560b8bad0ed4020702eee9ef22d2f3c8ee7ef7 Mon Sep 17 00:00:00 2001 From: "star\\zhenghan" Date: Fri, 12 Aug 2022 10:09:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=8D=E6=A4=8D=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Excel/Json/s/StartSceneConfig.txt | 4 +- Excel/StartSceneConfig@s.xlsx | Bin 10783 -> 10805 bytes Proto/OuterMessage.proto | 39 ++++++- Server/Hotfix/Demo/C2G_EnterMapHandler.cs | 1 + Server/Hotfix/Server.Hotfix.csproj | 3 + Server/Model/Generate/Message/OuterMessage.cs | 85 ++++++++++++++- Server/Model/Generate/Message/OuterOpcode.cs | 5 + Server/Model/Server.Model.csproj | 4 + Unity/Animancer.FSM.csproj | 9 ++ Unity/Animancer.csproj | 9 ++ .../Demo/Building/BuildingComponentSystem.cs | 5 +- .../Hotfix/Demo/Building/BuildingSystem.cs | 25 ++++- .../Construct/ConstructComponentSystem.cs | 12 ++- .../Hotfix/Demo/Farmland/FarmlandSystem.cs | 99 ++++++++++++++++++ .../Hotfix/Demo/Helper/ConstructHelper.cs | 2 +- .../Hotfix/Demo/Helper/FarmlandHelper.cs | 55 ++++++++++ .../Hotfix/Demo/Item/StoreComponentSystem.cs | 66 ++++++------ .../Hotfix/Demo/Operate/ConstructOperate.cs | 15 +-- .../Hotfix/Demo/Operate/FarmlandOperate.cs | 50 +++++++++ Unity/Codes/Hotfix/Demo/Unit/UnitSystem.cs | 21 +++- Unity/Codes/Model/Demo/Building/Building.cs | 3 +- Unity/Codes/Model/Demo/ConstValue.cs | 11 ++ Unity/Codes/Model/Demo/Farmland/Farmland.cs | 20 ++++ Unity/Codes/Model/Demo/Unit/Unit.cs | 5 + .../Model/Generate/Message/OuterMessage.cs | 85 ++++++++++++++- .../Model/Generate/Message/OuterOpcode.cs | 5 + Unity/Codes/Model/Module/Message/ErrorCode.cs | 6 ++ 27 files changed, 593 insertions(+), 51 deletions(-) create mode 100644 Unity/Codes/Hotfix/Demo/Farmland/FarmlandSystem.cs create mode 100644 Unity/Codes/Hotfix/Demo/Helper/FarmlandHelper.cs create mode 100644 Unity/Codes/Hotfix/Demo/Operate/FarmlandOperate.cs create mode 100644 Unity/Codes/Model/Demo/Farmland/Farmland.cs diff --git a/Excel/Json/s/StartSceneConfig.txt b/Excel/Json/s/StartSceneConfig.txt index 7b3de1e..92083b6 100644 --- a/Excel/Json/s/StartSceneConfig.txt +++ b/Excel/Json/s/StartSceneConfig.txt @@ -3,8 +3,8 @@ {"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","OuterPort":10003}, {"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","OuterPort":10004}, {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","OuterPort":0}, -{"_t":"StartSceneConfig","_id":5,"Process":3,"Zone":1,"SceneType":"Map","Name":"Game_1","OuterPort":0}, -{"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Map","Name":"Game_2","OuterPort":0}, +{"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Map","Name":"Game_1","OuterPort":0}, +{"_t":"StartSceneConfig","_id":6,"Process":3,"Zone":1,"SceneType":"Map","Name":"Game_2","OuterPort":0}, {"_t":"StartSceneConfig","_id":7,"Process":1,"Zone":1,"SceneType":"Account","Name":"Account","OuterPort":10005}, {"_t":"StartSceneConfig","_id":8,"Process":1,"Zone":1,"SceneType":"LoginCenter","Name":"LoginCenter","OuterPort":0}, {"_t":"StartSceneConfig","_id":9,"Process":1,"Zone":1,"SceneType":"UnitCache","Name":"UnitCache","OuterPort":0}, diff --git a/Excel/StartSceneConfig@s.xlsx b/Excel/StartSceneConfig@s.xlsx index 27b6c88531e0ef6f247dccae55eea12922f62510..02f2ac2f63c43cfe3208b96343451307f9346b3e 100644 GIT binary patch delta 4487 zcmV;25qR#ORJByFqyYt`NxnTqlc@nKf4WVnrR_jvR}KU#igzLTw-uW-B++iqAov8{ zc`v?{`WmKPTQ?LTH{qQB%lS`|=~|TDBWP1pGDTrPkOz`gypYQjUFS1DLY}cya#~gr zQnUesrrF^^!c@#E4VSu7plt!hb0leErc$)BR>c?_wgN#-;2hG4i%JV>-BmBKf1>Q3 zE&-1SImQAk<}fw0o9bhO>eGbK)g3YZ0_Y4_Lf*v2-#ENxY_iRbe-^Vu_F%+U7-|NJBWcJF&5DZ69Y;0`7J2O9nF`=5W>UGeZbo)ID*Fmz+$ zp9$$7!f>q4s4d5T0QaZ^%Lxx{N#N`75{~_V$|IZ9HsLCY?!vaLJD)Q=3}4~Er&C>_ z6jzrPb%c`)s3{4=Kc4G;6m0LuFYz6R@(Nl-JhKo}ZjpTPjTK*8R|6jLi3AmHLmrx~ zavN?noo!_iITouehu2I04TyUX_gptM`CxKIK!_-w>-8FcT>CMox+#j;0>zsUk;ltO zaGRE-^!Gcq13!jvzdP2jigfF}0i6>6as5!l8y^e|@>h+n&c(p@@<*0HrJ|Qoo@`)HI2o#*kR!Kg=0k!yY>BzB!f}8taSVNwy-3i zdAZ*W`07E;0{7ULw4FBah8*wKcu*J%3#70NtHsW4K9Bjl^M-(<9R(ql; zr8QxHZz&zsmBz-7rJqBx&mp-3Vr=~3b4cNUsBks8v~pR0;Z@6985?k{0ter+lvaFf zAJYX}wqVPJO%+RQ=JDr{LO^J-#ZeTgHPh5W+i=LDqqLUkWHph?;x?z`Y{8Zb&Y3Ku z_zn(;sy^nu&^&-FwKAG4`rKpZEFBfH)I=_Si`(3?7HqlTT#)5}7&TvL9zd2_8BG@L z!nQ0rDrBjNTo$*vWi8lp!8wyV0|#%!6=i6sY~N*wzV(_taU*zt5S@`#OO%rv9XS8_?aBuBVbn3Zbpyp*JW z6H5*}6S?HjVIjvzhBTfVjfk@)V=j%ePz{2^7chmyh>oWcNY6cb#Eab9$VZfzpZvV% z8QGC)MkBav$(T#yOr6nD56c)mczSF*g6F3>58g=IG@cu+;1`U!oH+~LNY%qKMh~7I z!XkL}a2WHmnFl|62;mKEvhq4HRxZ+)o2|Z&Sdic>h z=`o^8yF-Hl#@POwl>aJSvAqg(M(1L6mM z>vUKM?&%DA4SdD~?%d+r8D4!LxXDBTEdL2(BEG;HQlC$VTzaoBdo(=N|H9=HPCh); z@REbQ+erK#4`e87LhqoQEN3iq59G_3{eQEr2}KHjc%q3ReF^{op-=z-4FCWDcx*3o zba`xLb1ryoY}H&{Z`;-xz8|pvKrq-YirFG5>Vv7}ES626KsOXf1`ODSK$a+*03~`9 z71$jLq)juo9WtOuw`^U3buF^&VsW=_ScA4n|4gJvSN#in&j)$Vp$;WF6(u^p2u1Pz ze$I1$KB=uM$30KE=>!AU?>AI^Q&SbE-}XCh|Dd7%?7F>CSCv87>UUb6-*+17i8D~I zY=8fITZ8b#bFLjaPN;y2{-B{AhT+lWQfbgWbb779rhnx0;hU}>^jaZ&3=T?zqrho( z21uyql?+X*mU=C>uWoPkhdsL&4wSY(?1v41)r@Z`S~kdkSFT_sKfa-;rN}?t86%rBb3KuN zDY!A;2|eiqO#zmANudGLPv_8EPSG2sHdf7U2-?Num1uRhx4M3x71=05mC>E;t-zk8?@2CWfpHvI<01ZwX&>q z;$hDK#%`|X#Y1)=T5@N5>!=lmPSCgEYlU84KRJT2Tpy+oDBcp1T=?`s&^pl#%>3B| z2EONZkQWC{Jc6W!wTxY@g6VCae&O~z&aneiiYgv8mN3andnm^IZP|9S zmb)!F3b#}xbkWRA+bmm_RjX8g>J{BGOdXGObBvYRuQ2-+uy2*?R@JcTx`yGAzx^t+ zUjy@Xy;`r=Ewij+0Oe>uA}7O!zm?&tX|1TPxC6~GeY5acZTYBu4nAvv?~1C4$N%|P zv&I_ZTF8j2=34B-I#@);t3^{pMlft?HghH;+Hzp|aXqol+FuKEtf+r~Ac$RZ8}AX^wNp+~8Wj1t%%>`q1ja6IxmqXY@^ zyT!;>#gvJCBb(5 z;lAg5H#ek)DPngF^oK|$Yc)BEY}MohBmoN9n04yKQVrn{!6@{9v}(qzW1_VOvu0{F zvtm?9LY8DZQNp;dg3STERthYGs3&`?lq;OiJqu-KYq?NFQq6@j^J1lR3*_B)JntH! z*`Ie~1~(CfA9uNv0&t=NZ9StC4CoS8KItW)Yw`i0APAZGcma_@#~$QTO6%yzJF!7K z)=fUaqwLcT?qAq{=c}H3(C<0Cz-xgYI_(gj|IonsR`duu781H`v@hQV2`9kq@3@92wJW2r zTnd|U7p?R<$Nxp90uBm@S1(ut)474^MaeSCxQxbt-sW+F&`0FU35cr-?ji?OqqxI? zG};1>3sP!-E{}+@SPum#o#W!pN@t%O9EDyKMq6`y%(smgTr(D&TKRMnIYI|>1~>jR z1h3%3+ET@FG#vUWD8{&kfU;Q3h5(1MN|N2%K-bKofFl-vL}$5Er?51Y8!g z(r7FmrO^jz2g!0_yG0(87lF&sfUWQi2VU1LzLRM6x0spa8%|+YP`QS)_9oD`? z_R-IOzq5XBr;-N>RumvQPqy%w06%F-G}n0z@NB4~$B!ou-&SKBEBiy&g9Gw0s*?hf|2`Z&e)AXFuOb@#Mx$6OMHza&=818;3I8GfzjRD&z{^Jz4P1YhaYeuBI;t2_@$Jjq`5FeG~i}R z%H$Uv5+RPhIE%bR6CL)rAde-9eU z_@jTuf+BqAFA5|IORU8rB7|U_T@vSi-x8Gm|f{MQGgyMGwnxjp{)>sVGq4>&A;kxgZ3 z5T-0GB8t2NolLTX=2@{tSiyu(;s;@s*%(B0K?WtVh&S@nD@nYidc)KtP$!4MoY4t%)_iioElD_% z>ck8IJt(gLjz3Biq~?RE5%CFUdL?R7^TE`Jn1zFR5;c-=Vzi>8d>m(+(uAh^!PJPD zHKl1yrGBPH#H=Z8f|77zT7%Xmgd=S`so^j+B3dibBBzGK)QD)U;3Bhsxho9q!xp?7 zfzOG@V|&0?$LY3)UU)tJvZ1o;pWxRzpzidk*W8TcK2*!qpt1LH_WnA*{~`*yBig=xwE@#TbiLY-vB;CzukBFST|>Wzpv-E z1ApLm!_79lapZTqZrhnJ{RKa(WJSN>2TCpvJa{Ug!BXe1v3m`b`|v7yvk7Ot1a8Bt z9Z?XaLHyf-+y4i%cOGvC0W*{5B|rp|ApiiA!6z1zK_(gjx075ZlLe(ozCA>f^d?jR z36n`DKnGw1004MwFOxwj9Frgo1e35Q3IX4fyC*gR1|yRUBOH?tC@KMslR79T33#H3 zA$)n{dwm<@_hvcqOag5sWQsm7_Q!C;-K4QL06bu4j`lMS*op30Bn# zaL@5#x>=&flE_sFs=j}c#^V|>l`he(-dRNmmryqyhC|$UK`1rznTTse~jO= z1>l5`V=Tcj!5qUaFw_GP^+>@7q<%0}2M`=X1rn6AIF4fc?R8+J{d1sG_MEbGYwdUH zfux)?rxjBlqGSKX>%soJhMprY-kV%AN4mGctB>AKiFKYhHs zf4;tD__vq|-o>Nb0COM${~+DQINK>VqqFnb1Ql&(Avp=-bVgE2h(C83-nshuVgSlM z!N0^L2}v4~q$M5^nvC{{J3!Ip{`u*}7qbZivH=Aax;L&j`t8y8dYU)Kydn+W`X9LWzwdtjX>%jpTYtuwdce^1 zTmMXH`xJ(KamIDte+Q(+4OmX3t8)rpyVtO9JDeZ+q`C@cQM3%}yli~I@YH>UgPcxf zfn!o!YTQsk(%~wn5PyFz+g`H0AHT$R?D89EmGKNhjDuR@d2Y8`e{gI2plI$<3>FBjLQMCU zo{~DwY3}bfJOe+vaJM;@u!=18UWZRxe?Nc9(8>n`hx}FITR-^h(fs8ZSGb_~2z$l% z*dBNxh}T)v(u1Tzn2zDF*!DjWPOzTyfdY<=#iAQiB}U#~9N9{0UE ze;4r!#u*CGY`s*!Y{!38u-SpK;0t$mjab}@2&|k4{@(-lh#y zMFh}^FaXEHfd7(c5zJR(dZvjWL!1aIUJ}j!XJMv^e;`9*g_rZk2So;>YFSzOMOyeK zVEb~n>B!B4ng#B@%~?m8KRv>RD%jwjjc$ElgJkzGdfi2v@XBcJh}cCS6Op)xnTbeU z#N0$2T*QNk$XvuiAwtlogo2n6p=@+osEb%C2Yj&-7qK!Csf&0t5eFBsHW8VNKsqOe zQdSdge@fY?sT5fmi$8}XpF`3Sh?V%m=a6g!qQf=hvdZQCMO3Y5Wqe>{6$E&}x3uQt zd5kA)$%HMHHeD>p-p8LqG6`YDhN39aYi6irjonQy8)dc3ChLhpmavUVP9|)r7?8F#0PXrIDBSQGFRAOa5z8i%UD|?Ay zvf1NGm#4 ze@QuUf1NJGMuH7pJ)h-rBY?8XBG8Cyc3@ISAgWyu&oc z44xgrGI;%Ph{V|}f*(ADhz54IiaN1Ye=aeMmb6sy>ge4%k-jx%X0^~vIdSTQov|Z& z#L;`#V?`CC;lXUVN(`elGrb$9>t6aE=+Sj>uX`DRqlX=?QqQ0=Aeb{pg~5#a=o5M3;6@$Q9E(# z9I;T+vKj0e_(CY$x#hPry!ya!lZgUY{u3coet|V)KA$nYv|gLHxO*=Dh072~gyg zqKw@X1>8FBwkcd7a8kEvfTjst_o3djY0(%-?ED!^mY(_-dS-^?%uqv#3PdjDeK1Aw z+`jXF&6z8;bM18CNVhG2XnSs}qHN0*$#T11&vuVmmDg{YTg{3z3_5PF<9M#ss+?KF z%C+5Ze`{wLoH^EwW6KI8P~i?+mE#~dxmv9byT{g`Gu-x0EEm4%d;Xvkz(@b6Iy~{M zPH%{W22NF#<$86{vE9nc18uU%WLUrp*K z(*OJV5xHQ)nEQ&2YVJ#NBU6xiHYcJG=S+ouq<+u2!Xr`*v%9;~_gtD}Rf8;}JG(o7 z!?&c{9S8WQpbT|A$MdBCXarftcihgvB2SDje)rTe}U$(WJVidgwQ9zzuc(87+h(8c$2Z2 zFGwA9J<7ULhlf2w7`xey6A#&;?vXpYJ13nWuzc5quch$%=Gh61{$bWGIZOuTV$&RV6YWO(0F|;Fv8J}#M)BpNSX{&M$?)n@>@(%_ zQpz_|K8v*04{oV=g4zA z4qR3viRk|YlCYNt+jgygO3xb|Iu=+XD@k#ggjH3%MgcmJq2+cWg~2i2$K%w|b+;;V zDU2nf1dbbrolyV)itx!Ov5pw`RP=|)oHa&9B3q1%K*ksuiFL$?HWSG5aMlR2W`Ib+L?J~=>YSW7XC`RJy2&RnKtJu_ z{)K+N?$}4}z+we|Uh}=c>IV4yhYZelqDRoNkihPuefcg(SU#?Dr~QPhOnm5!K^Py* zWZC$Lr#~JI4lUorCqk%C#rg;wG@uhY+CBk5M;yH3R|fg z=Q7j6R$y=81(#`XsPhsM143C;6SzJi-~+t#?jVObfu38lQW zt%hNwwh2I@SwcDM4~yg`_*mL$KGWNjb}Y#x8x1QjmyuO=f1T{MGaK#oZ?w-Yo%Y2W z?$8TFdmU*L6L=(&CNmVW03S`Mm}LZo+eSb3eETifM`1S7SKnG+*{S4-f`S4>XG@lz z6JY0mRSA|YLYPcXSHe4!J1b*L(w`~e*n#wPV~zu>nZqRfQIfa~Nazj!R%QJ3>Gbj2 z3=uL?b`xkO*=7`9tbG32^y2H;!;6<6ygi+>%2P)O>*U{mpPj!Go8+kjZVRAI#R$w1%Hk;= z4ObJ=V)D`X?BhR5K)q0irxJOMGa2vn$=}BBz5@+q^5H*XL7qP0TmFf}5^J#tPa#-n z7sNSz{0Trax$`(-j;B#g$fGbg$Y2I;wt(@YXYuoVF;ayDp56J?i>FUw5uQS@7Af#5 z6mT8F z5g_m3Q?J>#y#T9dRp>Q&3Wsl<2Coj`6&v_p8u@ms^7DhehOvKOs#{HYueqgbR&C3u z?d@;X^!DEVzG=v+-2MgBGxXzqS5Fmv?g#t^cGvfYUO(9G!YfB!zi)S~`JeDJsz&r9 zexT&)(1EA?Fxb%f8}wcotHOME6}{SoQLlpA@CHp3M0FVdxZv*p0ke%BZwCS$B$H1h z6_a%*9Fs354gr0WJ|;5(p_6hZlLb_fAE-r>3MW(n3X@+aKmlQspeHZ^$&=A1HUjV> zlL;tB0e6#7C?^T7jcb`_3IG72lYl710SJ>tDLg%b1ONbdY%h0ja%*#FWo2}8FHlPX z0u%rg000080EbTEKo+_`-^v640MQWu02lxO000000096X00024lfEf&2D~Kz00005 Cn~$9U diff --git a/Proto/OuterMessage.proto b/Proto/OuterMessage.proto index d5ebe96..a1b169d 100644 --- a/Proto/OuterMessage.proto +++ b/Proto/OuterMessage.proto @@ -65,7 +65,8 @@ message BuildingProto float X = 3; float Y = 4; int32 Durable = 5; - int32 State = 6; //1.建造中 2.完成 3.维修中 + FarmlandProto Farmland = 6; + } message PeopleProto @@ -1195,5 +1196,41 @@ message M2C_GMAddItem // IActorLocationResponse string Message = 92; } +message FarmlandProto +{ + int64 id = 1; + int32 SeedCfgId = 2; + int32 plantCfgId = 3; + int32 duration = 4; + int32 exProduct = 5; + int32 farmlandState = 6; +} + +//ResponseType M2C_FarmlandPlant +message C2M_FarmlandPlant // IActorLocationRequest +{ + int32 RpcId = 90; + int64 FarmlandId = 1; + int32 CropCfgId = 2; +} + +message M2C_FarmlandPlant // IActorLocationResponse +{ + int32 RpcId = 90; + int32 Error = 91; + string Message = 92; +} +//ResponseType M2C_FarmlandHarvest +message C2M_FarmlandHarvest // IActorLocationRequest +{ + int32 RpcId = 90; + int64 FarmlandId = 1; +} +message M2C_FarmlandHarvest // IActorLocationResponse +{ + int32 RpcId = 90; + int32 Error = 91; + string Message = 92; +} \ No newline at end of file diff --git a/Server/Hotfix/Demo/C2G_EnterMapHandler.cs b/Server/Hotfix/Demo/C2G_EnterMapHandler.cs index 1284d48..83bfc06 100644 --- a/Server/Hotfix/Demo/C2G_EnterMapHandler.cs +++ b/Server/Hotfix/Demo/C2G_EnterMapHandler.cs @@ -5,6 +5,7 @@ namespace ET { [FriendClass(typeof(GateMapComponent))] [MessageHandler] + //此函数已经放弃了 public class C2G_EnterMapHandler : AMRpcHandler { protected override async ETTask Run(Session session, C2G_EnterMap request, G2C_EnterMap response, Action reply) diff --git a/Server/Hotfix/Server.Hotfix.csproj b/Server/Hotfix/Server.Hotfix.csproj index a2ad759..39e2171 100644 --- a/Server/Hotfix/Server.Hotfix.csproj +++ b/Server/Hotfix/Server.Hotfix.csproj @@ -40,6 +40,9 @@ Demo\Construct\ConstructSystem.cs + + Demo\Farmland\FarmlandSystem.cs + Demo\Fighter\FighterComponentSystem.cs diff --git a/Server/Model/Generate/Message/OuterMessage.cs b/Server/Model/Generate/Message/OuterMessage.cs index ec6e88e..4d918db 100644 --- a/Server/Model/Generate/Message/OuterMessage.cs +++ b/Server/Model/Generate/Message/OuterMessage.cs @@ -141,7 +141,7 @@ namespace ET public int Durable { get; set; } [ProtoMember(6)] - public int State { get; set; } + public FarmlandProto Farmland { get; set; } } @@ -2490,4 +2490,87 @@ namespace ET } + [Message(OuterOpcode.FarmlandProto)] + [ProtoContract] + public partial class FarmlandProto: Object + { + [ProtoMember(1)] + public long id { get; set; } + + [ProtoMember(2)] + public int SeedCfgId { get; set; } + + [ProtoMember(3)] + public int plantCfgId { get; set; } + + [ProtoMember(4)] + public int duration { get; set; } + + [ProtoMember(5)] + public int exProduct { get; set; } + + [ProtoMember(6)] + public int farmlandState { get; set; } + + } + + [ResponseType(nameof(M2C_FarmlandPlant))] + [Message(OuterOpcode.C2M_FarmlandPlant)] + [ProtoContract] + public partial class C2M_FarmlandPlant: Object, IActorLocationRequest + { + [ProtoMember(90)] + public int RpcId { get; set; } + + [ProtoMember(1)] + public long FarmlandId { get; set; } + + [ProtoMember(2)] + public int CropCfgId { get; set; } + + } + + [Message(OuterOpcode.M2C_FarmlandPlant)] + [ProtoContract] + public partial class M2C_FarmlandPlant: Object, IActorLocationResponse + { + [ProtoMember(90)] + public int RpcId { get; set; } + + [ProtoMember(91)] + public int Error { get; set; } + + [ProtoMember(92)] + public string Message { get; set; } + + } + + [ResponseType(nameof(M2C_FarmlandHarvest))] + [Message(OuterOpcode.C2M_FarmlandHarvest)] + [ProtoContract] + public partial class C2M_FarmlandHarvest: Object, IActorLocationRequest + { + [ProtoMember(90)] + public int RpcId { get; set; } + + [ProtoMember(1)] + public long FarmlandId { get; set; } + + } + + [Message(OuterOpcode.M2C_FarmlandHarvest)] + [ProtoContract] + public partial class M2C_FarmlandHarvest: Object, IActorLocationResponse + { + [ProtoMember(90)] + public int RpcId { get; set; } + + [ProtoMember(91)] + public int Error { get; set; } + + [ProtoMember(92)] + public string Message { get; set; } + + } + } diff --git a/Server/Model/Generate/Message/OuterOpcode.cs b/Server/Model/Generate/Message/OuterOpcode.cs index acd513c..2639765 100644 --- a/Server/Model/Generate/Message/OuterOpcode.cs +++ b/Server/Model/Generate/Message/OuterOpcode.cs @@ -147,5 +147,10 @@ namespace ET public const ushort M2C_BuildingDurable = 10144; public const ushort C2M_GMAddItem = 10145; public const ushort M2C_GMAddItem = 10146; + public const ushort FarmlandProto = 10147; + public const ushort C2M_FarmlandPlant = 10148; + public const ushort M2C_FarmlandPlant = 10149; + public const ushort C2M_FarmlandHarvest = 10150; + public const ushort M2C_FarmlandHarvest = 10151; } } diff --git a/Server/Model/Server.Model.csproj b/Server/Model/Server.Model.csproj index 182f0e6..f384074 100644 --- a/Server/Model/Server.Model.csproj +++ b/Server/Model/Server.Model.csproj @@ -70,6 +70,10 @@ Demo\ConstValue.cs + + Demo\Farmland\Farmland.cs + + Demo\Fighter\Fighter.cs diff --git a/Unity/Animancer.FSM.csproj b/Unity/Animancer.FSM.csproj index 4432b1b..8c724c1 100644 --- a/Unity/Animancer.FSM.csproj +++ b/Unity/Animancer.FSM.csproj @@ -310,6 +310,9 @@ C:\Program Files\Unity\Hub\Editor\2021.3.7f1c1\Editor\Data\Managed\UnityEditor.Graphs.dll + + C:\Program Files\Unity\Hub\Editor\2021.3.7f1c1\Editor\Data\PlaybackEngines\AndroidPlayer\UnityEditor.Android.Extensions.dll + C:\Program Files\Unity\Hub\Editor\2021.3.7f1c1\Editor\Data\PlaybackEngines\WindowsStandaloneSupport\UnityEditor.WindowsStandalone.Extensions.dll @@ -346,6 +349,12 @@ Assets\ThirdParty\NCalc\NCalc.dll + + C:\Program Files\Unity\Hub\Editor\2021.3.7f1c1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Types.dll + + + C:\Program Files\Unity\Hub\Editor\2021.3.7f1c1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Gradle.dll + C:\Program Files\Unity\Hub\Editor\2021.3.7f1c1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\mscorlib.dll diff --git a/Unity/Animancer.csproj b/Unity/Animancer.csproj index 7017be2..779372b 100644 --- a/Unity/Animancer.csproj +++ b/Unity/Animancer.csproj @@ -447,6 +447,9 @@ C:\Program Files\Unity\Hub\Editor\2021.3.7f1c1\Editor\Data\Managed\UnityEditor.Graphs.dll + + C:\Program Files\Unity\Hub\Editor\2021.3.7f1c1\Editor\Data\PlaybackEngines\AndroidPlayer\UnityEditor.Android.Extensions.dll + C:\Program Files\Unity\Hub\Editor\2021.3.7f1c1\Editor\Data\PlaybackEngines\WindowsStandaloneSupport\UnityEditor.WindowsStandalone.Extensions.dll @@ -483,6 +486,12 @@ Assets\ThirdParty\NCalc\NCalc.dll + + C:\Program Files\Unity\Hub\Editor\2021.3.7f1c1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Types.dll + + + C:\Program Files\Unity\Hub\Editor\2021.3.7f1c1\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Gradle.dll + C:\Program Files\Unity\Hub\Editor\2021.3.7f1c1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\mscorlib.dll diff --git a/Unity/Codes/Hotfix/Demo/Building/BuildingComponentSystem.cs b/Unity/Codes/Hotfix/Demo/Building/BuildingComponentSystem.cs index 31aa2a1..5fb37d5 100644 --- a/Unity/Codes/Hotfix/Demo/Building/BuildingComponentSystem.cs +++ b/Unity/Codes/Hotfix/Demo/Building/BuildingComponentSystem.cs @@ -21,7 +21,6 @@ namespace ET building.ConfigId = ConfigId; building.Position = new Vector2(X, Y); building.Durable = building.Config.Durable; - building.State = (int) BuildingState.Built; return building; } @@ -31,7 +30,7 @@ namespace ET foreach (var v in self.Children) { Building building = (Building) v.Value; - if (Array.IndexOf(StructureID, building.ConfigId) != -1 && building.State == (int) BuildingState.Built) + if (Array.IndexOf(StructureID, building.ConfigId) != -1 ) { hasBuilding = true; break; @@ -47,7 +46,7 @@ namespace ET foreach (var v in self.Children) { Building building = (Building) v.Value; - if (special == building.Config.Special && building.State == (int) BuildingState.Built) + if (special == building.Config.Special) { hasBuilding = true; break; diff --git a/Unity/Codes/Hotfix/Demo/Building/BuildingSystem.cs b/Unity/Codes/Hotfix/Demo/Building/BuildingSystem.cs index 9839549..1eab3ae 100644 --- a/Unity/Codes/Hotfix/Demo/Building/BuildingSystem.cs +++ b/Unity/Codes/Hotfix/Demo/Building/BuildingSystem.cs @@ -10,12 +10,33 @@ namespace ET self.Id = buildingProto.Id; self.Position = new Vector2(buildingProto.X, buildingProto.Y); self.ConfigId = buildingProto.ConfigId; - self.State = buildingProto.State; + self.Durable = buildingProto.Durable; + if (buildingProto.Farmland != null) + { + var farmland = self.AddChildWithId(buildingProto.Farmland.id); + farmland.FromMessage(buildingProto.Farmland); + } } public static BuildingProto ToMessage(this Building self) { - return new BuildingProto() { Id = self.Id, ConfigId = self.ConfigId, X = self.Position.x, Y = self.Position.y,State = self.State}; + var proto= new BuildingProto() { Id = self.Id, + ConfigId = self.ConfigId, + X = self.Position.x, + Y = self.Position.y, + Durable = self.Durable}; + if (self.Config.Special == (int) StructureSpecialEnum.FARMLAND) + { + foreach (var v in self.Children.Values) + { + if (v.GetType() == typeof (Farmland)) + { + proto.Farmland = ((Farmland) v).ToMessage(); + } + } + } + + return proto; } public static void DurableReduce(this Building self) diff --git a/Unity/Codes/Hotfix/Demo/Construct/ConstructComponentSystem.cs b/Unity/Codes/Hotfix/Demo/Construct/ConstructComponentSystem.cs index 73316d5..2608b5e 100644 --- a/Unity/Codes/Hotfix/Demo/Construct/ConstructComponentSystem.cs +++ b/Unity/Codes/Hotfix/Demo/Construct/ConstructComponentSystem.cs @@ -3,9 +3,10 @@ namespace ET { [FriendClass(typeof(Construct))] + [FriendClass(typeof(Building))] public static class ConstructComponentSystem { - public static Construct CreateConstruct( this ConstructComponent self,int configId, float x, float y,long id=0,long buildingId =0) + public static Construct CreateConstruct( this ConstructComponent self,Unit unit,int configId, float x, float y,long id=0,long buildingId =0) { Construct construct ; if (id == 0) @@ -21,6 +22,15 @@ namespace ET construct.X = x; construct.Y = y; construct.BuildingId = buildingId; + if (buildingId > 0) + { + var building = unit.GetComponent().GetChild(buildingId); + if (building != null) + { + building.IsUpgrade = 1; + } + } + return construct; } diff --git a/Unity/Codes/Hotfix/Demo/Farmland/FarmlandSystem.cs b/Unity/Codes/Hotfix/Demo/Farmland/FarmlandSystem.cs new file mode 100644 index 0000000..d3bc434 --- /dev/null +++ b/Unity/Codes/Hotfix/Demo/Farmland/FarmlandSystem.cs @@ -0,0 +1,99 @@ +namespace ET +{ + public class FarmlandDestroySystem : DestroySystem + { + public override void Destroy(Farmland self) + { + self.Parent.Parent.GetParent().RemoveFarmland(self); + } + } + + public class FarmlandAwakeSystem : AwakeSystem + { + public override void Awake(Farmland self) + { + self.Parent.Parent.GetParent().AddFarmland(self); + } + } + + public class FarmlandUpdateSystem: UpdateSystem + { + public override void Update(Farmland self) + { + + } + } + [FriendClass(typeof(Farmland))] + public static class FarmlandSystem + { + public static void FromMessage(this Farmland self, FarmlandProto farmlandProto) + { + self.Id = farmlandProto.id; + self.SeedCfgId = farmlandProto.SeedCfgId; + self.Duration = farmlandProto.duration; + self.ExProduct = farmlandProto.exProduct; + self.PlanSeedCfgId = farmlandProto.plantCfgId; + self.FarmlandState = farmlandProto.farmlandState; + } + + public static FarmlandProto ToMessage(this Farmland self) + { + FarmlandProto proto = new FarmlandProto(); + proto.id = self.Id; + proto.SeedCfgId = self.SeedCfgId; + proto.duration = self.Duration; + proto.exProduct = self.ExProduct; + proto.plantCfgId = self.PlanSeedCfgId; + proto.farmlandState = self.FarmlandState; + return proto; + } + + public static int Plant(this Farmland self, int cropId,int seedId) + { + if (self.FarmlandState != FarmlandState.FARMLAND_STATE_FREE) + { + return ErrorCode.ERR_FarmlandNotFree; + } + + self.ConfigId = cropId; + self.Duration = 0; + self.SeedCfgId = seedId; + self.PlanSeedCfgId = seedId; + self.FarmlandState = FarmlandState.FARMLAND_STATE_GROW; + self.ExProduct = 0; + return ErrorCode.ERR_Success; + + } + + public static void Update(this Farmland self) + { + if (self.FarmlandState != FarmlandState.FARMLAND_STATE_GROW) + { + return; + } + self.Duration += 1; + if (self.Duration >= self.Config.GrowthCycle) + { + self.FarmlandState = FarmlandState.FARMLAND_STATE_RIPE; + } + } + + public static int Harvest(this Farmland self) + { + if (self.FarmlandState != FarmlandState.FARMLAND_STATE_RIPE) + { + return ErrorCode.ERR_PlantNotRipe; + } + self.Duration = 0; + self.SeedCfgId = 0; + self.PlanSeedCfgId = 0; + self.ExProduct = 0; + self.FarmlandState = FarmlandState.FARMLAND_STATE_FREE; + return ErrorCode.ERR_Success; + + } + + } + + +} \ No newline at end of file diff --git a/Unity/Codes/Hotfix/Demo/Helper/ConstructHelper.cs b/Unity/Codes/Hotfix/Demo/Helper/ConstructHelper.cs index 7909294..2557a7c 100644 --- a/Unity/Codes/Hotfix/Demo/Helper/ConstructHelper.cs +++ b/Unity/Codes/Hotfix/Demo/Helper/ConstructHelper.cs @@ -13,7 +13,7 @@ namespace ET M2C_CreateConstruct resp = await unit.ZoneScene().GetComponent().Session.Call(msg) as M2C_CreateConstruct; if (resp.Error == ErrorCode.ERR_Success) { - var construct = unit.GetOrAddComponent().CreateConstruct(configId, x, y, resp.Id); + var construct = unit.GetOrAddComponent().CreateConstruct(unit,configId, x, y, resp.Id); Game.EventSystem.Publish(new EventType.AfterCreateConstruct(){Unit = unit, Construct = construct, IsNew = true}); } else diff --git a/Unity/Codes/Hotfix/Demo/Helper/FarmlandHelper.cs b/Unity/Codes/Hotfix/Demo/Helper/FarmlandHelper.cs new file mode 100644 index 0000000..ec77f41 --- /dev/null +++ b/Unity/Codes/Hotfix/Demo/Helper/FarmlandHelper.cs @@ -0,0 +1,55 @@ +using System; + +namespace ET +{ + public static class PlantHelper + { + public static async ETTask FarmlandPlant(Unit unit, long farmlandId, int cropId) + { + try + { + C2M_FarmlandPlant msg = new C2M_FarmlandPlant() { FarmlandId = farmlandId, CropCfgId = cropId }; + M2C_FarmlandPlant resp = await unit.ZoneScene().GetComponent().Session.Call(msg) as M2C_FarmlandPlant; + if (resp.Error == ErrorCode.ERR_Success) + { + FarmlandOperate.Plant(unit, farmlandId, cropId); + } + else + { + Log.Error(resp.Error.ToString()); + } + + return resp.Error; + } + catch (Exception e) + { + Log.Error(e.ToString()); + throw; + } + } + + public static async ETTask FarmlandHarvest(Unit unit, long farmlandId) + { + try + { + C2M_FarmlandHarvest msg = new C2M_FarmlandHarvest() { FarmlandId = farmlandId }; + M2C_FarmlandPlant resp = await unit.ZoneScene().GetComponent().Session.Call(msg) as M2C_FarmlandPlant; + if (resp.Error == ErrorCode.ERR_Success) + { + FarmlandOperate.Harvest(unit, farmlandId); + } + else + { + Log.Error(resp.Error.ToString()); + } + + return resp.Error; + } + catch (Exception e) + { + Log.Error(e.ToString()); + throw; + } + } + } +} \ No newline at end of file diff --git a/Unity/Codes/Hotfix/Demo/Item/StoreComponentSystem.cs b/Unity/Codes/Hotfix/Demo/Item/StoreComponentSystem.cs index 9c23c4c..71a3360 100644 --- a/Unity/Codes/Hotfix/Demo/Item/StoreComponentSystem.cs +++ b/Unity/Codes/Hotfix/Demo/Item/StoreComponentSystem.cs @@ -3,19 +3,17 @@ using System.Linq; namespace ET { - public class StoreComponentSystemDestroySystem : DestroySystem + public class StoreComponentSystemDestroySystem: DestroySystem { public override void Destroy(StoreComponent self) { - } } - - [FriendClass(typeof(Item))] - public static class StoreComponentSystem + + [FriendClass(typeof (Item))] + public static class StoreComponentSystem { - - public static void Add(this StoreComponent self,int configId,long amount,long id=0,bool bUpdateTime=false) + public static void Add(this StoreComponent self, int configId, long amount, long id = 0, bool bUpdateTime = false) { var config = AllItemConfigCategory.Instance.Get(configId); if (config.SuperpositionMax > 1) @@ -25,7 +23,7 @@ namespace ET var tempItem = (Item) v; if (tempItem.ConfigId == configId) { - tempItem.Amount+= amount; + tempItem.Amount += amount; return; } } @@ -39,20 +37,18 @@ namespace ET { item = self.AddChildWithId(id); } - + item.Amount = amount; item.ConfigId = configId; if (bUpdateTime) { item.CreateTime = TimeHelper.ServerUnix(); } - } else { for (int i = 0; i < amount; i++) { - Item item; if (id == 0) { @@ -62,6 +58,7 @@ namespace ET { item = self.AddChildWithId(id); } + item.Amount = 1; item.ConfigId = configId; if (bUpdateTime) @@ -69,9 +66,7 @@ namespace ET item.CreateTime = TimeHelper.ServerUnix(); } } - } - } public static long GetItemNum(this StoreComponent self, int configId) @@ -93,7 +88,7 @@ namespace ET long num = 0; foreach (var v in self.Children.Values) { - if (((Item)v).Config == config) + if (((Item) v).Config == config) { num++; } @@ -111,12 +106,13 @@ namespace ET { return false; } + var config = AllItemConfigCategory.Instance.Get(configId); if (config.SuperpositionMax > 1) { foreach (var v in self.Children.Values) { - var item = (Item)v; + var item = (Item) v; if (item.ConfigId == configId) { item.Amount -= amount; @@ -124,6 +120,7 @@ namespace ET { item.Dispose(); } + return true; } } @@ -133,7 +130,7 @@ namespace ET List removeList = new List(); foreach (var v in self.Children) { - var item = (Item)v.Value; + var item = (Item) v.Value; if (item.ConfigId == configId) { removeList.Add(item); @@ -147,13 +144,10 @@ namespace ET foreach (var v in removeList) { self.RemoveChildWithId(v.Id); - } - } return true; - } /// @@ -165,14 +159,14 @@ namespace ET /// public static List GetItemsWithType(this StoreComponent self, int mainType, int subType = -1) { - if (mainType == 0) return null; + if (mainType == 0) return null; var result = new List(); foreach (var v in self.Children.Values) { - var item = (Item)v; + var item = (Item) v; var config = AllItemConfigCategory.Instance.Get(item.ConfigId); - if(config.RelatedTable != mainType) continue; - if(subType == -1) + if (config.RelatedTable != mainType) continue; + if (subType == -1) { result.Add(item); } @@ -181,19 +175,20 @@ namespace ET switch (mainType) { case 1: + { + MaterialConfig materialConfig = MaterialConfigCategory.Instance.Get(config.RelatedId); + if (materialConfig == null) continue; + var types = materialConfig.Type.ToList(); + if (types.Contains(subType)) { - MaterialConfig materialConfig = MaterialConfigCategory.Instance.Get(config.RelatedId); - if (materialConfig == null) continue; - var types = materialConfig.Type.ToList(); - if (types.Contains(subType)) - { - result.Add(item); - } + result.Add(item); } + } break; } } } + return result; } @@ -209,6 +204,15 @@ namespace ET return true; } - + + public static bool IsEnoughItem(this StoreComponent self, int configId, int amount) + { + if (self.GetItemNum(configId) < amount) + { + return false; + } + + return true; + } } } \ No newline at end of file diff --git a/Unity/Codes/Hotfix/Demo/Operate/ConstructOperate.cs b/Unity/Codes/Hotfix/Demo/Operate/ConstructOperate.cs index f5aa5d3..73ef218 100644 --- a/Unity/Codes/Hotfix/Demo/Operate/ConstructOperate.cs +++ b/Unity/Codes/Hotfix/Demo/Operate/ConstructOperate.cs @@ -5,6 +5,7 @@ namespace ET { [FriendClass(typeof (Construct))] [FriendClass(typeof (Building))] + [FriendClass(typeof (Farmland))] public static class ConstructOperate { public static Construct CreateConstruct(Unit unit, int configId, float x, float y, long id = 0, long buildingId = 0) @@ -13,7 +14,7 @@ namespace ET // { // return null; // } - var construct = unit.GetOrAddComponent().CreateConstruct(configId, x, y, id, buildingId); + var construct = unit.GetOrAddComponent().CreateConstruct(unit,configId, x, y, id, buildingId); return construct; } @@ -150,17 +151,19 @@ namespace ET if (construct.IsUpgrade) { build = unit.GetOrAddComponent().GetChild(construct.BuildingId); - if (build == null) - { - Log.Error($"Can't find building:{construct.BuildingId} for construct:{construct.Id}"); - } + build.IsUpgrade = 0; } else { build = unit.GetOrAddComponent().AddChild(); build.Position.x = construct.X; build.Position.y = construct.Y; - build.State = (int) BuildingState.Built; + //如果是农场 + if (build.Config.Special == (int)StructureSpecialEnum.FARMLAND) + { + var farmland = build.AddChild(); + farmland.FarmlandState = FarmlandState.FARMLAND_STATE_FREE; + } } build.ConfigId = construct.Config.MixtureID; diff --git a/Unity/Codes/Hotfix/Demo/Operate/FarmlandOperate.cs b/Unity/Codes/Hotfix/Demo/Operate/FarmlandOperate.cs new file mode 100644 index 0000000..4726720 --- /dev/null +++ b/Unity/Codes/Hotfix/Demo/Operate/FarmlandOperate.cs @@ -0,0 +1,50 @@ +namespace ET +{ + [FriendClass(typeof(Unit))] + [FriendClass(typeof(Farmland))] + public static class FarmlandOperate + { + public static int Plant(Unit unit,long farmlandId, int cropId) + { + if (!unit.FarmlandDic.ContainsKey(farmlandId)) + { + return ErrorCode.ERR_FarmlandNotFound; + } + + var farmland = unit.FarmlandDic[farmlandId]; + if (farmland.FarmlandState != FarmlandState.FARMLAND_STATE_FREE) + { + return ErrorCode.ERR_FarmlandNotFree; + } + //检查种子数量 + var cropConfig = CropConfigCategory.Instance.Get(cropId); + if (cropConfig == null) + { + return ErrorCode.ERR_CropConfigNotFound; + } + + if (!unit.GetComponent().Remove(cropConfig.SeedNeed, cropConfig.SeedNum)) + { + return ErrorCode.ERR_SeedNotEnough; + } + + farmland.Plant(cropId,cropConfig.SeedNeed); + + return ErrorCode.ERR_Success; + } + + public static int Harvest(Unit unit, long farmlandId) + { + var farmland = unit.FarmlandDic[farmlandId]; + var storeNc = unit.GetComponent(); + storeNc.Add(farmland.Config.ProductID, farmland.Config.BasicProduction); + if (farmland.Config.ByProduct > 0) + { + storeNc.Add(farmland.Config.ByProduct,farmland.Config.ByProductNum); + } + storeNc.Add(farmland.SeedCfgId,farmland.Config.SeedProduce); + farmland.Harvest(); + return ErrorCode.ERR_Success; + } + } +} \ No newline at end of file diff --git a/Unity/Codes/Hotfix/Demo/Unit/UnitSystem.cs b/Unity/Codes/Hotfix/Demo/Unit/UnitSystem.cs index c88f5e4..cb7b5b6 100644 --- a/Unity/Codes/Hotfix/Demo/Unit/UnitSystem.cs +++ b/Unity/Codes/Hotfix/Demo/Unit/UnitSystem.cs @@ -21,6 +21,7 @@ namespace ET var now = TimeHelper.ServerNow(); var nowSec = now / 1000; var dt = now - self.UpdateTime; + //更新桃谷时间 var timeRate = WorldParametersConfigCategory.Instance.Get(WorldParam.TimeShift).Value[0]; if (dt > timeRate) { @@ -211,11 +212,29 @@ namespace ET return true; } - //每分钟的更新 + //耐久度的更新 public static void DurableReduce(this Unit self) { self.GetComponent()?.DurableReduce(); } + + public static void AddFarmland(this Unit self,Farmland farmland) + { + self.FarmlandDic[farmland.Id] = farmland; + } + + public static void RemoveFarmland(this Unit self, Farmland farmland) + { + self.FarmlandDic.Remove(farmland.Id); + } + + public static void UpdateGameTime(this Unit self) + { + foreach (var v in self.FarmlandDic.Values) + { + ((Farmland)v).Update(); + } + } } } \ No newline at end of file diff --git a/Unity/Codes/Model/Demo/Building/Building.cs b/Unity/Codes/Model/Demo/Building/Building.cs index 2278007..7ff618f 100644 --- a/Unity/Codes/Model/Demo/Building/Building.cs +++ b/Unity/Codes/Model/Demo/Building/Building.cs @@ -11,12 +11,13 @@ namespace ET Upgrade = 3, } + [ChildType(typeof(Farmland))] public class Building: Entity, IAwake, ISerializeToEntity { public int ConfigId; public Vector2 Position; public int Durable; - public int State; //1.正在建造，2.建造完成，3.维修 + public int IsUpgrade; [BsonIgnore] public StructureConfig Config => StructureConfigCategory.Instance.Get(this.ConfigId); diff --git a/Unity/Codes/Model/Demo/ConstValue.cs b/Unity/Codes/Model/Demo/ConstValue.cs index d405235..49e7f03 100644 --- a/Unity/Codes/Model/Demo/ConstValue.cs +++ b/Unity/Codes/Model/Demo/ConstValue.cs @@ -1,3 +1,5 @@ +using System; + namespace ET { public static class ConstValue @@ -116,4 +118,13 @@ namespace ET public const int CONSTRUCT_TYPE_NEW = 1; //创建新的建筑 public const int CONSTRUCT_TYPE_UPGRADE = 2; //升级建筑 } + + public static class FarmlandState + { + public const int FARMLAND_STATE_FREE = 1;//空闲 + public const int FARMLAND_STATE_PLANT = 2; //种植 + public const int FARMLAND_STATE_GROW = 3; //生长 + public const int FARMLAND_STATE_RIPE = 4; //成熟 + public const int FARMLAND_STATE_HARVEST = 5;//收割 + } } \ No newline at end of file diff --git a/Unity/Codes/Model/Demo/Farmland/Farmland.cs b/Unity/Codes/Model/Demo/Farmland/Farmland.cs new file mode 100644 index 0000000..5266eb5 --- /dev/null +++ b/Unity/Codes/Model/Demo/Farmland/Farmland.cs @@ -0,0 +1,20 @@ +using System; +using MongoDB.Bson.Serialization.Attributes; + +namespace ET +{ + public class Farmland: Entity, IAwake,IUpdate, IDestroy,ISerializeToEntity + { + public int SeedCfgId; //农作物configid + public int Duration; //种植时间 + public int ExProduct; //额外产量 + public int FarmlandState; //农田状态 + public int PlanSeedCfgId; //计划种植的东西 + public int ConfigId; + + [BsonIgnore] + public CropConfig Config =>CropConfigCategory.Instance.Get(this.ConfigId); + + + } +} \ No newline at end of file diff --git a/Unity/Codes/Model/Demo/Unit/Unit.cs b/Unity/Codes/Model/Demo/Unit/Unit.cs index 3c55ab5..8adf0e4 100644 --- a/Unity/Codes/Model/Demo/Unit/Unit.cs +++ b/Unity/Codes/Model/Demo/Unit/Unit.cs @@ -67,5 +67,10 @@ namespace ET [BsonIgnore] public long BattleId; + [BsonIgnore] + public Dictionary FarmlandDic = new Dictionary(); + + + } } \ No newline at end of file diff --git a/Unity/Codes/Model/Generate/Message/OuterMessage.cs b/Unity/Codes/Model/Generate/Message/OuterMessage.cs index ec6e88e..4d918db 100644 --- a/Unity/Codes/Model/Generate/Message/OuterMessage.cs +++ b/Unity/Codes/Model/Generate/Message/OuterMessage.cs @@ -141,7 +141,7 @@ namespace ET public int Durable { get; set; } [ProtoMember(6)] - public int State { get; set; } + public FarmlandProto Farmland { get; set; } } @@ -2490,4 +2490,87 @@ namespace ET } + [Message(OuterOpcode.FarmlandProto)] + [ProtoContract] + public partial class FarmlandProto: Object + { + [ProtoMember(1)] + public long id { get; set; } + + [ProtoMember(2)] + public int SeedCfgId { get; set; } + + [ProtoMember(3)] + public int plantCfgId { get; set; } + + [ProtoMember(4)] + public int duration { get; set; } + + [ProtoMember(5)] + public int exProduct { get; set; } + + [ProtoMember(6)] + public int farmlandState { get; set; } + + } + + [ResponseType(nameof(M2C_FarmlandPlant))] + [Message(OuterOpcode.C2M_FarmlandPlant)] + [ProtoContract] + public partial class C2M_FarmlandPlant: Object, IActorLocationRequest + { + [ProtoMember(90)] + public int RpcId { get; set; } + + [ProtoMember(1)] + public long FarmlandId { get; set; } + + [ProtoMember(2)] + public int CropCfgId { get; set; } + + } + + [Message(OuterOpcode.M2C_FarmlandPlant)] + [ProtoContract] + public partial class M2C_FarmlandPlant: Object, IActorLocationResponse + { + [ProtoMember(90)] + public int RpcId { get; set; } + + [ProtoMember(91)] + public int Error { get; set; } + + [ProtoMember(92)] + public string Message { get; set; } + + } + + [ResponseType(nameof(M2C_FarmlandHarvest))] + [Message(OuterOpcode.C2M_FarmlandHarvest)] + [ProtoContract] + public partial class C2M_FarmlandHarvest: Object, IActorLocationRequest + { + [ProtoMember(90)] + public int RpcId { get; set; } + + [ProtoMember(1)] + public long FarmlandId { get; set; } + + } + + [Message(OuterOpcode.M2C_FarmlandHarvest)] + [ProtoContract] + public partial class M2C_FarmlandHarvest: Object, IActorLocationResponse + { + [ProtoMember(90)] + public int RpcId { get; set; } + + [ProtoMember(91)] + public int Error { get; set; } + + [ProtoMember(92)] + public string Message { get; set; } + + } + } diff --git a/Unity/Codes/Model/Generate/Message/OuterOpcode.cs b/Unity/Codes/Model/Generate/Message/OuterOpcode.cs index acd513c..2639765 100644 --- a/Unity/Codes/Model/Generate/Message/OuterOpcode.cs +++ b/Unity/Codes/Model/Generate/Message/OuterOpcode.cs @@ -147,5 +147,10 @@ namespace ET public const ushort M2C_BuildingDurable = 10144; public const ushort C2M_GMAddItem = 10145; public const ushort M2C_GMAddItem = 10146; + public const ushort FarmlandProto = 10147; + public const ushort C2M_FarmlandPlant = 10148; + public const ushort M2C_FarmlandPlant = 10149; + public const ushort C2M_FarmlandHarvest = 10150; + public const ushort M2C_FarmlandHarvest = 10151; } } diff --git a/Unity/Codes/Model/Module/Message/ErrorCode.cs b/Unity/Codes/Model/Module/Message/ErrorCode.cs index afe5c0d..58866e1 100644 --- a/Unity/Codes/Model/Module/Message/ErrorCode.cs +++ b/Unity/Codes/Model/Module/Message/ErrorCode.cs @@ -88,5 +88,11 @@ namespace ET public const int ERR_FighterSilence = 210205;//玩家被沉默了 public const int ERR_FighterConstraint = 210206; //玩家被禁锢了 public const int ERR_SkillNotFound = 210207; //没有该技能 + //210201-210322 种植相关 + public const int ERR_FarmlandNotFree = 210201; //农场不是空闲 + public const int ERR_PlantNotRipe = 210202; //农作物没有成熟 + public const int ERR_FarmlandNotFound = 210203;// 农场没有找到 + public const int ERR_CropConfigNotFound = 210204;// 农场没有找到 + public const int ERR_SeedNotEnough = 210205;// 农场没有找到 } } \ No newline at end of file