1305 Commits

Author SHA1 Message Date
xinian
875ad668aa feat: 实现战斗效果逻辑和接口重构
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-28 21:57:22 +08:00
xinian
61ccbc6c62 1
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-28 16:56:00 +08:00
昔念
d55c96e383 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(database): 添加多个玩家相关表的联合唯一约束

- 为player_talk表添加玩家+挖矿联合唯一索引
- 为player_task表添加玩家+任务联合唯一索引
- 为player_title表添加玩家+称号联合唯一索引
- 为player_pet表添加玩家+精灵联合唯一索引
- 为player_cdk_log表添加玩家+CDK联合唯一索引
- 为player_egg表添加玩家孵蛋联合唯一索引
- 为player_pvp表添加PVP索引
- 为player_sign_in_log表添加签到联合唯一索引
- 为player_room_house表添加房间索引

fix(user-talk): 修复获取聊天配置
2026-03-28 02:22:15 +08:00
昔念
06091ff42c ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(item_buy): 优化购买逻辑并添加库存限制功能

- 将变量名 is 改为 ok,提高代码可读性
- 移除未使用的变量 addSuccess
- 重构购买成功逻辑,确保物品添加成功后才扣减金币
- 在 talk.go 中修改判断条件,使用 Limit 字段而非 Type 字段
- 在 user_talk.go 中添加 Limit 字段用于限制数量配置
```
2026-03-28 01:46:52 +08:00
xinian
0622f4710b feat: 添加道具捕捉后的回调机制
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-27 17:06:18 +08:00
xinian
6767075dcd fix: 修复购买道具数量上限校验逻辑
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-27 16:53:07 +08:00
xinian
ab31947c39 1
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-27 13:51:57 +08:00
xinian
40411ba84b fix: 修复商品购买和服务相关逻辑问题
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-27 12:56:29 +08:00
昔念
ed84e4d2df ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(fight): 重构精灵特效类型枚举结构
2026-03-27 00:28:25 +08:00
昔念
a3740d417d fix: correct typo in error message
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-26 05:45:36 +08:00
昔念
619e4b50ca ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(pet): 重构宠物服务方法命名和优化数据库操作

- 统一PetService中方法命名规范,将驼峰命名改为标准驼峰格式
- 修复拼写错误:UPdate -> Update, UPdateFree -> UpdateFree等
- 重命名查询方法:PetInfo_One -> PetInfoOneByCatchTime,
  PetInfo_One_ID -> PetInfoOneByID, PetInfo_One_ohter -> PetInfoOneOther
- 优化BuyPet方法中的事务处理逻辑,使用
2026-03-26 04:51:36 +08:00
昔念
0d2e307021 ```
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
feat(pet): 修改宠物更新逻辑返回值类型

将PetService.UPdate方法的返回值从error改为bool类型,
并在控制器中相应调整错误处理逻辑,统一使用布尔值判断操作结果。
```
2026-03-26 02:35:43 +08:00
昔念
1f614e4904 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(player): 优化宠物信息获取逻辑

在GetPetInfo方法中添加必要的空行以提高代码可读性,
确保代码结构更清晰易维护。
```
2026-03-25 23:29:52 +08:00
xinian
b3cc06cd38 refactor: 优化蛋卡抽奖逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-24 01:52:56 +08:00
xinian
0aba7e7ccb refactor: 简化战斗宠物列表处理逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-24 01:38:02 +08:00
xinian
133d15e392 refactor: 修复 NewSel700 技能使用方法名
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-24 00:25:32 +08:00
xinian
d8366616e0 feat: 支持单人宠物对战模式
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-23 22:25:07 +08:00
xinian
41a1bfb0c2 fix: 修正PVP对战宠物信息获取错误
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-23 22:21:56 +08:00
xinian
09d58c1f14 fix: 修正宠物面板计算参数 2026-03-23 22:00:05 +08:00
xinian
84024aed83 refactor: 重构战斗效果实现逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-23 07:36:20 +08:00
xinian
65f696dfc3 refactor: 将 CanFight 方法移至基类
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-23 01:03:49 +08:00
xinian
9380bac839 fix: 修正宠物等级限制逻辑
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-23 01:02:49 +08:00
xinian
4fb5653c28 refactor: 重构战斗初始化传递宠物列表
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-22 23:41:51 +08:00
xinian
4ba8fe32c4 feat: 添加BossConfig战胜规则字段并移除MapNode冗余字段
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-21 01:06:59 +08:00
xinian
6717ca5236 fix: 修复重复领取奖励的问题
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-21 01:01:05 +08:00
xinian
1969c01f3e feat: 添加战胜规则配置模块
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-21 00:57:18 +08:00
xinian
d9a99155d9 feat: 实现战斗奖励规则302-316 2026-03-21 00:41:13 +08:00
xinian
9a1a181ecd refactor: 拆分战斗规则文件为独立模块
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-21 00:34:47 +08:00
xinian
afc67b0582 fix: 修正技能563和564的类型初始化
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-21 00:27:12 +08:00
xinian
c049bbd5ac fix: 修复登录空指针及战斗效果
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-21 00:24:34 +08:00
昔念
05c5f105e9 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(fight): 修复战斗效果数值符号错误

