Commit Graph

371 Commits

Author SHA1 Message Date
sk e2ce12b74d fix 推币机 2025-01-09 16:38:51 +08:00
sk 6db4ceec10 add 推币机 2025-01-09 15:53:19 +08:00
sk a92a04a81d add 推币机活动 2025-01-08 14:46:29 +08:00
sk cf196814e0 解决冲突 2025-01-08 11:25:17 +08:00
sk c8df34e266 解决冲突 2025-01-08 11:20:25 +08:00
sk 88e548bf6a 解决冲突 2025-01-08 11:19:04 +08:00
sk 88f2bf7f7c add 推币机活动 2025-01-08 11:15:24 +08:00
by f6d0fa3b02 年兽签到额外奖励 2025-01-08 10:38:36 +08:00
sk a40b25d437 解决冲突 2025-01-07 16:10:33 +08:00
sk ab6427c18c add 推币机协议 2025-01-07 16:00:01 +08:00
by 7dd4df57fa Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
# Conflicts:
#	common/constant.go
#	worldsrv/taskmgr.go
2025-01-06 16:01:25 +08:00
by b512310a92 年兽排行榜统计 2025-01-06 16:00:07 +08:00
sk 07d8de615e Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2025-01-06 13:41:25 +08:00
sk 32a6f12ebf add tienlen是否出最小牌 2025-01-06 13:41:11 +08:00
by b4c377fc44 年兽 2025-01-06 13:40:57 +08:00
by de391699b8 年兽排行榜奖励走后台+帐变记录 2025-01-06 11:59:12 +08:00
sk 82ad3cd4c6 add tienlen首出上局赢家位置 2025-01-06 11:49:28 +08:00
by 044cf9f863 年兽排行榜 2025-01-03 16:57:40 +08:00
by 8a0502302f 年兽排行榜 2025-01-03 14:09:43 +08:00
sk d63043d3fc 解决冲突 2025-01-02 18:04:24 +08:00
sk 231cff3c4a add 累计消耗活动 2025-01-02 17:57:47 +08:00
sk 53889d6a80 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2025-01-02 16:40:23 +08:00
sk f845409979 add 红包活动 2025-01-02 16:39:56 +08:00
by 36708d2af6 年兽活动 排行榜奖励配置 2025-01-02 16:35:17 +08:00
by e4b85bf503 年兽兑换 2025-01-02 16:14:21 +08:00
by d1c2e2437c 配置文件 2025-01-02 11:31:01 +08:00
by 79e05883db Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
# Conflicts:
#	common/constant.go
#	etcd/keyconf.go
#	model/config.go
#	model/player.go
#	protocol/webapi/common.proto
#	worldsrv/etcd.go
#	worldsrv/welfmgr.go
2025-01-02 11:29:47 +08:00
by 9fd80b867d 年兽活动 2025-01-02 11:18:58 +08:00
sk c9bae9e147 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2025-01-02 09:59:36 +08:00
DESKTOP-45ANQ2C\unis 86ac616d2d 编译错误 2025-01-02 09:58:38 +08:00
sk c00b794dc3 add 红包活动 2025-01-02 09:51:44 +08:00
DESKTOP-45ANQ2C\unis c482f45e70 Merge branch 'dev_pigbank2' into develop
# Conflicts:
#	protocol/welfare/welfare.pb.go
2025-01-02 09:46:41 +08:00
DESKTOP-45ANQ2C\unis a9cb952e52 存钱罐道具奖励显示添加 2025-01-02 09:43:41 +08:00
sk 7f6b4a86ae add 红包活动 2025-01-02 09:21:40 +08:00
DESKTOP-45ANQ2C\unis 531df8e564 Merge branch 'dev_pigbank2' into develop
# Conflicts:
#	protocol/server/pbdata.pb.go
2024-12-27 10:05:12 +08:00
DESKTOP-45ANQ2C\unis 0b34ed9d75 金币钻石存钱罐优化功能 2024-12-27 10:00:31 +08:00
sk 5368460ad3 add 各游戏破产金额 2024-12-26 11:01:17 +08:00
sk bbe6c99209 modify 在线玩家列表 2024-12-21 11:47:30 +08:00
sk b186967189 add 十三张记录分别自动手动摆牌时长 2024-12-20 16:09:26 +08:00
sk e9e0aac833 update data 2024-12-10 15:19:44 +08:00
sk 0143ebbe12 修复dbgamefree协议 2024-12-05 09:42:38 +08:00
sk 2b88155177 添加十三张预选牌功能 2024-12-02 17:57:46 +08:00
sk f532cee29b 更新配置文件 2024-12-02 14:32:55 +08:00
sk 57def951c1 更新配置文件 2024-12-02 13:54:49 +08:00
tomas 5dcd4175f9 add cm goo proto and mouse.go 2024-12-02 10:40:19 +08:00
sk 343a7a7abb 抽奖活动通知获的抽奖码 2024-11-22 17:02:46 +08:00
sk 196d211fff 十三张阶段时间可配置 2024-11-22 16:08:34 +08:00
DESKTOP-45ANQ2C\unis 72ffbf9da3 Merge branch 'dev_compose' into develop 2024-11-22 10:13:11 +08:00
DESKTOP-45ANQ2C\unis 7b76389509 合成功能 2024-11-22 10:06:28 +08:00
sk 1e2eeebfda 竞技馆房间列表返回房主id 2024-11-21 13:22:45 +08:00