Commit Graph

828 Commits

Author SHA1 Message Date
昔念
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
昔念
7b8251214b ```
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
fix(player): 修复怪物生成时PitS为空导致的崩溃问题

当玩家切换地图时,PitS可能为nil,此时访问会导致程序崩溃。
添加空值检查以避免此问题。
```
2026-03-03 00:31:36 +08:00
昔念
79d4343cdc ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(common/cool): 更新GetClient函数支持端口参数

更新GetClient函数签名以接收端口参数,并修改客户端映射键的计算方式,
添加GetClientOnly函数用于仅通过uid获取客户端。

fix(common/rpc): 修复RPC调用中的客户端获取方法

将GetClient调用替换为GetClientOnly,确保正确的客户端获取逻辑。

refactor(logic/controller): 重命名Port字段为UID并优化道具列表处理

将Controller结构体中的Port字段重命名为UID以更好地反映其用途,
优化GetUserItemList函数中道具列表的初始化和填充逻辑。

perf(logic): 调整性能分析web服务启动位置

将PprofWeb服务从全局启动移至调试模式下启动,优化服务配置。

refactor(logic/server): 更新服务器UID生成逻辑

修改Maincontroller的UID字段设置方式,使用服务器ID和端口组合生成唯一标识。

refactor(logic/service/player): 移除未使用的导入并优化怪物生成

移除未使用的service导入,优化怪物生成逻辑中的地图数据访问。

feat(logic/service/space): 添加PitS缓存映射并重构空间初始化

添加新的PitS字段
2026-03-02 23:59:15 +08:00
昔念
dab4862f28 Merge branch 'main' of https://cnb.cool/blzing/blazing
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-02 21:56:34 +08:00
昔念
ae534a2e1e ```
feat(item_buy): 优化商品购买限额检查逻辑

- 修改购买黄金商品时的限额验证方式,直接检查单次购买数量是否超过限制
- 调整GoldLog.Cheak方法参数顺序,增加总量控制参数
- 更新错误返回条件,提高限额检查准确性

fix(player_service): 添加时间范围检查功能

- 引入utils工具包用于时间范围验证
- 在IsMatch方法中添加活动开始时间和结束时间的范围检查
- 如果当前时间不在活动时间内则返回匹配失败

refactor(gold_log):
2026-03-02 01:36:16 +08:00
xinian
de4617cd6b 编辑文件 player.go
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-01 16:14:59 +08:00
xinian
7a12aa44eb feat: 添加Go开发工具并重构空间服务初始化逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
在Dockerfile中添加多个Go开发工具
将空间服务的初始化逻辑从GetSpace方法提取到独立的init方法
优化代码结构并修复导入顺序
2026-03-01 13:47:56 +08:00
xinian
6758483ab2 fix: 修复获取地图数据时可能的空指针异常
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-01 11:47:39 +08:00
xinian
9b344d3753 feat: 重构地图热度信息并添加地图提示功能
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
将地图热度信息从简单的计数器改为包含提示信息的结构体
添加矿物、BOSS、宠物和掉落等提示信息的收集功能
优化地图进入和离开时的计数逻辑
2026-03-01 10:44:31 +08:00
昔念
01c8c04df6 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(fight): 移除未使用的xmlres导入并优化回血逻辑

移除input包中未使用的xmlres导入,将宠物血量处理逻辑
封装到PetInfo模型中,并添加ModelHP方法来统一处理血量增减
逻辑。

feat(dict): 注释初始化数据相关代码

注释掉字典模块
2026-03-01 00:02:41 +08:00
昔念
b6ec530c68 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(fight): 添加闪亮怪物判断条件并修复物品添加参数格式

- 在战斗逻辑中增加对闪亮怪物的判断,只有闪亮怪物击败后才能获得玄铁
- 修复物品添加时uint32类型转换的参数格式问题
- 添加effect_42技能效果的参数设置方法
- 引入随机数库用于效果持续
2026-02-27 23:29:16 +08:00
xinian
2292de332f refactor: 简化NPC战斗特殊情况的处理逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-02-27 15:01:02 +08:00
xinian
8dec37a474 refactor: 重构怪物掉落和闪光处理逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
移除OgrePetInfo中与物品和闪光相关的冗余代码,将闪光处理逻辑整合到HandleNPCFightSpecial方法中
新增CanGetXUAN和CanGetItem方法用于判断是否获得特殊物品
添加S2C_GET_BOSS_MONSTER的ADD
2026-02-27 14:48:10 +08:00
xinian
ad43fc8173 refactor: 优化地图节点数据获取逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
将获取地图Boss信息的过滤逻辑从循环中移至GetDataB方法
2026-02-27 11:06:03 +08:00
xinian
bc2f222036 refactor: 重命名DamageLock为DamageLockEx以更准确表达功能
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-02-27 10:48:49 +08:00
xinian
94ac183131 fix: 修正NewSel113的DamageLock方法接收器类型错误 2026-02-27 10:48:14 +08:00
xinian
407d0578ca feat: 添加战斗规则1的基础结构
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-02-27 09:37:24 +08:00
xinian
21ae004979 feat: 重构怪物生成和NPC战斗处理逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
调整怪物等级处理方式,将固定等级逻辑移至GetLevel方法
优化NPC战斗特殊情况的处理流程
2026-02-26 19:28:02 +08:00
xinian
de297c9904 feat: 为OgrePetInfo添加GetID方法
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-02-26 19:22:04 +08:00
xinian
fcba504618 feat: 为NewSeIdx_403添加持续伤害效果实现
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
重构持续伤害效果逻辑,移除状态效果的创建与添加,改为直接使用remainingTurns字段记录剩余回合数
在ActionEndEx中处理伤害触发和回合数初始化
新增TurnEnd方法处理每回合剩余回合数递减
2026-02-26 17:53:55 +08:00
xinian
de711bec7a style: 移除 Monster.go 中的多余空行 2026-02-26 17:16:38 +08:00
xinian
1e71ebbd44 fix: 修正给予称号的条件判断
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-02-26 16:58:25 +08:00
xinian
7ceb2fb3d6 refactor: 重构怪物生成和天气处理逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
将怪物捕捉处理逻辑移至OgrePetInfo结构体
提取天气和Boss生成逻辑为独立方法
移除未使用的导入和冗余代码
2026-02-26 13:38:57 +08:00
xinian
d27112b5a8 feat: 调整怪物生成概率逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-02-26 12:23:02 +08:00
xinian
380796875f feat: 根据NPC战斗特殊处理解除捕捉限制
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-02-26 11:03:47 +08:00
xinian
ae22e51868 fix: 修复异色精灵生成条件判断错误
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-02-26 11:00:11 +08:00
昔念
dee5278f52 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(boss-fight): 添加boss id验证并修复捕捉机制

- 在玩家挑战boss时添加boss ids
2026-02-26 00:05:43 +08:00
昔念
f7e5880092 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(space): 添加天气变化调试日志并优化地图节点配置

- 在天气变化时添加调试打印语句,便于追踪空间天气变化情况
- 重构地图节点模型,将NodeID重命名为TriggerID以更好地表达其用途
- 添加触发器ID字段用于区分精灵和NPC,支持高ID控制NPC逻辑
- 更新注释说明剧情相关配置的重构计划,通过NPC节点判断类型
- 调整地图怪信息结构体初始化逻辑,直接使用TriggerID作为ID
```
2026-02-25 22:47:16 +08:00
昔念
6af88365c2 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(fight_boss): 重构Boss战斗逻辑并修复捕捉功能

