diff --git a/logic/controller/PET_FUSION.go b/logic/controller/PET_FUSION.go index f4dad2f33..094282390 100644 --- a/logic/controller/PET_FUSION.go +++ b/logic/controller/PET_FUSION.go @@ -8,7 +8,7 @@ import ( "blazing/modules/blazing/model" "blazing/modules/blazing/service" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) func (h Controller) PetFusion(data *pet.C2S_PetFusion, c *player.Player) (result *pet.PetFusionInfo, err errorcode.ErrorCode) { @@ -52,7 +52,7 @@ func (h Controller) PetFusion(data *pet.C2S_PetFusion, c *player.Player) (result } effect := int(service.NewPetFusionMaterialService().Data(data.Item1)) - dv1 := decimal.NewFromInt(2).Div(decimal.NewFromInt(3)).Mul(decimal.NewFromInt(int64(Mcatchpetinfo.Dv))) + dv1 := decimal.newf(2).Div(decimal.NewFromInt(3)).Mul(decimal.NewFromInt(int64(Mcatchpetinfo.Dv))) dv2 := decimal.NewFromInt(1).Div(decimal.NewFromInt(3)).Mul(decimal.NewFromInt(int64(Auxpetinfo.Dv))) dv := dv1.Add(dv2).Add(decimal.NewFromInt(1)).IntPart() r := model.GenPetInfo(resid, int(dv), int(natureId), effect, -1, 1) diff --git a/logic/go.mod b/logic/go.mod index d09eef1e9..0f69c4e20 100644 --- a/logic/go.mod +++ b/logic/go.mod @@ -13,12 +13,14 @@ require ( github.com/lunixbochs/struc v0.0.0-20241101090106-8d528fa2c543 github.com/panjf2000/ants/v2 v2.11.3 github.com/pointernil/bitset32 v0.0.1 - github.com/shopspring/decimal v1.4.0 github.com/tnnmigga/enum v1.0.2 golang.org/x/sync v0.11.0 ) -require github.com/valyala/fastrand v1.1.0 // indirect +require ( + github.com/govalues/decimal v0.1.2 // indirect + github.com/valyala/fastrand v1.1.0 // indirect +) require ( github.com/BurntSushi/toml v1.4.0 // indirect diff --git a/logic/go.sum b/logic/go.sum index 99ad3371b..63ff88b05 100644 --- a/logic/go.sum +++ b/logic/go.sum @@ -46,6 +46,8 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/govalues/decimal v0.1.2 h1:cHGR2FBD3M0zPY88CUqdtfqAcd4JHpug7u4nFe375Gs= +github.com/govalues/decimal v0.1.2/go.mod h1:NfqNdX/GQBotCdmXtzckjhq54itVCX1Git3psSgom8A= github.com/grokify/html-strip-tags-go v0.1.0 h1:03UrQLjAny8xci+R+qjCce/MYnpNXCtgzltlQbOBae4= github.com/grokify/html-strip-tags-go v0.1.0/go.mod h1:ZdzgfHEzAfz9X6Xe5eBLVblWIxXfYSQ40S/VKrAOGpc= github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8= @@ -92,8 +94,6 @@ github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDN github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/samber/lo v1.52.0 h1:Rvi+3BFHES3A8meP33VPAxiBZX/Aws5RxrschYGjomw= github.com/samber/lo v1.52.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0= -github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= -github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/tnnmigga/enum v1.0.2 h1:Yvchx0Esc01X5HiphW78sKzH/RXKttdFsfPO1ARiOa4= diff --git a/logic/service/fight/boss/NewSeIdx_11.go b/logic/service/fight/boss/NewSeIdx_11.go index ca3683bb7..f1808e50f 100644 --- a/logic/service/fight/boss/NewSeIdx_11.go +++ b/logic/service/fight/boss/NewSeIdx_11.go @@ -4,7 +4,7 @@ import ( "blazing/logic/service/fight/info" "blazing/logic/service/fight/input" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 11. 受到任何攻击都会反弹1/n的伤害给对方;（a1: n） diff --git a/logic/service/fight/boss/NewSeIdx_22.go b/logic/service/fight/boss/NewSeIdx_22.go index cc474c5ae..b351cabc8 100644 --- a/logic/service/fight/boss/NewSeIdx_22.go +++ b/logic/service/fight/boss/NewSeIdx_22.go @@ -4,7 +4,7 @@ import ( "blazing/logic/service/fight/info" "blazing/logic/service/fight/input" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 22. 被打时受到直接攻击伤害提高至n倍;（a1: n） diff --git a/logic/service/fight/boss/NewSeIdx_23.go b/logic/service/fight/boss/NewSeIdx_23.go index ebdd8fd31..52dc05962 100644 --- a/logic/service/fight/boss/NewSeIdx_23.go +++ b/logic/service/fight/boss/NewSeIdx_23.go @@ -6,7 +6,7 @@ import ( "blazing/logic/service/fight/input" "math" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 23. 自身体力降到N以下时, 每次（针对多宠）攻击必定秒杀对方, 且必定先手;（a1: high 16, a2: low 16） diff --git a/logic/service/fight/boss/NewSeIdx_25.go b/logic/service/fight/boss/NewSeIdx_25.go index 210ea4653..604b62ba2 100644 --- a/logic/service/fight/boss/NewSeIdx_25.go +++ b/logic/service/fight/boss/NewSeIdx_25.go @@ -3,7 +3,7 @@ package effect import ( "blazing/logic/service/fight/input" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 25. 如果 hp 被打成 0, 则立刻增加一些hp diff --git a/logic/service/fight/boss/NewSeIdx_27.go b/logic/service/fight/boss/NewSeIdx_27.go index 517b65a37..a78ebd61c 100644 --- a/logic/service/fight/boss/NewSeIdx_27.go +++ b/logic/service/fight/boss/NewSeIdx_27.go @@ -4,7 +4,7 @@ import ( "blazing/logic/service/fight/info" "blazing/logic/service/fight/input" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 27. 按一定的属性顺序出招的技能才能对去血（a1-a8: mon_type） diff --git a/logic/service/fight/boss/NewSeIdx_28.go b/logic/service/fight/boss/NewSeIdx_28.go index 8398aa23b..62d27a490 100644 --- a/logic/service/fight/boss/NewSeIdx_28.go +++ b/logic/service/fight/boss/NewSeIdx_28.go @@ -4,7 +4,7 @@ import ( "blazing/logic/service/fight/info" "blazing/logic/service/fight/input" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 28. XX系技能伤害增加n%（a1: mon_type, a2: n 百分比） diff --git a/logic/service/fight/boss/NewSeIdx_3.go b/logic/service/fight/boss/NewSeIdx_3.go index b3ec30a3c..f2b1cbe56 100644 --- a/logic/service/fight/boss/NewSeIdx_3.go +++ b/logic/service/fight/boss/NewSeIdx_3.go @@ -4,7 +4,7 @@ import ( "blazing/logic/service/fight/info" "blazing/logic/service/fight/input" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 3. 受到任何伤害减免 n%（a1: 0-100 百分比） diff --git a/logic/service/fight/boss/NewSeIdx_32.go b/logic/service/fight/boss/NewSeIdx_32.go index b45133415..0f965affc 100644 --- a/logic/service/fight/boss/NewSeIdx_32.go +++ b/logic/service/fight/boss/NewSeIdx_32.go @@ -4,7 +4,7 @@ import ( "blazing/logic/service/fight/info" "blazing/logic/service/fight/input" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 32. 进攻类技能有n%几率秒杀对方;（a1: n 千分比） diff --git a/logic/service/fight/boss/NewSeIdx_33.go b/logic/service/fight/boss/NewSeIdx_33.go index 355470915..076a291e8 100644 --- a/logic/service/fight/boss/NewSeIdx_33.go +++ b/logic/service/fight/boss/NewSeIdx_33.go @@ -3,7 +3,7 @@ package effect import ( "blazing/logic/service/fight/input" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 33. 精灵体力降低到 1/n 时有 m% 几率体力回满;（a1: n, a2: m 百分比） diff --git a/logic/service/fight/boss/NewSeIdx_36.go b/logic/service/fight/boss/NewSeIdx_36.go index 54e2a04e4..bbeb0bfa6 100644 --- a/logic/service/fight/boss/NewSeIdx_36.go +++ b/logic/service/fight/boss/NewSeIdx_36.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/info" "blazing/logic/service/fight/input" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 36. 按5回合轮换属性顺序出招的技能才能对去血（a1-a8: btl_stat/elem_type） diff --git a/logic/service/fight/boss/NewSeIdx_38.go b/logic/service/fight/boss/NewSeIdx_38.go index f36681f48..ad0a5b979 100644 --- a/logic/service/fight/boss/NewSeIdx_38.go +++ b/logic/service/fight/boss/NewSeIdx_38.go @@ -4,7 +4,7 @@ import ( "blazing/logic/service/fight/info" "blazing/logic/service/fight/input" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 38. 自身造成的伤害增加n%;（a1: n 百分比） diff --git a/logic/service/fight/boss/NewSeIdx_39.go b/logic/service/fight/boss/NewSeIdx_39.go index 3ef3b0756..4e88a5852 100644 --- a/logic/service/fight/boss/NewSeIdx_39.go +++ b/logic/service/fight/boss/NewSeIdx_39.go @@ -4,7 +4,7 @@ import ( "blazing/logic/service/fight/info" "blazing/logic/service/fight/input" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 39. 偶数伤害(dmg) 提升到 n * dmg;（a1: n） diff --git a/logic/service/fight/boss/NewSeIdx_40.go b/logic/service/fight/boss/NewSeIdx_40.go index 24e43c4cf..6892f3817 100644 --- a/logic/service/fight/boss/NewSeIdx_40.go +++ b/logic/service/fight/boss/NewSeIdx_40.go @@ -4,7 +4,7 @@ import ( "blazing/logic/service/fight/info" "blazing/logic/service/fight/input" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 40. 奇数伤害(dmg) 改为 1/n * dmg;（a1: n） diff --git a/logic/service/fight/boss/NewSeIdx_41.go b/logic/service/fight/boss/NewSeIdx_41.go index fd0c0d574..fe13c8ab8 100644 --- a/logic/service/fight/boss/NewSeIdx_41.go +++ b/logic/service/fight/boss/NewSeIdx_41.go @@ -3,7 +3,7 @@ package effect import ( "blazing/logic/service/fight/input" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 41. 每回合恢复自身n点体力；（a1: n） diff --git a/logic/service/fight/boss/NewSeIdx_5.go b/logic/service/fight/boss/NewSeIdx_5.go index 40d9e8a91..d87ecfbc6 100644 --- a/logic/service/fight/boss/NewSeIdx_5.go +++ b/logic/service/fight/boss/NewSeIdx_5.go @@ -4,8 +4,8 @@ import ( "blazing/logic/service/fight/info" "blazing/logic/service/fight/input" + "github.com/govalues/decimal" "github.com/samber/lo" - "github.com/shopspring/decimal" ) // 5. 只受到来自普通属性和某类属性的攻击伤害（a1-a8: mon_type） diff --git a/logic/service/fight/boss/NewSeIdx_61.go b/logic/service/fight/boss/NewSeIdx_61.go index ca74983cc..60f0579c7 100644 --- a/logic/service/fight/boss/NewSeIdx_61.go +++ b/logic/service/fight/boss/NewSeIdx_61.go @@ -4,7 +4,7 @@ import ( "blazing/logic/service/fight/info" "blazing/logic/service/fight/input" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 61. n%几率完全抵挡一次伤害（a1: n） diff --git a/logic/service/fight/boss/NewSeIdx_62.go b/logic/service/fight/boss/NewSeIdx_62.go index 0c9bc820f..3a8226236 100644 --- a/logic/service/fight/boss/NewSeIdx_62.go +++ b/logic/service/fight/boss/NewSeIdx_62.go @@ -4,7 +4,7 @@ import ( "blazing/logic/service/fight/info" "blazing/logic/service/fight/input" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 62. 物理攻击有n%几率使伤害提高m点（a1: n, a2: m） diff --git a/logic/service/fight/boss/NewSeIdx_63.go b/logic/service/fight/boss/NewSeIdx_63.go index e536a6a86..69642a2bb 100644 --- a/logic/service/fight/boss/NewSeIdx_63.go +++ b/logic/service/fight/boss/NewSeIdx_63.go @@ -4,7 +4,7 @@ import ( "blazing/logic/service/fight/info" "blazing/logic/service/fight/input" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 63. 特殊攻击有n%几率使伤害提高m点（a1: n, a2: m） diff --git a/logic/service/fight/boss/NewSeIdx_65.go b/logic/service/fight/boss/NewSeIdx_65.go index f52b50c7c..3333d0ea3 100644 --- a/logic/service/fight/boss/NewSeIdx_65.go +++ b/logic/service/fight/boss/NewSeIdx_65.go @@ -4,7 +4,7 @@ import ( "blazing/logic/service/fight/info" "blazing/logic/service/fight/input" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 65. 物理攻击或特殊攻击伤害增加m%（a1: 1=物理/3=特殊, a2: m） diff --git a/logic/service/fight/effect/EffectDefeatTrigger.go b/logic/service/fight/effect/EffectDefeatTrigger.go index 495ae2995..0f8bc7edd 100644 --- a/logic/service/fight/effect/EffectDefeatTrigger.go +++ b/logic/service/fight/effect/EffectDefeatTrigger.go @@ -6,7 +6,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // ----------------------------------------------------------- diff --git a/logic/service/fight/effect/effect_1.go b/logic/service/fight/effect/effect_1.go index bfe655003..80a920492 100644 --- a/logic/service/fight/effect/effect_1.go +++ b/logic/service/fight/effect/effect_1.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_100.go b/logic/service/fight/effect/effect_100.go index 8a61e1d3d..ee1a961fb 100644 --- a/logic/service/fight/effect/effect_100.go +++ b/logic/service/fight/effect/effect_100.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 自身体力越少则威力越大 diff --git a/logic/service/fight/effect/effect_101.go b/logic/service/fight/effect/effect_101.go index 0c381b6b3..47aa67b0a 100644 --- a/logic/service/fight/effect/effect_101.go +++ b/logic/service/fight/effect/effect_101.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_105.go b/logic/service/fight/effect/effect_105.go index 1e5666b9a..6ef1a16ed 100644 --- a/logic/service/fight/effect/effect_105.go +++ b/logic/service/fight/effect/effect_105.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_107.go b/logic/service/fight/effect/effect_107.go index 09d7f18dd..5c2172973 100644 --- a/logic/service/fight/effect/effect_107.go +++ b/logic/service/fight/effect/effect_107.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) //若本次攻击造成的伤害小于n 则自身xx等级提升1个等级 diff --git a/logic/service/fight/effect/effect_111.go b/logic/service/fight/effect/effect_111.go index 549b9f7b4..68c81e572 100644 --- a/logic/service/fight/effect/effect_111.go +++ b/logic/service/fight/effect/effect_111.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 附加额外伤害，自身等级越高，附加的伤害越高 diff --git a/logic/service/fight/effect/effect_112.go b/logic/service/fight/effect/effect_112.go index 4c8e8229c..9be612215 100644 --- a/logic/service/fight/effect/effect_112.go +++ b/logic/service/fight/effect/effect_112.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_115.go b/logic/service/fight/effect/effect_115.go index 129ea5d4e..f4d09783c 100644 --- a/logic/service/fight/effect/effect_115.go +++ b/logic/service/fight/effect/effect_115.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_116.go b/logic/service/fight/effect/effect_116.go index 89a69dfb2..12a6a6635 100644 --- a/logic/service/fight/effect/effect_116.go +++ b/logic/service/fight/effect/effect_116.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_130.go b/logic/service/fight/effect/effect_130.go index 5ac381dcf..e31cecf79 100644 --- a/logic/service/fight/effect/effect_130.go +++ b/logic/service/fight/effect/effect_130.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) type Effect130 struct { diff --git a/logic/service/fight/effect/effect_134.go b/logic/service/fight/effect/effect_134.go index 0b274f807..958e57acf 100644 --- a/logic/service/fight/effect/effect_134.go +++ b/logic/service/fight/effect/effect_134.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_135.go b/logic/service/fight/effect/effect_135.go index 70b91ac6d..2f2e32051 100644 --- a/logic/service/fight/effect/effect_135.go +++ b/logic/service/fight/effect/effect_135.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_136.go b/logic/service/fight/effect/effect_136.go index 5ce240107..81bcc0466 100644 --- a/logic/service/fight/effect/effect_136.go +++ b/logic/service/fight/effect/effect_136.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_21.go b/logic/service/fight/effect/effect_21.go index d8f229ea8..e13df6bac 100644 --- a/logic/service/fight/effect/effect_21.go +++ b/logic/service/fight/effect/effect_21.go @@ -6,7 +6,7 @@ import ( "blazing/logic/service/fight/node" "sync" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_28.go b/logic/service/fight/effect/effect_28.go index 5c12fdda6..99cbe24c5 100644 --- a/logic/service/fight/effect/effect_28.go +++ b/logic/service/fight/effect/effect_28.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_29.go b/logic/service/fight/effect/effect_29.go index 0a69f7e38..24be74b49 100644 --- a/logic/service/fight/effect/effect_29.go +++ b/logic/service/fight/effect/effect_29.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_31.go b/logic/service/fight/effect/effect_31.go index 3de87f93c..fa2f497ea 100644 --- a/logic/service/fight/effect/effect_31.go +++ b/logic/service/fight/effect/effect_31.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_34.go b/logic/service/fight/effect/effect_34.go index 68d086137..c80251d12 100644 --- a/logic/service/fight/effect/effect_34.go +++ b/logic/service/fight/effect/effect_34.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_36.go b/logic/service/fight/effect/effect_36.go index a866d12a2..b2970f72b 100644 --- a/logic/service/fight/effect/effect_36.go +++ b/logic/service/fight/effect/effect_36.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_37.go b/logic/service/fight/effect/effect_37.go index 801ff4d56..2acb9e70d 100644 --- a/logic/service/fight/effect/effect_37.go +++ b/logic/service/fight/effect/effect_37.go @@ -4,7 +4,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 自身体力小于1/n时威力为m倍 diff --git a/logic/service/fight/effect/effect_41.go b/logic/service/fight/effect/effect_41.go index 8b4d84af8..2b1887be4 100644 --- a/logic/service/fight/effect/effect_41.go +++ b/logic/service/fight/effect/effect_41.go @@ -6,7 +6,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_42.go b/logic/service/fight/effect/effect_42.go index a4f146baa..d4bee6fc4 100644 --- a/logic/service/fight/effect/effect_42.go +++ b/logic/service/fight/effect/effect_42.go @@ -6,7 +6,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // ---- Effect42 ---- diff --git a/logic/service/fight/effect/effect_43.go b/logic/service/fight/effect/effect_43.go index 80629e456..edb196922 100644 --- a/logic/service/fight/effect/effect_43.go +++ b/logic/service/fight/effect/effect_43.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_44.go b/logic/service/fight/effect/effect_44.go index 471054027..d106fefe8 100644 --- a/logic/service/fight/effect/effect_44.go +++ b/logic/service/fight/effect/effect_44.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // n回合自己受到特殊攻击伤害减半 diff --git a/logic/service/fight/effect/effect_46.go b/logic/service/fight/effect/effect_46.go index b990f349f..b454b8f9c 100644 --- a/logic/service/fight/effect/effect_46.go +++ b/logic/service/fight/effect/effect_46.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // "可完全抵挡n次攻击伤害 百分百减伤 ,后面还有锁伤 diff --git a/logic/service/fight/effect/effect_49.go b/logic/service/fight/effect/effect_49.go index d787ee270..de12eb456 100644 --- a/logic/service/fight/effect/effect_49.go +++ b/logic/service/fight/effect/effect_49.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 可以抵挡n点伤害 diff --git a/logic/service/fight/effect/effect_50.go b/logic/service/fight/effect/effect_50.go index 3fbe1d2d4..bd0c88cd0 100644 --- a/logic/service/fight/effect/effect_50.go +++ b/logic/service/fight/effect/effect_50.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // n回合自身受到物理攻击伤害减半 diff --git a/logic/service/fight/effect/effect_53_90.go b/logic/service/fight/effect/effect_53_90.go index 25fe29f3f..3f2e3609f 100644 --- a/logic/service/fight/effect/effect_53_90.go +++ b/logic/service/fight/effect/effect_53_90.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_54.go b/logic/service/fight/effect/effect_54.go index 2db6c53fa..fff11a54a 100644 --- a/logic/service/fight/effect/effect_54.go +++ b/logic/service/fight/effect/effect_54.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // n 回合使对方攻击伤害是正常状态下的 1/m diff --git a/logic/service/fight/effect/effect_57.go b/logic/service/fight/effect/effect_57.go index 8bd1a45da..a280342f0 100644 --- a/logic/service/fight/effect/effect_57.go +++ b/logic/service/fight/effect/effect_57.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_59.go b/logic/service/fight/effect/effect_59.go index edb72aba1..828317316 100644 --- a/logic/service/fight/effect/effect_59.go +++ b/logic/service/fight/effect/effect_59.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_6.go b/logic/service/fight/effect/effect_6.go index 61749f0c5..ca18d21dd 100644 --- a/logic/service/fight/effect/effect_6.go +++ b/logic/service/fight/effect/effect_6.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) //对方所受伤害的1/n会反弹给自己 diff --git a/logic/service/fight/effect/effect_60.go b/logic/service/fight/effect/effect_60.go index de7483710..b80f19ca7 100644 --- a/logic/service/fight/effect/effect_60.go +++ b/logic/service/fight/effect/effect_60.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_62.go b/logic/service/fight/effect/effect_62.go index f60e7354c..0a6aa1ee4 100644 --- a/logic/service/fight/effect/effect_62.go +++ b/logic/service/fight/effect/effect_62.go @@ -7,7 +7,7 @@ import ( "fmt" "math" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_68.go b/logic/service/fight/effect/effect_68.go index af8bf97e7..832ce2a25 100644 --- a/logic/service/fight/effect/effect_68.go +++ b/logic/service/fight/effect/effect_68.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 1回合内，受到致死攻击时则余下1点体力 diff --git a/logic/service/fight/effect/effect_7.go b/logic/service/fight/effect/effect_7.go index 16af728d3..defc65c2c 100644 --- a/logic/service/fight/effect/effect_7.go +++ b/logic/service/fight/effect/effect_7.go @@ -6,7 +6,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_71.go b/logic/service/fight/effect/effect_71.go index 663a203ee..30afadb62 100644 --- a/logic/service/fight/effect/effect_71.go +++ b/logic/service/fight/effect/effect_71.go @@ -6,7 +6,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_72.go b/logic/service/fight/effect/effect_72.go index bac7375fa..e32bf26a8 100644 --- a/logic/service/fight/effect/effect_72.go +++ b/logic/service/fight/effect/effect_72.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_73.go b/logic/service/fight/effect/effect_73.go index 50e9e1f05..d095b43d2 100644 --- a/logic/service/fight/effect/effect_73.go +++ b/logic/service/fight/effect/effect_73.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_76.go b/logic/service/fight/effect/effect_76.go index cb7feccc2..57b0c6c0c 100644 --- a/logic/service/fight/effect/effect_76.go +++ b/logic/service/fight/effect/effect_76.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_77.go b/logic/service/fight/effect/effect_77.go index c8143535c..e46436a97 100644 --- a/logic/service/fight/effect/effect_77.go +++ b/logic/service/fight/effect/effect_77.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_776.go b/logic/service/fight/effect/effect_776.go index 72d2bb77b..fd86460fa 100644 --- a/logic/service/fight/effect/effect_776.go +++ b/logic/service/fight/effect/effect_776.go @@ -6,7 +6,7 @@ import ( "blazing/logic/service/fight/node" "fmt" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // ---- Effect776 ---- diff --git a/logic/service/fight/effect/effect_79.go b/logic/service/fight/effect/effect_79.go index f2d26bc71..59fd45e24 100644 --- a/logic/service/fight/effect/effect_79.go +++ b/logic/service/fight/effect/effect_79.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_8.go b/logic/service/fight/effect/effect_8.go index f4c428b05..072d8faed 100644 --- a/logic/service/fight/effect/effect_8.go +++ b/logic/service/fight/effect/effect_8.go @@ -6,7 +6,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_80.go b/logic/service/fight/effect/effect_80.go index 1f16ef510..ba0883600 100644 --- a/logic/service/fight/effect/effect_80.go +++ b/logic/service/fight/effect/effect_80.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_88.go b/logic/service/fight/effect/effect_88.go index 1b6214dc6..aecb1066d 100644 --- a/logic/service/fight/effect/effect_88.go +++ b/logic/service/fight/effect/effect_88.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_89.go b/logic/service/fight/effect/effect_89.go index b6f6fa396..f5c259b69 100644 --- a/logic/service/fight/effect/effect_89.go +++ b/logic/service/fight/effect/effect_89.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_93.go b/logic/service/fight/effect/effect_93.go index 5803cad55..7f0e9d9ee 100644 --- a/logic/service/fight/effect/effect_93.go +++ b/logic/service/fight/effect/effect_93.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** @@ -28,13 +28,13 @@ func (e *Effect93) OnSkill() bool { return true } // 概率判定 - ok, _, _ := e.Input.Player.Roll(e.Args()[1], 100) + ok, _, _ := e.Input.Player.Roll(e.Args()[0], 100) if !ok { return true } e.Ctx().Opp.Damage(e.Ctx().Our, &info.DamageZone{ Type: info.DamageType.Fixed, - Damage: decimal.NewFromInt(int64(e.SideEffectArgs[0])), + Damage: decimal.NewFromInt(int64(e.SideEffectArgs[1])), }) return true } diff --git a/logic/service/fight/effect/effect_98.go b/logic/service/fight/effect/effect_98.go index edb6d7477..e3fb478c7 100644 --- a/logic/service/fight/effect/effect_98.go +++ b/logic/service/fight/effect/effect_98.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) /** diff --git a/logic/service/fight/effect/effect_EffectConditionalAddDamage.go b/logic/service/fight/effect/effect_EffectConditionalAddDamage.go index 97e23f216..5fd54dee4 100644 --- a/logic/service/fight/effect/effect_EffectConditionalAddDamage.go +++ b/logic/service/fight/effect/effect_EffectConditionalAddDamage.go @@ -5,7 +5,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // ----------------------------------------------------------- diff --git a/logic/service/fight/effect/effect_status.go b/logic/service/fight/effect/effect_status.go index 12d2e4e92..b5553f1e4 100644 --- a/logic/service/fight/effect/effect_status.go +++ b/logic/service/fight/effect/effect_status.go @@ -8,7 +8,7 @@ import ( "blazing/logic/service/fight/input" "blazing/logic/service/fight/node" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 修正拼写错误：BaseSataus -> BaseStatus diff --git a/logic/service/fight/fightc.go b/logic/service/fight/fightc.go index ac0a6eb4a..8f3f1f5be 100644 --- a/logic/service/fight/fightc.go +++ b/logic/service/fight/fightc.go @@ -12,7 +12,7 @@ import ( "reflect" "github.com/barkimedes/go-deepcopy" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 处理技能攻击逻辑 diff --git a/logic/service/fight/info/BattlePetEntity.go b/logic/service/fight/info/BattlePetEntity.go index 96d870aa7..ecc4cce1b 100644 --- a/logic/service/fight/info/BattlePetEntity.go +++ b/logic/service/fight/info/BattlePetEntity.go @@ -8,7 +8,7 @@ import ( "math/rand" "sync" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 战斗属性类型 diff --git a/logic/service/fight/info/BattleSkillEntity.go b/logic/service/fight/info/BattleSkillEntity.go index 6aacbd459..6c2dbd65c 100644 --- a/logic/service/fight/info/BattleSkillEntity.go +++ b/logic/service/fight/info/BattleSkillEntity.go @@ -9,7 +9,7 @@ import ( "fmt" "strconv" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" "github.com/tnnmigga/enum" ) diff --git a/logic/service/fight/input/fight.go b/logic/service/fight/input/fight.go index c1b31dbdc..e8c58c664 100644 --- a/logic/service/fight/input/fight.go +++ b/logic/service/fight/input/fight.go @@ -9,7 +9,7 @@ import ( "blazing/logic/service/fight/info" "github.com/gogf/gf/v2/util/grand" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // 计算暴击 diff --git a/logic/service/fight/input/input.go b/logic/service/fight/input/input.go index f0b62dae2..7d40af5ec 100644 --- a/logic/service/fight/input/input.go +++ b/logic/service/fight/input/input.go @@ -8,8 +8,8 @@ import ( "blazing/logic/service/fight/action" "blazing/logic/service/fight/info" + "github.com/govalues/decimal" "github.com/jinzhu/copier" - "github.com/shopspring/decimal" ) type Input struct { diff --git a/logic/service/fight/loop.go b/logic/service/fight/loop.go index 401909a96..f5ef0cd5f 100644 --- a/logic/service/fight/loop.go +++ b/logic/service/fight/loop.go @@ -15,7 +15,7 @@ import ( "time" "github.com/gogf/gf/v2/util/gconv" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) func (f *FightC) battleLoop() { @@ -72,7 +72,7 @@ func (f *FightC) battleLoop() { }) if f.Reason == info.BattleOverReason.Cacthok { - f.WinnerId=f.ownerID + f.WinnerId = f.ownerID f.Our.Player.(*player.Player).Service.Pet.PetAdd(&f.Opp.Player.GetInfo().PetList[0]) f.Our.Player.SendPackCmd(2409, &info.CatchMonsterOutboundInfo{ diff --git a/modules/blazing/service/pet_fusion_service.go b/modules/blazing/service/pet_fusion_service.go index 30d5d21fd..174667e82 100644 --- a/modules/blazing/service/pet_fusion_service.go +++ b/modules/blazing/service/pet_fusion_service.go @@ -6,7 +6,7 @@ import ( "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/util/grand" - "github.com/shopspring/decimal" + "github.com/govalues/decimal" ) // PetFusionService 宠物融合配方主表Service（对应pet_fusion表）