Commit Graph

124 Commits

Author SHA1 Message Date
sk 8b478a9f33 解决冲突 2024-05-28 09:26:18 +08:00
sk 516ab3f811 修复预创建房间问题 2024-05-28 09:24:14 +08:00
sk 97e03e2c22 游戏掉落 2024-05-25 16:32:17 +08:00
sk 0d252cebc5 添加道具类型 2024-05-25 14:47:23 +08:00
sk d27c0270f8 no message 2024-05-24 12:00:32 +08:00
sk 0739d1eb12 优化游戏类型判断 2024-05-17 09:16:49 +08:00
sk edd992aecd 兑换商城自提,优化道具使用日志 2024-05-13 18:48:44 +08:00
sk f45708a8cc 道具掉落添加渠道开关 2024-05-10 16:38:10 +08:00
sk 22dbae7f80 被邀请人充值任务 2024-05-10 11:44:58 +08:00
kxdd 7756f3ae19 还原本来的道具功能
--task=1000620 --user=李海亮 记牌器调整多道具修改逻辑 https://www.tapd.cn/31044302/s/1010514
2024-05-06 13:44:49 +08:00
kxdd eaf8dd734f Merge branch 'dev_pigbank' into develop 2024-04-30 17:33:39 +08:00
kxdd 72b5f14b62 存钱罐修改 2024-04-30 17:32:57 +08:00
kxdd 909523ec3e Merge branch 'dev_pigbank' into develop
# Conflicts:
#	common/constant.go
#	data/DB_Pigbank_Prop.dat
#	data/DB_Pigbank_Prop.json
#	gamesrv/tienlen/playerdata_tienlen.go
#	protocol/server/pbdata.pb.go
#	xlsx/DB_Pigbank_Prop.xls
存钱罐功能
2024-04-30 14:22:18 +08:00
kxdd c2d7c1bfb5 存钱罐功能 2024-04-30 09:45:40 +08:00
sk bd92567666 解决冲突 2024-04-29 17:20:53 +08:00
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
sk 4d9fee9b11 机器人互动表情 2024-04-28 11:34:37 +08:00
sk a6e65f236f 成就任务 2024-04-26 11:18:56 +08:00
lihailiang 1efb19dce6 添加时效类道具功能 2024-04-25 17:41:53 +08:00
by 60145c2325 log类型修改 2024-04-25 15:29:14 +08:00
by cc56a160af 周卡礼包 2024-04-25 11:39:24 +08:00
sk 33a087d1d7 开启拉霸游戏 2024-04-19 11:43:13 +08:00
sk f67df3c8df 集卡活动 2024-04-16 14:07:42 +08:00
sk 9405ae091e init 2024-04-12 10:35:47 +08:00