From 0b3c9e76bf4b07555d9519329d9db09140353d5c Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Thu, 9 Jan 2025 16:23:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/DB_PigBank_Diamond.dat | 4 ++-- data/DB_PropExchange.dat | 6 +++--- data/DB_Task.dat | Bin 7678 -> 7679 bytes data/DB_Task.json | 20 ++++++++++---------- xlsx/DB_Task.xlsx | Bin 25585 -> 25585 bytes 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/data/DB_PigBank_Diamond.dat b/data/DB_PigBank_Diamond.dat index 318e11f..ea6f47d 100644 --- a/data/DB_PigBank_Diamond.dat +++ b/data/DB_PigBank_Diamond.dat @@ -1,4 +1,4 @@  (8@;PdX`c -< ((2Ÿ28@;JJƸPdX` -?/ 2(2Ÿ28@;JƸJPdX` \ No newline at end of file +< ((2Ÿ28@;JƸJPdX` +?/ 2(2Ÿ28@;JJƸPdX` \ No newline at end of file diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index 5de0d1f..e10fa5a 100644 --- a/data/DB_PropExchange.dat +++ b/data/DB_PropExchange.dat @@ -1,8 +1,8 @@ -6ӆԆՆֆ׆"= +6Նֆ׆ӆԆ"= .ۆ؆نچ"= -Wֆ؆ӆԆنچۆՆ׆"  -]׆نۆӆՆ؆چ܆Ԇֆ" +WԆՆۆӆֆ׆؆نچ"  +]׆چ܆ԆՆֆۆӆ؆ن" "¸0  "0 diff --git a/data/DB_Task.dat b/data/DB_Task.dat index 68f17575ca28557cad3fa45d0b07176745f304df..0dc47a14a31eb69d7ae2c148a7f99366086291af 100644 GIT binary patch delta 414 zcmexo{oi_mp&$px!d^Ck1&8Fk*f^E|St1*qWLO2+I4-s^3$S>>WjE)uHZo0~%qcRN zg`)~6y$Gn36(K#jpTm6eW?qraw>TUaC#Ug>OxEKnpWMtZI9Y*{b@Og6H|EJpxkM(5 z@@Y+O;Sro1z_$*I8T|Z)lfQBcZVu$nVuVU_L9IB@VmtYafId`I1S;ClS+$u*a4!ol z$g!+I58MONjFYd4HgbYkAd!ok6U3G-TQ~}Y+_oZbfvrF4fZj_ds94oCNVD_|s)zh6@p0@7Q;51OQ zV4FNqT368$Rglwx5o!!Smkr0mQ~}A!GBUCPMyRTICUeW^3K|)pii&LZl-bG%0LuJ< A-~a#s delta 413 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 delta 12933 zcmZv@WmH_-(lv~`YjC$lf(3VXcTKS15IoopZowr;aCg^66Fk8s1ovP~aEE-&x$kq& zId^>hqu1Cyy5_2?HEY&dyL+Dw!JZDm*5$wg4d}vGYKT+Cd@SX*h{TjZ6V-lrZtgqZm}D64o`NLfxFCx=cE6^^~yM8!*( zTg}3zzeg&hgGWNG|6Lw6#S86tI_~WjbRUMn~Wd3{g0G#i$ zPYeic3*w$3>s41THwJqA#t?#Mkbo(B`1f3XHZK>P6K-~o2xqVdNo0PJcYX1mKCkkP z@*ZDW@?Rsy>Ewyr6%?H&d;4w0jlg8)i6I4YGiK=bM*OIn?{m$k=IVznmx=futZgo) z_s68kHY#_8B5}yS8A?1#)BeaCqXcbZ@0-7b`*V4^;^Oir$>wH&K2@<_tjh}ckR*h^ zgTkOsGQy=qnjATChn}6cEkq|MJHkmPC_TbVCn!H6K-VrY(oetnEwJMgbGzn9{fnMY z7|dO{Y~R7hsFU;C?$Mp8Qde^+cvclGgJ^RElE$iSlyeo_u{X@)QPH};HZ_`S+(<$C zmYKY=@D)Ei)ua*0c6oK`HPxg62C`qgI*p2Q?lP~yBX-OatrddvmlDQ5%B9n=3~td8AvmGK>ayJp%q$5zFrpkD?G()O6_@NRz^!-`j*^pMef1YUBKJ#<9(puTBZNe+e1l}&1 z1go1VKDVlERD&qe5t&y*QL4W5^{CBh#xwoXs!&k+`Y354EJGnHYlY5vrU-vE`5@KB zxv{4%**P2h4oIbw72ve3mu1B}G#gJgN8kuYuj+zAzhp%wsE6n1rUJ`Yq3E=kU@UEs zUxJlEl9c|120em}qJf*<>@ZncthBI~V4C0j4VrEiOBufY((vMNb;+=8Tsb^%1xq@d zLgp%tLdCu<6wD3GqC;0QEP~?V+aM}ytB=_l-k^CNlr26;s&Ckn z8IrZnQIU*st=z@hqdmbSmGC1Z5ns?*y_4tE!^4!i$|@^)ose^cX`#TjI7`DLjTa(d zwUJOPtryjH7 zInoU&6^Jw6$-F`YF06iIOIwWn752^7{|%eUP2%h?7vIUC51|>*I?!3uT8BW>NKmS& z+D9!hJxr6p^r=aM99H#-gf)t29R%#<_+Ytv@18e4eEBwJ4b7#a-OYq>e8B z>}yMu*DpY6Q2hO#`-cwJf`E%qRgjUGaAL@sYsGxF-Zx=A`IYEckT#8S zMlAr(Dty-c<8#6uD6&I3$9e7t!d?@YQM9Wjkzx|g;>8{h#X}rO6s;4f^ykM|(M0+I zmKh92Ne=?yj}gw8LUCc4zP7vh?GZ$jM!vR)I7Ft{(^niFqt$z}1Ql0f1a=aGT5bou z&M!N{6k?n;^7nf03dpKu#jj+CHkvq^S#p8i6uSWt)Pklx(o1@&){@|YN>GrE*{kcx zFVf1`)i7TQ4iy(xW%b)rQ}4Xzy5Wgp)JDqT(MgK@4ndLA1;(>dQ$d%q{6;Z>n=x@; z+xJE{v(?6|EVR`?{#*IRAxUWJqP*vm%hKrB?4nI@C^0p^jQogAcl10~$8{lKmU`eI zC0nR2X=H)TbdFud$TI{@7kOTP#kTscyjBS7R|RWKs}LlB@v0;5fRCeVjxe}F*w&^V zZ|=W{l{Luve)^_6`3E`;_AtEGrC3K-6~>WG2S|h!SXH$hQ%0AK+SfWm8z!FC^#@I` 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 Date: Thu, 9 Jan 2025 17:02:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worldsrv/action_nian.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/worldsrv/action_nian.go b/worldsrv/action_nian.go index fcb3f58..cb7c10a 100644 --- a/worldsrv/action_nian.go +++ b/worldsrv/action_nian.go @@ -331,7 +331,7 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64) for i := 0; i < count; i++ { //随机伤害值 randomValue := int64(rand.Intn(intSlice[1]-intSlice[0]+1) + intSlice[0]) - logger.Logger.Tracef("随机到的伤害值是:%d", randomValue) + logger.Logger.Tracef("sndi :%d,随机到的伤害值是:%d,", p.SnId, randomValue) //计算BUFF if p.WelfData.NianData.BuffCount > 0 { randomValue = randomValue + randomValue/2 @@ -409,7 +409,7 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64) Change: extraItems, GainWay: common.GainWayNianGain_Attack_BigOther, Operator: "system", - Remark: "年兽活动-打爆竹额外活动奖励", + Remark: "年兽活动-大爆竹额外活动奖励", }) extraDrop := &activity.RankAwardData{} extraDrop.ItemId = int32(extraItemId) @@ -565,6 +565,7 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64) luckTime = 0 } damage := p.WelfData.NianData.AttackSumHp + logger.Logger.Tracef("sndi :%d,当前最大幸运值:%d,“总榜伤害值:%d", p.SnId, p.WelfData.NianData.AttackMaxHp, p.WelfData.NianData.AttackSumHp) if damage < RankNeed { damage = 0 } @@ -582,6 +583,7 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64) log.LuckTime = luckTime } mq.Write(log) + logger.Logger.Tracef("更新排行榜数据 snid :%d,log:%v", p.SnId, log) } } return nil From bdb9faa4716f9453fe7e5d77e9b37f554e95a872 Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Thu, 9 Jan 2025 17:08:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worldsrv/action_nian.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/worldsrv/action_nian.go b/worldsrv/action_nian.go index cb7c10a..1e3cd0f 100644 --- a/worldsrv/action_nian.go +++ b/worldsrv/action_nian.go @@ -331,7 +331,7 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64) for i := 0; i < count; i++ { //随机伤害值 randomValue := int64(rand.Intn(intSlice[1]-intSlice[0]+1) + intSlice[0]) - logger.Logger.Tracef("sndi :%d,随机到的伤害值是:%d,", p.SnId, randomValue) + logger.Logger.Tracef("snid :%v 随机到的伤害值是:%d", p.SnId, randomValue) //计算BUFF if p.WelfData.NianData.BuffCount > 0 { randomValue = randomValue + randomValue/2 @@ -492,7 +492,7 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64) var bossDieOther []*model.Item for _, info := range pool.List[0].BossDieOtherReward { if p.WelfData.NianData.OtherAwardNum[info.Id] >= info.DropUp { - logger.Logger.Trace("BOSS死亡 额外掉落达到上限 id = ", info.Id, "数量:", p.WelfData.NianData.OtherAwardNum[info.Id]) + logger.Logger.Trace("snid:", p.SnId, "BOSS死亡 额外掉落达到上限 id = ", info.Id, "数量:", p.WelfData.NianData.OtherAwardNum[info.Id]) continue } //随机 @@ -565,7 +565,7 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64) luckTime = 0 } damage := p.WelfData.NianData.AttackSumHp - logger.Logger.Tracef("sndi :%d,当前最大幸运值:%d,“总榜伤害值:%d", p.SnId, p.WelfData.NianData.AttackMaxHp, p.WelfData.NianData.AttackSumHp) + logger.Logger.Tracef("sndi :%v,当前最大幸运值:%v,“总榜伤害值:%v", p.SnId, p.WelfData.NianData.AttackMaxHp, p.WelfData.NianData.AttackSumHp) if damage < RankNeed { damage = 0 } @@ -583,7 +583,7 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64) log.LuckTime = luckTime } mq.Write(log) - logger.Logger.Tracef("更新排行榜数据 snid :%d,log:%v", p.SnId, log) + logger.Logger.Tracef("更新排行榜数据 snid :%v,log:%v", p.SnId, log) } } return nil