在技能效果501中,修正了属性设置时effectValue的符号问题,
现在正确地应用负值效果。同时调整了代码格式以保持一致性。
```
2026-03-20 15:49:56 +08:00
昔念
90b62b44e4 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(common): 统一Redis连接方式并优化代码结构

- 将 g.Redis("cool").Conn(ctx) 统一改为 Redis.Conn(ctx) 的调用方式
- 在coolconfig中添加ServerList.GetID()方法用于生成服务器唯一标识
- 引入gconv包用于类型转换操作

feat(rpc): 完善ListenFight函数实现集群消息监听

- 新增ListenFight函数,完全对齐ListenFunc
2026-03-20 04:58:23 +08:00
昔念
10a82f8e85 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(fight/effect): 重命名DamageLockEx方法为DamageLock

修复方法名错误,将DamageLockEx改为DamageLock以匹配实际功能
```
2026-03-19 21:33:53 +08:00
昔念
b558f46d7a ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(game): 宠物融合系统添加物品消耗异常处理

- 在宠物融合过程中添加物品扣除失败的错误检查
- 当物品不足时返回ErrInsufficientItems错误码

fix(pet): 宠物仓库管理功能增加数据库操作错误处理

- 在宠物释放到仓库和从仓库取出时验证数据库更新结果
- 添加宠物背包切换功能的错误检查机制

feat(fight):
2026-03-19 14:50:11 +08:00
昔念
e7098e3777 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(space): 更新地图BOSS生成逻辑并优化天气变化处理

- 修改GetMapPlayerList方法中BOSS信息发送方式为调用GenBoss方法
- 注释掉Space结构体中的IsChange字段,不再使用该标志位
- 调整GenBoss方法参数,添加isfrist参数用于区分首次调用
- 重构定时任务中的GenBoss调用逻辑,改为匿名函数包装广播消息
- 移除GenBoss
2026-03-18 01:22:14 +08:00
昔念
aa6929cd50 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(fight): 修复战斗逻辑中的条件判断错误

- 修复 IsFirst 方法中的缩进问题
- 修正 IsWin 方法中的条件判断逻辑,将 !v.Alive() 改为 v.Alive()
```
2026-03-17 19:41:07 +08:00
昔念
fb32bb3c39 ```
feat(fight): 添加新效果类型574并优化现有战斗逻辑

- 重命名NewSel409结构体的Action_end_ex方法为Skill_Use_ex
- 将effect/523中HP检查改为Alive()方法调用
- 修复selfkill效果中的代码格式问题
- 新增效果类型574:消耗自身全部体力使下次技能必定先手、命中且暴击
- 实现Effect574的ComparePre和ActionStart方法处理先手、命中和暴击逻辑
```
2026-03-17 19:30:40 +08:00
昔念
a3db0c5500 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(player): 改进怪物生成逻辑支持多配置遍历

修改了Monster.go中的GenMonster函数,将原来的随机选择单个配置改为遍历所有配置,
确保每个符合条件的配置都有机会被处理。同时保持了原有的等级范围、特殊属性设置
和NPC战斗处理逻辑。

BREAKING CHANGE: 怪物生成机制从单一随机选择改为配置遍历匹配
```
2026-03-17 18:24:50 +08:00
xinian
38f4be1e04 feat: 新增效果577实现
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-17 15:28:16 +08:00
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
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
昔念
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
昔念
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