Commit Graph

1737 Commits

Author SHA1 Message Date
xinian
322d5ea64d feat: 新增战斗技能效果 524-580
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-17 15:25:08 +08:00
xinian
a2e4ec867c feat: 新增技能效果525、530、550、558、565
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-17 14:35:06 +08:00
xinian
a47b35df88 refactor: 优化怪物生成逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-17 14:14:03 +08:00
xinian
e4f2280625 编辑文件 Dockerfile
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-17 14:05:35 +08:00
xinian
4134603ec6 feat: 添加 cnb-openapi-skills 安装步骤
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-17 13:52:33 +08:00
xinian
937ddd0a97 fix: 修复宠物存活状态判定逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
移除 `NotAlive` 字段,改用 `Alive()` 方法通过 HP 判断存活状态,修正相关效果触发逻辑。
2026-03-17 13:34:50 +08:00
xinian
1e37d71878 fix: 修复属性设置逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-17 10:57:11 +08:00
xinian
ed8e3327b4 fix: 修正PVP模型PlayerID类型并优化空值处理
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-17 10:11:10 +08:00
xinian
15ecbcc7de fix: 修正宠物抓捕时间初始化
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-17 10:06:56 +08:00
昔念
ae41e15c1b ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(player): 修复玩家信息服务中的代码格式和类型错误

- 修复了代码中多余的空格导致的格式问题
- 将saveToLocalFile方法的参数类型从*model.Player更正为*model.PlayerInfo
- 更新了FallbackData结构体中PlayerData字段的类型定义
- 修改了玩家ID获取逻辑,从PlayerID改为UserID以匹配实际数据结构
- 简化了Save方法中的
2026-03-17 00:02:21 +08:00
昔念
9538ef2ab7 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(fight/effect): 修复技能回复血量计算错误

将技能回复血量的计算参数从 Args()[1] 改为 Args()[0],
确保正确使用第一个参数进行最大体力值的除法运算。
```
2026-03-16 22:36:20 +08:00
昔念
c07c87718b Merge branch 'main' of https://cnb.cool/blzing/blazing
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-16 22:30:21 +08:00
昔念
d74652373c ```
refactor(socket): 更新广播和退出逻辑中的类型引用

更新socket服务器中广播功能和退出功能的代码,
将player.Player类型替换为player.ClientData类型,
并相应调整方法调用以适应新的数据结构。

feat(map): 添加LoadOrStore方法支持

在并发安全的swiss map中新增LoadOrStore方法,
提供原子性的加载或存储功能,增强map的操作能力。

refactor(login): 优化登录逻辑中的玩家获取方式

重构登录控制器中获取玩家对象的方式,
直接从
2026-03-16 22:30:12 +08:00
xinian
70e56d6620 fix: 修正效果474参数索引错误
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-14 20:56:17 +08:00
xinian
65d8468520 fix: 修复战斗模式下的技能和物品使用逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-14 20:02:04 +08:00
xinian
3a39abe9c6 refactor: 重构每日重置逻辑条件判断
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-14 12:09:30 +08:00
xinian
4e1fdd6a22 fix: 修复宠物购买重复订单问题
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-14 10:27:26 +08:00
昔念
30dba8fee3 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(pet): 完善宠物购买功能的验证逻辑

- 添加宠物信息获取和多重验证检查,包括VIP状态、上架状态、存在性等
- 增强数据库事务操作的错误处理机制
- 优化用户余额扣减和宠物删除的事务安全性
- 修复原代码中查询逻辑的位置错误问题
```
2026-03-14 01:36:06 +08:00
昔念
42e315f2f3 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(fight/effect): 修改技能命中方法名为技能使用方法名

- 将 Effect458 结构体中的 SkillHit_ex 方法重命名为 Skill_Use
- 该变更涉及战斗效果模块中ID为458的技能效果实现
```
2026-03-14 01:08:01 +08:00
昔念
5ed58b1316 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(boss): 移除alpacadecimal依赖并修复伤害计算逻辑

移除了NewSeIdx_699中对alpacadecimal的依赖,
修复了技能伤害计算方式,不再使用最小值限制

fix(pet): 修正宠物服务中的代码格式和查询逻辑

修正了UPdatePrice方法中的代码格式问题,
为PetService添加了ListQueryOp配置,增加了免费和非VIP宠物的查询条件
```
2026-03-14 01:02:36 +08:00
昔念
47f806d112 Merge branch 'main' of https://cnb.cool/blzing/blazing
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-13 22:21:01 +08:00
昔念
001c86b724 ```
feat(player): 优化宠物购买功能的数据查询逻辑

