admin/bl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(decimal): 替换shopspring/decimal为govalues/decimal库

Browse Source
This commit is contained in:
1
2025-12-04 14:28:42 +00:00
parent b1748d1428
commit 022dc12461
81 changed files with 89 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
logic/controller/PET_FUSION.go
View File

@@ -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)

6
logic/go.mod
View File

@@ -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

4
logic/go.sum
View File

@@ -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=

2
logic/service/fight/boss/NewSeIdx_11.go
View File

@@ -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）

2
logic/service/fight/boss/NewSeIdx_22.go
View File

@@ -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）

2
logic/service/fight/boss/NewSeIdx_23.go
View File

@@ -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）

2
logic/service/fight/boss/NewSeIdx_25.go
View File

@@ -3,7 +3,7 @@ package effect
import (
"blazing/logic/service/fight/input"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
// 25. 如果 hp 被打成 0, 则立刻增加一些hp

2
logic/service/fight/boss/NewSeIdx_27.go
View File

@@ -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）

2
logic/service/fight/boss/NewSeIdx_28.go
View File

@@ -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 百分比）

2
logic/service/fight/boss/NewSeIdx_3.go
View File

@@ -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 百分比）

2
logic/service/fight/boss/NewSeIdx_32.go
View File

@@ -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 千分比）

2
logic/service/fight/boss/NewSeIdx_33.go
View File

@@ -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 百分比）

2
logic/service/fight/boss/NewSeIdx_36.go
View File

@@ -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）

2
logic/service/fight/boss/NewSeIdx_38.go
View File

@@ -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 百分比）

2
logic/service/fight/boss/NewSeIdx_39.go
View File

@@ -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）

2
logic/service/fight/boss/NewSeIdx_40.go
View File

@@ -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）

2
logic/service/fight/boss/NewSeIdx_41.go
View File

@@ -3,7 +3,7 @@ package effect
import (
"blazing/logic/service/fight/input"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
// 41. 每回合恢复自身n点体力；（a1: n）

2
logic/service/fight/boss/NewSeIdx_5.go
View File

@@ -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）

2
logic/service/fight/boss/NewSeIdx_61.go
View File

@@ -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）

2
logic/service/fight/boss/NewSeIdx_62.go
View File

@@ -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）

2
logic/service/fight/boss/NewSeIdx_63.go
View File

@@ -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）

2
logic/service/fight/boss/NewSeIdx_65.go
View File

@@ -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）

2
logic/service/fight/effect/EffectDefeatTrigger.go
View File

@@ -6,7 +6,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
// -----------------------------------------------------------

2
logic/service/fight/effect/effect_1.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_100.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
// 自身体力越少则威力越大

2
logic/service/fight/effect/effect_101.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_105.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_107.go
View File

@@ -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个等级

2
logic/service/fight/effect/effect_111.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
// 附加额外伤害，自身等级越高，附加的伤害越高

2
logic/service/fight/effect/effect_112.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_115.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_116.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_130.go
View File

@@ -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 {

2
logic/service/fight/effect/effect_134.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_135.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_136.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_21.go
View File

@@ -6,7 +6,7 @@ import (
"blazing/logic/service/fight/node"
"sync"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_28.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_29.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_31.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_34.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_36.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_37.go
View File

@@ -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倍

2
logic/service/fight/effect/effect_41.go
View File

@@ -6,7 +6,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_42.go
View File

@@ -6,7 +6,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
// ---- Effect42 ----

2
logic/service/fight/effect/effect_43.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_44.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
// n回合自己受到特殊攻击伤害减半

2
logic/service/fight/effect/effect_46.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
// "可完全抵挡n次攻击伤害 百分百减伤 ,后面还有锁伤

2
logic/service/fight/effect/effect_49.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
// 可以抵挡n点伤害

2
logic/service/fight/effect/effect_50.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
// n回合自身受到物理攻击伤害减半

2
logic/service/fight/effect/effect_53_90.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_54.go
View File

@@ -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

2
logic/service/fight/effect/effect_57.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_59.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_6.go
View File

@@ -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会反弹给自己

2
logic/service/fight/effect/effect_60.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_62.go
View File

@@ -7,7 +7,7 @@ import (
"fmt"
"math"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_68.go
View File

@@ -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点体力

2
logic/service/fight/effect/effect_7.go
View File

@@ -6,7 +6,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_71.go
View File

@@ -6,7 +6,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_72.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_73.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_76.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_77.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_776.go
View File

@@ -6,7 +6,7 @@ import (
"blazing/logic/service/fight/node"
"fmt"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
// ---- Effect776 ----

2
logic/service/fight/effect/effect_79.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_8.go
View File

@@ -6,7 +6,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_80.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_88.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_89.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

6
logic/service/fight/effect/effect_93.go
View File

@@ -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
}

2
logic/service/fight/effect/effect_98.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
/**

2
logic/service/fight/effect/effect_EffectConditionalAddDamage.go
View File

@@ -5,7 +5,7 @@ import (
"blazing/logic/service/fight/input"
"blazing/logic/service/fight/node"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
// -----------------------------------------------------------

2
logic/service/fight/effect/effect_status.go
View File

@@ -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

2
logic/service/fight/fightc.go
View File

@@ -12,7 +12,7 @@ import (
"reflect"
"github.com/barkimedes/go-deepcopy"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
// 处理技能攻击逻辑

2
logic/service/fight/info/BattlePetEntity.go
View File

@@ -8,7 +8,7 @@ import (
"math/rand"
"sync"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
)
// 战斗属性类型

2
logic/service/fight/info/BattleSkillEntity.go
View File

@@ -9,7 +9,7 @@ import (
"fmt"
"strconv"
"github.com/shopspring/decimal"
"github.com/govalues/decimal"
"github.com/tnnmigga/enum"
)

2
logic/service/fight/input/fight.go
View File

@@ -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"
)
// 计算暴击

2
logic/service/fight/input/input.go
View File

@@ -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 {

4
logic/service/fight/loop.go
View File

@@ -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{

2
modules/blazing/service/pet_fusion_service.go
View File

@@ -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表）