Commit Graph

862 Commits

Author SHA1 Message Date
xinian
3dd2d40c50 feat: 新增多个战斗技能效果实现
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-08 10:34:23 +08:00
昔念
042a48088d 1
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-08 01:23:28 +08:00
昔念
ecd63bdea5 ```
fix(space): 修复地图节点配置序列化问题并调整时间间隔

- 为MapBossInfo结构体的Config字段添加`struc:"skip"`标签,
解决配置信息序列化时的问题

- 将Space.Next方法的时间间隔从分钟级别调整为秒级别,
修改随机时间范围为10-30秒,便于测试和调试
```
2026-03-08 01:23:06 +08:00
昔念
53b33dfbc5 1
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-07 23:59:42 +08:00
昔念
d367f9d1d4 41
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-07 23:54:01 +08:00
昔念
54a4876beb ```
feat(fight): 添加XML配置解析功能用于技能效果映射

- 引入xml和gfile包用于XML文件解析
- 添加utils工具包用于数据转换
- 实现XML配置文件读取和解析逻辑
- 建立技能ID与效果描述的映射关系
- 添加调试输出显示技能效果对应关系
```
2026-03-07 22:49:20 +08:00
昔念
14009f45d6 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(fight): 添加技能效果调试信息打印

- 引入fmt包用于调试信息输出
- 打印实现效果数量和技能效果不存在数量的统计信息
- 输出技能映射详情用于调试分析
```
2026-03-07 22:32:19 +08:00
昔念
bd3d7eac50 1
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-07 22:24:54 +08:00
昔念
b9ae17234d ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(boss): 新增技能优先级调整功能

新增ComparePre方法用于比较和调整技能释放优先级,
修复了Boss战斗中的技能执行顺序问题,
同时在login模块中启用战斗测试功能。
```
2026-03-07 22:16:06 +08:00
xinian
a76a7e680e fix: 修复战斗逻辑中的技能结算顺序问题
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-07 20:18:23 +08:00
xinian
2d4ec0e5ba refactor: 重构战斗回合结束逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-07 18:50:51 +08:00
xinian
bf2325e2ef feat: 添加技能效果及宠物性别注释
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-07 15:15:15 +08:00
xinian
de8ce9fc81 feat: 新增多个战斗效果并修复逻辑问题
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-07 14:51:32 +08:00
xinian
02629b6f6c feat: 新增多个技能效果实现
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-07 13:54:42 +08:00
xinian
fe8e2786c2 fix: 修复伤害锁逻辑错误
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-07 11:44:16 +08:00
xinian
bbaa71f4b2 refactor: 重构宠物初始化逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
提取宠物配置初始化到ConfigBoss方法,简化initplayer代码
2026-03-07 11:30:17 +08:00
xinian
7bb0ef856a feat: 新增战斗效果并优化boss逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-07 09:55:06 +08:00
昔念
a192ffa6bc ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(space): 更新空间信息结构支持事件配置

- 替换天气字段为事件配置结构体
- 添加事件匹配逻辑验证天气和时间范围
- 实现事件驱动的BOSS显示控制机制
- 引入Event类型用于管理活动配置
```
2026-03-07 01:30:04 +08:00
昔念
4bb7477147 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(fight): 添加战斗攻击值获取接口并实现战斗规则系统

添加 GetAttackValue 方法到 FightI 接口,用于获取战斗中的攻击值信息。

新增 RuleI 接口定义战斗规则契约,包括 SetArgs 和 Exec 方法。

重构战斗规则系统:
- 创建 RuleBase 基类提供通用参数存储和基础方法
- 实现 17
2026-03-07 00:26:05 +08:00
昔念
ef7595a218 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(fight): 移除调试打印语句并修复宠物类型验证逻辑

移除了PetKing函数中的调试打印语句,确保不再输出调试信息到控制台。
同时保持了宠物类型验证的核心逻辑不变。

fix(fight): 修正boss技能伤害计算公式

修改了NewSel323的OnSkill方法中伤害计算的公式,
将原来的百分比计算方式调整为正确的血量差值计算方式。

feat(space): 调整空间定时器间隔时间

将Space.Next方法的时间间隔从6-30秒大幅增加到10-30分钟,
以适应实际的游戏节奏需求。

refactor(config): 更新宠物基础配置模型结构

移除了PetBaseConfig中Hp字段的not null约束,
使配置更加灵活。

feat(config): 扩展地图坑位配置支持新功能

为map_pit配置添加了MustTask必做任务字段和DropItemIds掉落物ID列表,
同时为item和pet服务增加了列表查询操作的等值过滤支持。
```
2026-03-06 23:49:20 +08:00
昔念
87ad01bea9 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(fight/boss): 修复技能实体空指针问题并优化必定秒杀效果实现

- 修复NewSeIdx_148中sks映射为空时的panic问题,在访问前进行nil检查并初始化
- 重构NewSeIdx_223必定秒杀效果的实现,将原有的ComparePre和DamageFloor方法
  合并为OnSkill方法,简化逻辑并提高代码可读性
