From 618b90af18c258bf3a042d06fc231e880b631d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=94=E5=BF=B5?= <1@72wo.cn> Date: Fri, 10 Oct 2025 01:31:02 +0800 Subject: [PATCH] =?UTF-8?q?feat(task):=20=E5=A2=9E=E5=8A=A0=E6=AF=8F?= =?UTF-8?q?=E6=97=A5=E4=BB=BB=E5=8A=A1=E5=A5=96=E5=8A=B1=E7=BB=8F=E9=AA=8C?= =?UTF-8?q?=E5=80=BC=E8=87=B320000?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将每日任务中多个精灵任务（毛毛、比比鼠、幽浮、利牙鱼等）的完成奖励从 2000点经验调整为20000点经验，以提升玩家任务收益。 refactor(fight): 使用枚举类型优化战斗结束原因字段 将 FightOverInfo 结构体中的 Reason 字段由 uint32 类型改为 EnumBattleOverReason 枚举类型，提高代码可读性和类型安全性。 同时修复了战斗结束时逃跑原因未正确传递的问题。 --- logic/controller/task.go | 8 ++++---- logic/logic1 | Bin 53521974 -> 53521974 bytes logic/service/fight/info/info.go | 14 +++++++------- logic/service/fight/playeraction.go | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/logic/controller/task.go b/logic/controller/task.go index e8c8f089..2a855d6c 100644 --- a/logic/controller/task.go +++ b/logic/controller/task.go @@ -489,7 +489,7 @@ func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *player. // 每日任务之毛毛 case 401: result.ItemList = append(result.ItemList, - task.ItemInfo{ItemId: 3, ItemCount: 2000}, // 积累经验x2000 + task.ItemInfo{ItemId: 3, ItemCount: 20000}, // 积累经验x2000 ) // 每日任务之小火猴 @@ -513,19 +513,19 @@ func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *player. // 每日任务之比比鼠 case 405: result.ItemList = append(result.ItemList, - task.ItemInfo{ItemId: 3, ItemCount: 2000}, // 积累经验x2000 + task.ItemInfo{ItemId: 3, ItemCount: 20000}, // 积累经验x2000 ) // 每日任务之幽浮 case 406: result.ItemList = append(result.ItemList, - task.ItemInfo{ItemId: 3, ItemCount: 2000}, // 积累经验x2000 + task.ItemInfo{ItemId: 3, ItemCount: 20000}, // 积累经验x2000 ) // 每日任务之利牙鱼 case 407: result.ItemList = append(result.ItemList, - task.ItemInfo{ItemId: 3, ItemCount: 2000}, // 积累经验x2000 + task.ItemInfo{ItemId: 3, ItemCount: 20000}, // 积累经验x2000 ) // 每日任务之谱尼扭蛋牌 diff --git a/logic/logic1 b/logic/logic1 index 2467f3ee4871aacb08e35459cd919441f3f5d0dd..bc2593c67353b7666457d466234d9d33da8b000e 100644 GIT binary patch delta 4169 zcmb8v)mKyt7>4mPgQ8+#w_qyiF*XQxF%BSMA*dMGiHhBd-Q7KQcXxMVH|Kr+ zfwR`Rcz)}>*=yhIZ*RYIsL*z`ac#~P-OX{0ED@0j<~Grhu~t)L-=2w4uC2QT2L^h1 z`@2VYCAN$aF5c zg6gCCs(va_^;ZMbKs87usljT98mfk=;cA2$sYa>MYK$7I#;IgAUQJLFRf?LVCaWoG zs+y*zs~Kvhnx$r|Iclz&r{=2#Dpf61i_~JZL@iaz)N-{#tyHVjYPCkKRqNDxwLxuE zo785tMQv5v)ONK)?NqzeZna14Rr}O_Wm5;#L3KzSR!7uPbxa*sC)7!GN}X0`)LC^- zomUssMRiGCR#((jbxmDYH`GmaOWjs?)LnH?-B%CPL-j~KR!`JZ^-MiiFVsu*O1)NZ z)LZpVy;mPpn);|dsn6<*`l`OE@9Ky8seY;7>W})X(vx-jDGH2W2N@uv!KR;pA=2OI z+|<@J*xvBhpq1J+#NH6ixT2AykrEPWZxERvGh_h=$O_pYJLCYpFeKCwazSp$19>4I z$pN;0kWw4kqw`s^AG; z;0-?D3)P@H)PR~$3u;3h@B@DcfIz4V^`Jg905dd%M$j0VKvQT2%^?Vap#_9MD71uD z&>Gr6TWAOEp#yY;PS6>`zye*s3gHj|k)q=m9;U7sNqth&R|mLK6%< z@|AbQAuW(aX)v9hLt0m0poFI41__D1cPA+425AZ97e!M7zLwY42*?wkPPEt0!)Mym;{qy3QUD*Fdb&V zOqd0;VGhiNc`zRqKq@SRMX(r_z*1NS%V7nqgjKK_*1%d=2kT)2Y=lj)8MeSy*aq8S z2keAhup9QkUf2iw!3GE5ARL0ja0HIRF*pt<;3S-a({KjP!Z|n(7vLgXg3E9PuEI6A z4maQ?+=AP12kyc>xDOBDAv}V|@C2U1Gk6X!;3d3**YF13!aH~mA0Q1r!YB9)U*Icz zgYWPIe!?&K4S(P-q#KfbV~iRGFoGRqfQ(=dnIJP{0SCwm*&sXQfSlk6xga;>fxM6p z@O%uCLqli;jiCuNg=Wwkf*=@LKnR3FOK1hHp$)W!cF-O= zKu72VogoY?&;_gz4iOLuT_FmhK_8ykB^J6tcjy5=06KsYpuobq!cGv+sVHfO%J+K${ z!G5s80XPVU;4mD4qi_t4!wEPEr{FZ4fwOQ9&cg+`2$$e8T!E`_4X(otxCyu5Hr#=` za1ZXo19%9J;4wUbr|=A(!wYx`ui!Pjfw%Au-opn-gOBhDKEoII3g6&6{D7bE3x2~N z_zUUAWV4H%&Fo^ZTajqkm6Eo^U?+@V2N@tE*h41B3|YVdvO+e<4mltvI6^MS4S66h z delta 4140 zcmb8vRaBMT8iwJ$7K(~p*w~6F(kLnhCWxXS1}3o9QUnz##lkLB>{e9lZpFgx?(S~v z_J8j2@8dnjKDe*(&VxDT$@hNSZyzkSU2R;OH^?U@(KW%*;_1;WJfMSHq`zlCix{Wq z!05(Xma!T37<3!-Eo>!d)XGTgSy&qTp`waTWls~pNk+Qg*7eDx=D(a;m(lpem|Lsp@d(}aOsE(?W>a4n`uBw{~RbeVznUq;sRCm=wMW~)CQbnm=s<-N+qE%lN zqheK@idPA$pX#p?)c`e64N`;E5S65cs$pul8lgt2QEIdrqsFRnYP?ET6VyaCNu{XC zYKoewrm5*_hMK8nso83dnycoi`D%e$s8ZD;wOB1tX=k>YO^SE~ty@lDe#}sH^Ilx~^`ho9dRjt?sD1>Ylo<9;k=vk$SA2sHf_gdahom zm+F;zt=_1&>YaM8GSvt5QGHUM)fe?ueN*4n5A{?1Qoq$7^*33&pQ6ABR*(g<8Zz_~ zFm(4x-CNJvkUgV!pta$f;on1Q?>5#3(|_lin*0Adr-TGs8$>q94mrREazZZ14S7J1 zhXm(?{7?W2LLn#&won9$LNO=~C7>jf0y`)TWuPpSgYr-TDnccw4E9h39H1&x14pP1 zPT&kK;0kWw4j$kMHJ~PVK`p2ab-)|yLOrMt4ZsH)LL+DlO`s_>17Gli=HL%4pd|!A zD`*XY5Cm-?7}`QRXb&AA1Uf<|=nP$;D|CZU2!n7iff+2&9eO|n^n^%=f?m)Y`am@F zg&2s1I73EAaJ(U+u)W#M;u`86=3dj;gtwBViPbhA}V}#=&?b+`dH;TGJ6J8&27!F_lD58)9!h9~e8p22f?0WaYdyoNXM7T&>o z$b=8@5kA3Z_yS+y8+?Z!@DqN)Z}mKle2C;*b(X$4N;g zjFXZ|s#3~Ml~!d`SyfJzR~1x6RY_G=_Nt0(1dN1HFdD|dSQrQ6AsHsXM3@9AFd3%6 zRG0?SVFt{ESuh*sz+9LI^I-ujgj84ri(v_*!BSWT%V7nqgjKK_*1%d=2kT)2Y=lj) z8MeSy*aq8S2keA&*af>`5A20~kOBMQ033uva2SrjQ8)(2;RKw7Q*av2z*#s4=ivfe zgiCN4uE15e2G`*R+=N?j8}7hexCi&)0X&39@ED%JQ+Ni?;RU>eSMVC%z*~3+?;#UD zz(@E5pWzF9g>Ud3e!x%o1;61B{52-~I#^}+IvA{0BpP<5WTqLcgb}PD3uFar$OhRV z2iQPP$OX9}59Eb>kRJ*_K_~=;!4`@@Q78t*p#+qKQeX$Ap$wFTa!?*BKt-qomBAjW WfCE&8YTyXf!O1EkGtJqmvCTjCWk3V~ diff --git a/logic/service/fight/info/info.go b/logic/service/fight/info/info.go index efed5b28..295db947 100644 --- a/logic/service/fight/info/info.go +++ b/logic/service/fight/info/info.go @@ -265,13 +265,13 @@ type FightOverInfo struct { // 3=isDraw 双方平手 // 4=isSysError 系统错误 // 5=isNpcEscape 精灵主动逃跑 - Reason uint32 // 固定值0 - WinnerId uint32 // 胜者的米米号 野怪为0 - TwoTimes uint32 // 双倍经验剩余次数 - ThreeTimes uint32 // 三倍经验剩余次数 - AutoFightTimes uint32 // 自动战斗剩余次数 - EnergyTimes uint32 // 能量吸收器剩余次数 - LearnTimes uint32 // 双倍学习器剩余次数 + Reason EnumBattleOverReason // 固定值0 + WinnerId uint32 // 胜者的米米号 野怪为0 + TwoTimes uint32 // 双倍经验剩余次数 + ThreeTimes uint32 // 三倍经验剩余次数 + AutoFightTimes uint32 // 自动战斗剩余次数 + EnergyTimes uint32 // 能量吸收器剩余次数 + LearnTimes uint32 // 双倍学习器剩余次数 } type CatchMonsterOutboundInfo struct { diff --git a/logic/service/fight/playeraction.go b/logic/service/fight/playeraction.go index 6385c504..7e910e83 100644 --- a/logic/service/fight/playeraction.go +++ b/logic/service/fight/playeraction.go @@ -33,7 +33,7 @@ func (f *FightC) Over(c common.PlayerI, res info.EnumBattleOverReason) { BaseAction: action.NewBaseAction(c.GetInfo().UserID), Reason: info.FightOverInfo{ - Reason: uint32(info.BattleOverReason.PlayerEscape), + Reason: res, }, } if c.GetInfo().UserID == f.ownerID {