Commit Graph

472 Commits

Author SHA1 Message Date
xinian
3833fd3884 fix: 修复Scan参数引用错误
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-05 16:04:28 +08:00
xinian
8efaab48fd docs: 更新任务类型注释
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-05 15:29:18 +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
2259093790 feat: 支持每周任务重置和查询
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-05 14:56:28 +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
昔念
aa53001982 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(cool): 移除Redis监听功能和用户结构体定义

移除ListenFunc函数,该函数提供Redis PubSub监听功能,
包括自动重连和心跳保活机制。同时删除User结构体定义和
相关有序集合变量,这些功能将由rpc模块替代实现。

feat(rpc): 添加对ListenFunc的调用以处理Redis监听

在login模块中
2026-03-04 23:38:21 +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
昔念
5874ae270f ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(item-use): 完善玄彩道具使用逻辑并添加宠物闪亮状态修复功能

- 在玄彩道具使用过程中添加闪亮状态修复检查,确保道具使用前宠物状态正常
- 修改FixShiny方法返回布尔值以指示操作是否成功
- 当物品不足时返回ErrItemUnusable错误码
- 调整代码执行顺序,先进行闪亮状态修复再更新物品数量
```
2026-03-04 14:12:48 +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
昔念
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
昔念
834c85f0f1 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(base): 修复screen会话启动时的终端中断信号处理

为screen命令添加stty intr ^_配置,确保在Screen会话中能够正确处理
中断信号,避免程序异常退出问题。
```
2026-03-03 13:47:57 +08:00
昔念
8713f992a1 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(base): 修改部署脚本中的文件名处理逻辑

- 移除随机文件名生成,直接使用原始文件名进行远程路径构建
- 删除时间戳相关逻辑,简化screen会话启动命令
- 添加文件名参数替换,确保日志文件命名正确
```
2026-03-03 13:16:35 +08:00
昔念
ed40364f09 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(base): 修复screen命令中引号转义问题

修复了启动screen会话时的引号转义错误,确保screen_name、exe_path和online_id
变量能够正确传递给bash命令。之前由于引号转义不当导致变量无法正确解析。
```
2026-03-03 13:09:08 +08:00
昔念
57311aaa2e ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(base): 修复screen会话启动时的引号转义问题

修复了启动Screen会话时由于引号转义导致的时间戳变量无法正确传递的问题,
现在通过分离命令参数的方式确保变量能够正确传递到bash环境中。
```
2026-03-03 13:01:53 +08:00
昔念
33ffc5eaac ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(base): 更新服务器启动脚本日志文件命名规则

- 添加时间戳变量定义,格式为 年-月-日_时-分-秒
- 修改日志文件名从固定的 run_{screen_name}.log 改为带时间戳的 run_{timestamp}.log
- 这样可以避免不同启动实例之间的日志文件覆盖问题
```
2026-03-03 00:34:37 +08:00
昔念
bbd155b917 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(base): 更新服务器脚本中的文件删除逻辑

删除旧文件的逻辑从单一文件删除改为批量删除以 logic_ 开头的所有文件,
同时保留了删除前的确认检查机制
```
2026-03-03 00:19:08 +08:00
昔念
30a3c8bc5a ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(base): 修改日志文件命名规则

将Screen会话的日志文件名从固定的run.log改为动态的run_{screen_name}.log,
以避免多个实例之间的日志混淆,提高日志管理的清晰度和可维护性。
```
2026-03-03 00:09:03 +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
xinian
47bc680889 refactor: 将端口和在线ID类型从uint16改为uint32
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-02 18:34:20 +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
74ede45d92 fix: 添加宠物进化等级检查并修复降级逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-01 11:25:30 +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
xinian
3656e43d3c feat: 添加地图提示接口并修改时间地图请求方法
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
新增地图提示接口/maptip,同时将/timemap接口的请求方法从POST改为GET
2026-03-01 09:28:00 +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
昔念
24f83c0284 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(data): 添加随机颜色生成功能并重构发光滤镜默认配置

- 引入 grand 包用于生成随机数
- 将 GlowFilterDefault 常量改为 GetDef() 函数,实现动态配置
- 修改默认发光滤镜参数:Alpha从0.8改为0.1,BlurX/BlurY从10改为8,
  Quality从2改为1,Level从1改为2
- 新增 RandomRGBToUint32() 函数生成随机RGB颜色并转换为uint32格式
- 在GetDef()函数中使用随机颜色替代固定颜色值

refactor(config): 优化闪光效果服务中的矩阵生成逻辑

- 移除不必要的变量声明,直接在赋值时调用GenerateRandomOffspringMatrix
2026-02-28 22:31:33 +08:00
昔念
8bc3fd3cb7 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(dict): 添加字典数据压缩加密功能