- 更新注释描述,使功能说明更加准确清晰
```
2026-03-06 21:55:54 +08:00
xinian
2461ed1aa4 feat: 添加新技能223并重构技能284伤害处理
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-06 20:15:47 +08:00
xinian
77bb7a7112 fix: 修复伤害计算逻辑错误
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-06 19:34:58 +08:00
xinian
1645413f8d fix: 修复Boss技能判定逻辑错误
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-06 18:28:44 +08:00
xinian
26d06c50af fix: 修正Effect71效果计数逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-06 10:40:32 +08:00
xinian
17103cbc9a feat: 添加战斗效果126和284
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-06 10:23:07 +08:00
xinian
002c0e76c3 feat: 添加非连续技能无效魂印实现
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-05 20:23:06 +08:00
xinian
eb5ea901f4 feat: 新增战斗Boss特性效果实现
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-05 18:04:20 +08:00
xinian
03d93a2fba fix: 修正伤害类型和任务状态判断逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-05 17:40:42 +08:00
xinian
b80b017d33 fix: 修正任务状态判断与初始化逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-05 15:20:19 +08:00
xinian
b1ca686e06 refactor: 重构 PVP 匹配逻辑使用模型结构体
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-05 11:21:38 +08:00
昔念
2e7215946b ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(boss): 修复新选择效果ID初始化错误

修正NewSeIdx_183.go和NewSeIdx_184.go中EffectType.NewSel的ID参数,
将错误的83和84分别更正为正确的183和184,确保技能效果正确注册。
```
2026-03-05 01:01:56 +08:00
昔念
ab5ad94d65 1
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-05 00:49:48 +08:00
昔念
4751594ee8 ```
feat: 更新战斗系统模型结构和Redis消息处理

- 引入gredis依赖用于Redis消息处理
- 将战斗相关的枚举和结构体从info包迁移到model包
- 更新战斗结束原因、攻击值等类型的引用路径
- 添加新的zset工具包到工作区
- 修改Redis消息处理逻辑以正确解析gredis.Message类型
- 在战斗控制器中统一使用model包下的类型定义
2026-03-04 22:47:21 +08:00
昔念
55a5534777 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(fight_pvp_king): 新增宠物王者对战模式支持

- 添加战斗类型11的处理逻辑,支持单人模式
- 验证宠物类型与对战类型的匹配性
- 根据战斗结果发放相应奖励物品
- 增加ItemAdd接口用于物品添加功能
- 扩展PetInfo结构体增加战斗类型字段
```
2026-03-04 20:21:02 +08:00
昔念
bf79c0fd6a ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(fight): 移除调试打印语句并优化阻塞策略

移除了effect_attr.go中的调试println语句,将注释掉相关的日志输出,
同时在pack.go中更新了锁策略,从SleepBlockStrategy切换到
ConditionBlockStrategy,并移除了未使用的time包导入
```
2026-03-04 14:45:52 +08:00
昔念
fc8fc1ed8d ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(socket): 使用bytebufferpool优化内存分配并重构消息处理机制

引入bytebufferpool减少内存分配开销,在ServerEvent.go中修改数据处理逻辑,
将直接的数据拷贝改为使用缓冲池。同时移除原有的消息通道机制,改用lock
2026-03-04 14:00:55 +08:00
昔念
3f59f1a353 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(boss-fight): 调整宠物战斗奖励逻辑

修复闪亮怪物奖励物品的位置,将奖励物品发放逻辑从条件判断前移到判断后,
确保只有符合条件的玩家才能获得玄铁奖励。

fix(player-energy): 修复能量时间消耗问题

注释掉EnergyTime的自动减1逻辑,避免玩家能量值异常减少。

refactor(shop-config): 优化商店查询配置

移除商品名称字段查询,只保留remark字段作为关键词搜索,
简化商品表的SELECT语句,提高查询效率。
```
2026-03-04 12:48:49 +08:00
昔念
fb78147035 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(cool): 添加Redis发布功能并实现巅峰赛匹配加入逻辑

新增RedisDo函数用于向Redis频道发布消息,并在巅峰赛场匹配
中添加玩家加入队列的功能。同时修复了socket连接关闭时资源
泄露问题,确保MsgChan正确关闭。

BREAKING CHANGE: 新增的RedisDo函数会直接panic处理错误,
需要调用方注意
2026-03-04 03:22:43 +08:00
昔念
10af34fdad ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(controller): 移除独立的服务模块并将结构体定义内联到控制器中

移除了 egg、leiyi、pet 和 systemtime 独立服务包中的结构体定义,
将所有 C2S 和 S2C 结构体直接定义在相应的控制器文件中,同时更新了
导入路径和服务调用方式,统一使用 common.TomeeHeader 并优化了代码组织结构。

BREAKING CHANGE: 结构体定义从独立的服务包移动到控制器文件内部
2026-03-04 02:24:25 +08:00
昔念
aefef6a456 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(player): 修复玩家ID记录错误

当处理客户端消息时发生panic错误,日志中记录的玩家ID应该是当前客户端数据中的
玩家ID(cd.Player.Info.UserID),而不是错误引用的h.Player.Info.UserID。