- 修改BuyPet方法中的数据库查询方式,使用事务内的模型查询替代直接服务调用
- 添加了更安全的数据库事务处理机制,确保购买操作的数据一致性
- 重构了宠物信息验证逻辑,提升代码可读性和维护性
```
2026-03-13 22:20:54 +08:00
xinian
5bd32c61c2 feat: 新增效果526和542实现
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-13 21:48:30 +08:00
xinian
23649b2c20 fix: 修正 Effect71 技能逻辑顺序
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-13 21:31:49 +08:00
xinian
49b8b6d301 fix: 修复改价条件判断错误
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-13 16:06:49 +08:00
xinian
faad50b1df feat: 新增战斗技能效果并修复初始化注册
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-13 16:05:43 +08:00
xinian
0d44de2ea7 fix: 修复PVP赛季数据结构及相关逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-13 12:04:35 +08:00
xinian
b9985bff3b feat: 添加效果1146并优化条件判断逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-13 11:07:46 +08:00
昔念
499a0ba5ab ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(fight): 移除无用依赖并优化技能效果逻辑

- 移除了github.com/alpacahq/alpacadecimal依赖,简化了生命值恢复计算逻辑
- 修复了effect_4_5.go中技能参数索引错误,统一了概率判定和属性设置的参数使用
2026-03-12 21:01:58 +08:00
昔念
c59ff550a7 Merge branch 'main' of https://cnb.cool/blzing/blazing
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-12 19:34:04 +08:00
昔念
e568de2379 ```
feat(fight): 重构技能效果4和5的实现逻辑

- 移除旧的EffectStat通用结构体
- 为技能4和5创建独立的Effect4和Effect5结构体
- 简化技能触发逻辑,直接使用SideEffectArgs参数
- 技能4现在只影响自身属性,技能5只影响对方属性
- 移除targetOpponent布尔类型判断逻辑

fix(pet): 添加宠物上架数量限制

- 在UPdatePrice方法中增加销售宠物数量检查
- 当is_sale为1时检查
2026-03-12 19:33:56 +08:00
xinian
af09d1ae86 refactor: 优化RPC对战加入与
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-12 14:35:27 +08:00
xinian
7720138290 fix: 修复宠物购买查询用户ID错误
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-12 11:11:46 +08:00
xinian
3b4862e7a6 编辑文件 effect_413.go
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-12 10:07:28 +08:00
昔念
5e007894ea ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(fight): 添加技能实体空值检查

为Effect93的Skill_Use方法添加空值检查,当技能实体为空时直接返回true,
避免潜在的空指针引用错误
```
2026-03-12 01:17:02 +08:00
昔念
7f3bfff542 ```
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
feat(fight): 技能效果93功能优化

- 移除alpacadecimal依赖包导入
- 简化Effect93初始化代码
- 重命名OnSkill方法为Skill_Use以提高语义清晰度
- 直接使用Args()[1]替换SideEffectArgs避免额外参数传递
```
2026-03-12 01:16:26 +08:00
昔念
4c71aa9db1 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(player): 修复宠物等级查询接口返回值初始化问题

- 在PetBagController.Level方法中初始化BaseRes返回值
- 修正PetService.Pet_LEVEL_all查询语句,移除不必要的Fields()调用
- 优化数据库查询条件,确保正确获取等级大于100的宠物数据
```
2026-03-12 01:07:05 +08:00
昔念
bd09013d85 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(fight): 修复技能效果ID配置错误

- 修复NewSeIdx_66.go中空指针检查,避免程序崩溃
- 修正effect/407.go中技能ID从138改为407
- 修正effect/440.go中技能ID从138改为440,并修复类型引用错误
- 修正effect/523.go中属性设置对象错误,从Ctx().Opp改为Ctx().Our
- 修正effect_517.go中技能ID从452改为517
```
2026-03-11 23:38:51 +08:00
昔念
f091748542 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(fight): 优化战斗效果触发机制

- 移除 EffectDefeatTrigger 的 OnSkill 方法,简化标记逻辑
- 修复 SwitchOut 方法中的判断条件,正确检查对方精灵血量
- 移除多余的 can 字段检查,简化代码流程

feat(pet): 完善宠物购买事务处理

- 添加数据库事务支持,确保购买操作的原子性
- 增加余额检查的安全验证
- 使用原生SQL更新最大时间戳,避免
2026-03-11 22:51:52 +08:00
昔念
9cad3fc4e0 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(base): 修复用户免费金币字段名错误

- 修改 GetFreeGold 方法中返回的字段名从 GoldBean 改为 FreeGold
- 确保方法返回正确的免费金币数值
```
2026-03-11 13:27:28 +08:00
昔念
bef7c994ba ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(base): 兑换金币功能增加免费金币处理

