Commit Graph

65 Commits

Author SHA1 Message Date
lihailiang 03a67c3778 Merge branch 'dev_timeitem' into develop
# Conflicts:
#	common/constant.go
#	data/DB_GameItem.dat
#	protocol/server/pbdata.pb.go
#	protocol/server/server.pb.go
#	tools/xlsx2binary/agc.go
#	xlsx/DB_GameItem.xlsx
2024-04-28 18:23:13 +08:00
kxdd a7ec02b38e 1.记牌器道具时限修改
2.存钱罐数据创建
2024-04-28 17:36:08 +08:00
kxdd ec0d303cb6 道具时限类道具修改 2024-04-26 17:46:21 +08:00
by 7fb33896de 周卡礼包需求修改 2024-04-26 14:57:26 +08:00
sk b6aa7bec3c 任务系统优化 2024-04-26 09:44:25 +08:00
lihailiang 1efb19dce6 添加时效类道具功能 2024-04-25 17:41:53 +08:00
sk 2e0e6c72d0 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-04-25 16:44:11 +08:00
sk 77fbd7dfba 拉霸数据统计 2024-04-25 16:41:53 +08:00
by cc56a160af 周卡礼包 2024-04-25 11:39:24 +08:00
sk 0de01b7eaa 复仇者联盟 2024-04-22 18:39:27 +08:00
sk 8ac802e2a3 fix:道具数量同步错误 2024-04-17 17:49:34 +08:00
sk c1d2925933 update data 2024-04-17 16:59:14 +08:00
sk 0e53147f13 proto生成优化 2024-04-17 16:52:35 +08:00
sk 2140397496 添加集卡活动配置 2024-04-15 16:14:55 +08:00
sk 91e798c0c5 init 2024-04-15 11:07:12 +08:00