这确保了错误日志能够正确关联到实际出错的玩家。
```
2026-03-04 01:38:24 +08:00
昔念
536a0c45c8 ```
refactor(player): 修复消费消息协程中的变量引用错误

修复了 consumeMsg 方法中错误引用变量的问题,将 handleBizLogic 方法中的
变量引用从 'h' 更正为 'cd',确保正确的上下文访问。

同时调整了代码结构,将消息循环处理逻辑移至正确位置,
保证 panic 恢复机制能够正确捕获异常信息。
```
2026-03-04 01:38:12 +08:00
昔念
3ddecce241 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(fight/boss): 添加技能实体致命一击检查逻辑

在NewSeIdx_409中新增对SkillEntity的空指针检查,
并实现通过Crit字段判断是否为致命一击的逻辑,
只有当Crit等于1且随机判定成功时才执行后续操作
```
2026-03-04 01:33:32 +08:00
昔念
dffd6a63a6 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(player): 优化客户端数据处理机制

重构ClientData的消息处理流程,将OnEvent方法改为非阻塞的通道投递模式,
新增MsgChan用于异步消息传递,避免eventloop阻塞问题。

fix(fight): 修复宠物闪光属性过滤条件

在initplayer方法中增加color.Alpha不为0的判断条件,确保只有有效的
闪光属性才会被添加到宠物信息中。

refactor(socket): 调整服务器事件处理逻辑

移除未使用的Lockfree库依赖,注释掉不再需要的连接关闭资源释放代码,
调整事件处理的工作池提交逻辑。

feat(rpc): 新增Redis发布功能

为RPC_player添加SendPackCmd方法,通过Redis的publish命令实现
跨服数据传输功能。
```
2026-03-04 01:30:40 +08:00
昔念
1cbe5d60e7 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(player): 启用panic恢复机制处理客户端事件

在ClientData的OnEvent方法中启用defer函数来捕获和处理panic异常,
确保程序在遇到运行时错误时能够正常记录日志并继续运行,提高服务稳定性。

当发生panic时,会记录服务器ID、用户ID和错误信息到日志中。
```
2026-03-03 23:42:23 +08:00
昔念
0c7fd18bc9 ```
feat(controller): 增强命令注册逻辑并修复试炼塔关卡限制

- 在命令注册时检查重复方法,如果存在则panic提示错误
- 移除CurrentFreshStage和CurrentStage的默认值设置逻辑
- 添加关卡等级验证,确保用户不能挑战超过最大关卡数的关卡
- 修复试炼之塔和勇者之塔的关卡计算逻辑

fix(item): 修复道具使用返回值类型转换问题

- 将ThreeTimes和TwoTimes字段从int32转为uint32返回
- 为能量吸收道具使用函数添加结果结构体初始化

refactor(fight): 清理战斗服务中的注释和字段定义

- 移除C2S_FRESH_CHOICE_FIGHT_LEVEL结构体中冗余的注释说明
- 统一FightOverInfo结构体的格式

fix(item): 修复宠物道具使用的条件判断

- 为道具300790添加DV值大于等于31时不能使用的限制

fix(player): 修复玩家经验加成次数的判断逻辑

- 将TwoTimes和ThreeTimes的判断从不等于0改为大于0
- 将EnergyTime的判断从不等于0改为大于0
- 统一所有次数字段的类型为int32以避免负数问题

chore(admin): 清理无用代码

- 移除未使用的context包导入
- 注释掉未完成的TimeMap接口实现
```
2026-03-03 23:40:21 +08:00
昔念
5caa9a1e4f ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(controller): 增强命令注册逻辑并修复试炼塔关卡限制

- 在命令注册时检查重复方法,如果存在则panic提示错误
- 移除CurrentFreshStage和CurrentStage的默认值设置逻辑
- 添加关卡等级验证,确保用户不能挑战超过最大关卡数的关卡
- 修复试炼之塔和勇者之塔的关卡计算逻辑

fix(item): 修复道具
2026-03-03 19:28:59 +08:00
昔念
103bc0c232 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(gameplay): 实现空间掉落物品系统

- 在Space结构体中添加DropItemIds字段存储掉落物品配置
- 添加GetDrop方法用于随机获取掉落物品
- 将战斗怪物掉落逻辑从地图服务改为使用空间服务
- 修复屏幕会话中断信号配置为^C

BREAKING CHANGE: 掉落物品逻辑从地图服务迁
2026-03-03 14:04:41 +08:00
昔念
d4551a8c35 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(space): 重构空间初始化逻辑并修复变量作用域问题

- 将tips和pits的初始化移到循环外部,避免重复创建
- 修复Name赋值位置,确保在正确时机设置空间名称
- 添加条件判断ret.Super != 0,优化性能
- 调整代码结构,提高可读性和维护性
- 移除注释掉的无用代码
```
2026-03-03 01:07:30 +08:00
昔念
6d387f847e ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(item_use): 优化物品列表处理逻辑

- 修改循环方式,使用索引直接赋值替换append操作
- 提升代码性能和内存使用效率

refactor(effect_101): 清理无用注释

- 移除过时的中文注释内容
```
2026-03-03 00:51:06 +08:00