Commit Graph

981 Commits

Author SHA1 Message Date
昔念
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
911c1d7ec2 编辑文件 item_use.go
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-01 17:26:00 +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
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
f1a5b90ca5 refactor: 优化宠物类型变量使用并简化条件判断 2026-03-01 08:59:39 +08:00
xinian
49f8de8661 编辑文件 fight_boss野怪和地图怪.go
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-01 08:15:42 +08:00
xinian
bc16ef6860 编辑文件 fight_boss野怪和地图怪.go
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-01 08:12:49 +08:00
xinian
e7d85133c3 编辑文件 fight_boss野怪和地图怪.go
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-01 08:11:03 +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
昔念
9485c510c0 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
chore(login): 添加调试代码用于任务状态测试

添加了临时的调试代码来测试玩家任务状态,
包括打印任务信息和设置特定任务为完成状态
```
2026-02-27 23:43:00 +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
昔念
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
昔念
e4ad1745d4 ```
feat(utils): 添加切片元素计数功能

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

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

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

refactor(item): 移除批量更新物品数量的功能

移除UPDATEM方法的实现代码,该方法原本用于批量更新多个物品的数量,
但存在逻辑问题且不再使用,故将其注释掉以避免后续误用。
```
2026-02-26 23:22:31 +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
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
3157c4d41a fix: 修复黑暗传送门打开时boss不存在导致的错误
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-02-26 17:21:43 +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
e2bfab5131 fix: 修复宠物融合物品消耗逻辑并优化地图Boss信息发送
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
修复宠物融合功能中物品消耗逻辑错误,从批量更新改为逐个更新物品
移除地图玩家列表获取中多余的MapBoss信息发送条件判断
2026-02-26 11:44:52 +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
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
昔念
0091e3a8dd ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(game): 修复勇者之塔战斗逻辑错误

将勇者之塔的战斗服务从 Tower600Service 更改为 Tower500Service,
以修正当前关卡难度匹配问题。
```
2026-02-26 00:33:56 +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
昔念
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
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