用户兑换金币时同时处理免费金币的转换逻辑,
调用DuihuanFreeGold方法进行免费金币兑换

fix(player): 任务查询条件从task_id 500改为600

修改CanShop方法中的任务ID查询条件,
将硬编码的任务ID从500更正为600以匹配业务需求
```
2026-03-11 12:50:33 +08:00
昔念
a29a8ddec2 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(service): 宠物添加功能增加销售计数参数并优化价格更新逻辑

- 修改PetAdd方法签名,增加salecount参数用于追踪宠物销售次数
- 在多个控制器中统一调用PetAdd方法时传入0作为初始销售次数
- 临时禁用寒流枪活动中的宠物发放功能
- 优化UPdatePrice方法,添加错误处理和价格范围验证逻辑
- 调整宠物购买逻辑,使用免费金币系统并计算递增购买
2026-03-11 12:19:13 +08:00
昔念
46bc05ab29 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(pet): 添加精灵可用性检查

新增Free字段验证,确保购买时精灵确实存在
```
2026-03-11 01:48:46 +08:00
昔念
baa75334ea ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(pet): 修改宠物价格字段类型为uint32

统一宠物价格相关字段的数据类型,将sale_price从float32改为uint32,
以保持数据类型一致性并避免浮点数精度问题。

- 更新controller中PriseReq结构体的Price字段类型
- 修改model中Pet结构体的SalePrice字段类型
- 调整service中UPdatePrice方法的参数类型
```
2026-03-11 01:32:49 +08:00
昔念
6430de9c5d ```
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
feat(pet): 添加宠物是否可售状态字段

新增is_sale字段用于控制宠物是否可售,
同时修改价格更新接口以支持设置销售状态
```
2026-03-11 01:30:31 +08:00
昔念
b0130f39d5 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(user): 添加申请商店功能

- 新增ReqShop接口用于用户申请成为商店角色
- 验证用户是否满足申请条件(任务完成状态)
- 将符合条件的用户分配到商店角色ID 27

feat(pet): 设置宠物价格最小值限制

- 为宠物价格设置最低5的限制
- 防止价格过低影响游戏平衡

feat(task): 实现商店申请条件检查

- 添加CanShop方法检查用户是否完成特定任务
- 使用位集验证任务ID 500
2026-03-11 00:43:17 +08:00
昔念
ed8b1b71c1 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(pet): 完善宠物购买功能的错误处理和数据验证

- 在控制器层添加错误返回值处理,确保购买宠物操作的错误能够正确传递
- 添加时间验证逻辑,防止使用过期或异常的数据进行购买操作
- 修正金币更新逻辑,确保玩家和系统金币扣除与增加的准确性
- 优化代码结构,增强代码可读性和维护性
```
2026-03-10 23:24:33 +08:00
昔念
fc620d668f ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(player): 宠物购买功能优化

- 使用PetInfo_One_ID方法替代直接数据库查询
- 调整宠物购买时的价格计算逻辑,买入价格从*100调整为*102
- 卖出价格从*100调整为*98,买入扣款也相应调整为*102
- 删除宠物时使用Pet_del方法替代直接数据库删除操作
- 新增PetInfo_One_ID方法
2026-03-10 23:05:43 +08:00
昔念
6792e0e79a ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(pet): 添加宠物交易功能

- 新增ModPrise接口用于修改宠物售价
- 新增BuyPet接口用于购买宠物
- 修改Pet模型中SalePrice字段类型为float32
- 实现宠物购买逻辑,包括价格验证、余额检查和交易处理
- 更新查询条件以支持宠物交易状态筛选
```
2026-03-10 22:20:36 +08:00
昔念
69350bb79e ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(fight): 修复战斗效果类型初始化错误

- 将EffectType.NewSel更改为EffectType.Skill以修正技能效果类型
- 移除effect_415中的多余变量声明,直接使用参数值进行治疗计算

feat(admin): 添加用户金币增加功能

- 新增UserGoldAddReq结构体用于处理金币添加请求
- 实现GoldAdd方法支持管理员为指定用户增加金币

feat(pet):
2026-03-10 20:51:48 +08:00