- 移除未使用的taskID和canCapture变量
- 简化Boss数据获取逻辑,移除注释掉的旧代码
- 更新捕捉机制使用bosinfo[0].IsCapture
2026-02-25 19:46:31 +08:00
昔念
dc4835f14c ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(common/utils): 添加时间范围检查工具函数

添加了 IsCurrentTimeInRange 函数用于判断当前时间是否在指定的 HH:MM
时间区间内,支持当前日期的时间比较功能。

refactor(logic/controller): 重构 Boss 挑战逻辑并集成配置服务

- 集成 service 模块替代原有硬编码逻辑
- 重构 PlayerFightBoss 方法,使用新的配置数据结构
- 移除已废弃的 processMonID 函数和相关注释代码

refactor(logic/space): 优化地图 Boss 信息管理和天气系统

- 更新地图 Boss 数据
2026-02-25 19:05:50 +08:00
昔念
7c1540ff6d ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(common/data/xmlres): 注释掉未使用的MonsterMap配置变量

- 将MonsterMap配置变量注释掉,因为当前不再使用该配置
- 相应地注释掉了初始化代码中的MonsterMap赋值逻辑

feat(logic/controller): 统一CanFight方法返回值为ErrorCode

- 修改PlayerFightBoss等战斗控制器中的Can
2026-02-25 16:18:10 +08:00
xinian
b2189d9501 fix: 修正NPC战斗模式下技能使用逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-02-24 08:54:21 +08:00
xinian
571c941ae8 feat: 增加踢人超时处理中的玩家信息保存
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
将踢人超时时间从3秒调整为10秒,并在超时处理中保存玩家信息
2026-02-24 07:31:21 +08:00
xinian
05a1900d60 refactor: 移除未使用的lockfree相关代码
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-02-24 04:22:02 +08:00
xinian
467890a60b 1
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-02-24 00:12:50 +08:00