- 在字典数据接口中集成压缩和加密机制
- 实现Gzip压缩、XOR加密和Base64编码流程
- 新增CompressAndEncrypt和DecryptAndDecompress工具函数
- 在middleware中启用压缩中间件支持
```
2026-02-28 00:21:33 +08:00
昔念
aad5a1b360 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(config): 添加广播节点结构体并重构地图节点配置

- 新增BroadcastNode结构体,包含触发器ID、位置、血量和方向字段
- 将MapNode结构体嵌入BroadcastNode以支持广播节点功能
- 从MapNode中移除重复的TriggerID、Pos、HP字段
- 在Event结构体中新增
2026-02-27 23:13:50 +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
f8b948721f refactor: 简化玩家称号获取逻辑,直接返回ID列表
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-02-27 10:21:49 +08:00
昔念
741b938587 1
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-02-27 01:00:01 +08:00
昔念
a210d653d2 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(shop): 添加商品限购功能并优化购买逻辑

- 修改购买黄金商品接口,添加商品配额检查功能
- 新增月、周、日三种限购类型检查逻辑
- 当商品超出库存或达到购买限制时返回相应错误码
- 移除gold_log表中PlayerID字段的唯一索引约束
- 修复GoldService中的Cheak方法实现,支持多种时间维度限购检查
```
2026-02-27 00:09:23 +08:00
昔念
bfafd5789d ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(utils): 添加切片元素计数功能

新增CountSliceElements函数用于统计切片中各元素的出现次数,
返回map[元素]出现次数的映射关系,支持任意可比较类型的切片元素。

fix(config): 调整地图配置模型默认值设置

修改MapPit结构体中的MinLevel和MaxLevel字段设置,
将数据库约束改为非空并设置默认值为1,确保等级范围配置的有效性。

ref
2026-02-26 22:32:15 +08:00
xinian
c921825007 feat: 添加批量更新
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-02-26 10:40:41 +08:00
xinian
0485fbca43 feat: 添加批量检查物品数量的方法并优化宠物融合逻辑
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
在物品服务中添加CheakItemM方法用于批量检查物品数量
修改宠物融合逻辑使用新方法进行物品检查
2026-02-26 10:24:30 +08:00
昔念
6c61059cfe ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(fight_tower): 修复战斗塔Boss获取逻辑错误

- 修改条件判断从检查boss不为nil改为检查boss[0].BossIds长度不为0
- 修正PetTawor方法中索引越界问题,从boss[0]改为boss[1]
- 在TowerService.Boss方法中添加按tower_level升序排序确保数据一致性
```
2026-02-26 01:02:30 +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
昔念
a3244549f3 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(fight_boss): 修复Boss挑战功能中的参数传递和效果处理逻辑

- 修复PlayerFightBoss方法中参数名错误(data -> data1)
- 修正BossId获取路径,使用正确的参数引用
- 重构特效处理逻辑,从循环解析改为批量获取
- 添加宠物闪光效果初始化支持

fix(fight_塔): 修复试炼塔相关战斗逻辑错误

- 修正Boss获取逻辑,从单个对象改为数组切片访问
- 调整塔级Boss获取接口
2026-02-25 21:16:36 +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
昔念
5e9ac0bef5 ```
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
refactor(config): 调整塔配置结构体字段定义

移除了Name和TowerLevel字段中多余的空格,并将BossIds字段从切片类型
改为普通uint32类型,同时更新了数据库标签注释内容。
```
2026-02-25 14:03:27 +08:00
昔念
c00a796203 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(common/utils): 重构concurrent_swiss_map使用官方sync.Map实现

- 替换原有的第三方并发map实现,改为基于标准库sync.Map的封装
- 保持完全的API兼容性,原有配置方法变为无实际作用的占位符
- 优化Range方法实现,移除goroutine/channel开销,避免潜在的死锁风险
- 移除依赖的外部库和
2026-02-25 13:20:38 +08:00
昔念
931809edc4 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(config): 调整MapBoss结构体字段类型

- 将BossMonID字段从[]int切片类型改为int单值类型,并移除相关定义
- 将WinBonusID和FailBonusID字段从[]int切片类型改为int单值类型,
  并设置默认值为0
- 移除多余的空行和格式调整,保持代码整洁
2026-02-24 22:58:58 +08:00
昔念
813eb4c3cd 根据提供的code differences信息,由于没有具体的代码变更内容,我将生成一个通用的提交信息模板:
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
```
docs(readme): 更新文档说明

- 添加了项目使用说明
- 补充了配置项解释
- 优化了文档结构
```
2026-02-24 22:10:49 +08:00
昔念
8a072bd028 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(config): 修改地图坑位配置的数据结构

- 将MapPit结构体中的MapID字段从数组类型[]int32改为单个int32类型
- 更新数据库标签,移除数组类型定义,添加非空约束和索引
- 修改JSON标签注释为"所属地图ID"
- 在服务层的查询操作中添加map_id字段的相等查询支持
```
2026-02-24 19:20:38 +08:00
昔念
0a2ec3af08 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(config): 移除怪物刷新相关代码并优化地图坑位配置

移除 modules/config/controller/admin/monster_refresh.go 中的
TaskInfoController 及其相关路由注册逻辑

移除 modules/config/model/map_monster.go 中的 MonsterRefresh
模型定义及相关常量、方法

重构 modules/config/model/map_pit.go 中的 MapPit 结
2026-02-24 14:11:01 +08:00
昔念
41714fca0b 1
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-02-24 13:26:24 +08:00