sk
|
d671697496
|
add 添加日志
|
2025-01-03 13:39:25 +08:00 |
|
sk
|
c1f33de1d5
|
add 添加日志
|
2025-01-03 11:45:45 +08:00 |
|
sk
|
d47ee74e2c
|
modify 删除红包测试代码
|
2025-01-03 10:46:05 +08:00 |
|
sk
|
756f52dd63
|
modify 红包活动
|
2025-01-03 09:31:34 +08:00 |
|
sk
|
3ee3f677ce
|
解决冲突
|
2025-01-02 18:10:35 +08:00 |
|
sk
|
d63043d3fc
|
解决冲突
|
2025-01-02 18:04:24 +08:00 |
|
sk
|
231cff3c4a
|
add 累计消耗活动
|
2025-01-02 17:57:47 +08:00 |
|
by
|
8c9b279196
|
年兽任务
|
2025-01-02 16:59:59 +08:00 |
|
sk
|
521b6e935e
|
fix 红包活动
|
2025-01-02 16:46:23 +08:00 |
|
sk
|
e72e3176a1
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2025-01-02 16:41:37 +08:00 |
|
by
|
20f511a840
|
年兽活动
|
2025-01-02 16:41:00 +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
|
94e1effc63
|
年兽活动
|
2025-01-02 16:39:25 +08:00 |
|
by
|
043f8d69ea
|
年兽活动
|
2025-01-02 16:38:43 +08:00 |
|
by
|
36708d2af6
|
年兽活动 排行榜奖励配置
|
2025-01-02 16:35:17 +08:00 |
|
by
|
8a320c1cf4
|
Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
|
2025-01-02 16:14:26 +08:00 |
|
by
|
e4b85bf503
|
年兽兑换
|
2025-01-02 16:14:21 +08:00 |
|
sk
|
61d589df26
|
解决冲突
|
2025-01-02 15:19:29 +08:00 |
|
sk
|
2b8ef577f5
|
add 红包活动
|
2025-01-02 15:12:25 +08:00 |
|
by
|
799b7464ef
|
年兽修改
|
2025-01-02 13:42:01 +08:00 |
|
sk
|
7876fa34f9
|
add 红包活动测试代码
|
2025-01-02 11:47:25 +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 |
DESKTOP-45ANQ2C\unis
|
a2acd36596
|
Merge branch 'dev_pigbank2' into develop
# Conflicts:
# worldsrv/welfmgr.go
|
2025-01-02 11:14:46 +08:00 |
|
DESKTOP-45ANQ2C\unis
|
4c8273031b
|
存钱罐领取钻石显示修改
|
2025-01-02 11:10:47 +08:00 |
|
sk
|
e97e531623
|
fix statistics
|
2025-01-02 10:45:05 +08:00 |
|
sk
|
280de58880
|
Merge branch 'sk' into develop
|
2025-01-02 10:42:25 +08:00 |
|
sk
|
23a7160332
|
fix statistics
|
2025-01-02 10:17:35 +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 |
|
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
|
a95c6b6c90
|
Merge branch 'develop' into sk
|
2025-01-02 09:22:36 +08:00 |
|
sk
|
d5cedb814e
|
Merge branch 'develop' into sk
|
2025-01-02 09:21:55 +08:00 |
|
sk
|
7f6b4a86ae
|
add 红包活动
|
2025-01-02 09:21:40 +08:00 |
|
DESKTOP-45ANQ2C\unis
|
135f2f99b1
|
Merge branch 'dev_pigbank2' into develop
|
2024-12-31 17:16:09 +08:00 |
|
DESKTOP-45ANQ2C\unis
|
163509fa5e
|
Revert "钻石存钱罐的额外奖励显示为金币的额外奖励"
This reverts commit f7f5fe263c.
|
2024-12-31 17:14:56 +08:00 |
|
DESKTOP-45ANQ2C\unis
|
df74995590
|
钻石存钱罐的额外奖励显示为金币的额外奖励
|
2024-12-31 17:14:33 +08:00 |
|
DESKTOP-45ANQ2C\unis
|
f7f5fe263c
|
钻石存钱罐的额外奖励显示为金币的额外奖励
|
2024-12-31 17:12:04 +08:00 |
|
sk
|
44acf8b5e7
|
fix 背包数据丢失恢复
|
2024-12-31 09:38:30 +08:00 |
|
DESKTOP-45ANQ2C\unis
|
71622caf8f
|
Merge branch 'dev_pigbank2' into develop
|
2024-12-30 14:57:19 +08:00 |
|
DESKTOP-45ANQ2C\unis
|
f0c215dc4a
|
存钱罐功能添加后台开关
|
2024-12-30 14:56:52 +08:00 |
|
sk
|
7066d7c441
|
fix 比赛配置
|
2024-12-30 14:02:45 +08:00 |
|
sk
|
2e16b0bd52
|
fix 比赛配置
|
2024-12-30 13:55:32 +08:00 |
|
sk
|
adf2dc3c92
|
modify etcd key
|
2024-12-30 11:03:43 +08:00 |
|
sk
|
e0629e3419
|
no message
|
2024-12-27 18:01:11 +08:00 |
|
sk
|
ef964f7ec7
|
no message
|
2024-12-27 18:00:27 +08:00 |
|
sk
|
a6b93bceb5
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-12-27 17:37:45 +08:00 |
|
sk
|
500527f45e
|
Merge branch 'dev_rpc' into develop
|
2024-12-27 17:37:15 +08:00 |
|
sk
|
c8df660c82
|
add rpc监控
|
2024-12-27 17:36:53 +08:00 |
|
sk
|
a3a8c2ef83
|
add rpc监控
|
2024-12-27 17:36:22 +08:00 |
|
DESKTOP-45ANQ2C\unis
|
425424c68b
|
Merge branch 'dev_pigbank2' into develop
|
2024-12-27 17:23:43 +08:00 |
|
DESKTOP-45ANQ2C\unis
|
5b28a10602
|
存钱罐数据使用后台配置数据
|
2024-12-27 17:23:28 +08:00 |
|
DESKTOP-45ANQ2C\unis
|
f657773a5e
|
Merge branch 'dev_pigbank2' into develop
|
2024-12-27 15:35:31 +08:00 |
|
DESKTOP-45ANQ2C\unis
|
c12514e07d
|
金币存钱罐领取记录修改
|
2024-12-27 15:34:36 +08:00 |
|
DESKTOP-45ANQ2C\unis
|
32eb22f956
|
Merge branch 'dev_pigbank2' into develop
|
2024-12-27 14:37:10 +08:00 |
|
DESKTOP-45ANQ2C\unis
|
08be09284b
|
存钱罐道具显示添加
|
2024-12-27 14:36:51 +08:00 |
|
sk
|
4e08e75510
|
update excel
|
2024-12-27 10:35:07 +08:00 |
|
DESKTOP-45ANQ2C\unis
|
60a75f73ff
|
Merge branch 'dev_pigbank2' into develop
|
2024-12-27 10:19:40 +08:00 |
|
DESKTOP-45ANQ2C\unis
|
f1a580bce5
|
存钱罐取出调试信息
|
2024-12-27 10:19:31 +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
|
70f8ef26e0
|
modify 允许游戏中顶号
|
2024-12-25 09:51:18 +08:00 |
|
sk
|
292a5ea563
|
解决冲突
|
2024-12-23 11:29:59 +08:00 |
|
sk
|
daa13d58e1
|
modify 比赛日志
|
2024-12-23 09:14:49 +08:00 |
|
sk
|
bbe6c99209
|
modify 在线玩家列表
|
2024-12-21 11:47:30 +08:00 |
|
sk
|
e044a590d4
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-12-20 09:21:40 +08:00 |
|
sk
|
39890efbfa
|
add:破产记录添加游戏组id
|
2024-12-20 09:21:24 +08:00 |
|
by
|
09a609b1b3
|
Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
|
2024-12-19 18:03:03 +08:00 |
|
by
|
e2095d6878
|
后台补单
|
2024-12-19 18:02:51 +08:00 |
|
sk
|
08023bcdea
|
fix:游戏分组统计数据
|
2024-12-19 17:50:49 +08:00 |
|
sk
|
893bc4cbbb
|
modify:房费扣除
|
2024-12-19 17:23:46 +08:00 |
|
by
|
9b59039d4b
|
后台补单
|
2024-12-18 09:31:49 +08:00 |
|
by
|
7d0d5e9509
|
后台补单log
|
2024-12-18 09:19:57 +08:00 |
|
sk
|
ba1b4ae7c7
|
fix:空指针异常
|
2024-12-17 16:28:55 +08:00 |
|
sk
|
905ff11095
|
fix:邀请对局空指针异常
|
2024-12-17 16:05:17 +08:00 |
|
sk
|
0c65af22ea
|
add:对局中玩家人数上报
|
2024-12-17 13:29:50 +08:00 |
|
sk
|
4e59c6600c
|
道具记录记录gamedif
|
2024-12-16 17:51:21 +08:00 |
|
by
|
59f772c519
|
解决冲突
|
2024-12-16 11:23:00 +08:00 |
|
sk
|
bcbc162549
|
解决冲突
|
2024-12-16 11:17:11 +08:00 |
|
by
|
4d65851083
|
后台补单BUG修改
|
2024-12-16 10:16:55 +08:00 |
|
by
|
8b40eb3c49
|
后台补单BUG修改
|
2024-12-16 10:10:45 +08:00 |
|
by
|
d791c4d02c
|
后台补单BUG修改
|
2024-12-16 10:03:36 +08:00 |
|
by
|
db24cf0620
|
充值增加log
|
2024-12-13 17:53:13 +08:00 |
|
by
|
7d6ee4c3bd
|
充值增加log
|
2024-12-13 17:51:59 +08:00 |
|
by
|
5c64d97728
|
报错修改
|
2024-12-13 17:42:45 +08:00 |
|
sk
|
5ca1048b18
|
Merge branch 'release' into develop
|
2024-12-13 11:16:09 +08:00 |
|
sk
|
9c3f3ea191
|
fix:机器人服务房间管理器房间删除
|
2024-12-13 11:15:43 +08:00 |
|
sk
|
bf636de73a
|
fix:机器人离场金币
|
2024-12-12 09:34:13 +08:00 |
|
sk
|
acd3f4f676
|
机器人添加状态日志
|
2024-12-11 17:17:23 +08:00 |
|
sk
|
13e03f7428
|
fix:金币存钱罐跨天重置
|
2024-12-11 16:10:39 +08:00 |
|
sk
|
53ebe7bbdc
|
系统赠送记录破产补助
|
2024-12-10 10:49:10 +08:00 |
|
sk
|
b1d365e030
|
好友申请数据修复
|
2024-12-02 17:10:19 +08:00 |
|
sk
|
2d43a4153a
|
fix同意好友申请申请记录没有删除
|
2024-12-02 15:53:42 +08:00 |
|
sk
|
8a9a4f0c2d
|
fix同意好友申请申请记录没有删除
|
2024-12-02 14:58:23 +08:00 |
|
sk
|
794880b644
|
添加注释
|
2024-11-27 16:31:47 +08:00 |
|
sk
|
1d89c089c1
|
修改日志级别
|
2024-11-27 13:42:07 +08:00 |
|
sk
|
f71ea6ca19
|
修改日志
|
2024-11-27 10:04:09 +08:00 |
|
sk
|
9629db34e6
|
修复玩家缓存释放
|
2024-11-26 20:19:12 +08:00 |
|
sk
|
5a9325a2ce
|
no message
|
2024-11-26 14:41:09 +08:00 |
|
DESKTOP-45ANQ2C\unis
|
9b3d0aeb6e
|
道具合成修改活动日志
|
2024-11-26 14:40:57 +08:00 |
|
sk
|
343a7a7abb
|
抽奖活动通知获的抽奖码
|
2024-11-22 17:02:46 +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
|
9f6b5469fa
|
好友进房卡场房卡余额检测
|
2024-11-21 15:27:58 +08:00 |
|
sk
|
538a920a4d
|
竞技馆房卡扣除问题
|
2024-11-21 14:19:19 +08:00 |
|
sk
|
1e2eeebfda
|
竞技馆房间列表返回房主id
|
2024-11-21 13:22:45 +08:00 |
|
sk
|
c737007e20
|
修改房卡扣除和招募
|
2024-11-21 11:38:06 +08:00 |
|
sk
|
a9ffcb1c4a
|
修改竞技馆房间列表排序
|
2024-11-20 18:31:22 +08:00 |
|
sk
|
eb265f69e8
|
在线人数过滤超管平台
|
2024-11-20 10:39:40 +08:00 |
|
sk
|
9906c0fb80
|
no message
|
2024-11-19 10:36:22 +08:00 |
|
sk
|
0f1f8a03c2
|
系统房奖品价值缺失
|
2024-11-15 16:43:37 +08:00 |
|
sk
|
b52f84d182
|
statistics
|
2024-11-15 15:21:01 +08:00 |
|
sk
|
b497bd103a
|
玩家缓存释放问题
|
2024-11-15 11:18:28 +08:00 |
|
sk
|
d0072d40b4
|
抽奖活动房卡消耗统计问题
|
2024-11-14 17:39:35 +08:00 |
|
sk
|
dfe093b03e
|
no message
|
2024-11-14 15:23:40 +08:00 |
|
sk
|
f989492019
|
tienlen房卡场不能中途离开
|
2024-11-14 15:07:51 +08:00 |
|
sk
|
1db15bd6f3
|
no message
|
2024-11-14 11:54:38 +08:00 |
|
sk
|
d3f276f0bf
|
兑换优化
|
2024-11-14 11:13:47 +08:00 |
|
sk
|
0585fe236d
|
修复登出时间错误
|
2024-11-17 15:20:35 +08:00 |
|
sk
|
28b6cb6a85
|
抽奖活动机器人发奖调整
|
2024-11-13 11:17:07 +08:00 |
|
sk
|
f0e18b16d0
|
删除测试代码
|
2024-11-13 09:22:01 +08:00 |
|
sk
|
3cc2aa1ac6
|
隐藏关闭的竞技馆房间
|
2024-11-12 18:03:39 +08:00 |
|
sk
|
1acfab2ac7
|
修复jwt超时设置
|
2024-11-12 16:47:37 +08:00 |
|
sk
|
3eb997c7c3
|
隐藏关闭的竞技馆配置房间
|
2024-11-12 16:13:13 +08:00 |
|
sk
|
310156dd35
|
兑换商城地址
|
2024-11-12 15:56:27 +08:00 |
|
sk
|
90e11a0dad
|
兑换商城地址
|
2024-11-12 15:08:16 +08:00 |
|
sk
|
d1afed32c2
|
缓存优化
|
2024-11-12 10:51:04 +08:00 |
|
sk
|
8aaf1b40f3
|
rename
|
2024-11-11 11:44:20 +08:00 |
|
sk
|
71f6b0246b
|
竞技馆引导
|
2024-11-11 11:37:32 +08:00 |
|
sk
|
a9d67662b3
|
gamedata空指针
|
2024-11-09 14:09:39 +08:00 |
|
sk
|
752ef5d6e0
|
no message
|
2024-11-08 14:50:21 +08:00 |
|
sk
|
970db216f4
|
兑换问题
|
2024-11-08 14:25:53 +08:00 |
|
sk
|
94ad9f9835
|
网页登录
|
2024-11-08 11:51:23 +08:00 |
|
sk
|
c3ff0dc8ef
|
关闭等级排行榜
|
2024-11-08 10:40:36 +08:00 |
|
sk
|
45e1fd8a80
|
网页兑换
|
2024-11-07 17:48:22 +08:00 |
|
by
|
af0e29fc1a
|
金币存钱罐
|
2024-11-06 09:23:51 +08:00 |
|
sk
|
8444db2e85
|
修改房间推荐算法每次推荐不同房间
|
2024-11-05 17:08:39 +08:00 |
|
sk
|
0176f59e76
|
删除测试代码
|
2024-11-05 16:42:08 +08:00 |
|
sk
|
904f30ee8c
|
招募房间推荐规则修改
|
2024-11-05 15:21:57 +08:00 |
|
sk
|
9e85b4a1a7
|
新手引导测试代码
|
2024-11-05 14:48:59 +08:00 |
|
sk
|
5fdd7fe91d
|
修复登录异常
|
2024-11-05 10:17:42 +08:00 |
|
sk
|
23ea951eb0
|
使用go module
|
2024-11-04 14:02:22 +08:00 |
|
sk
|
7d9477b53c
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-11-04 10:28:18 +08:00 |
|
sk
|
4de80e3e74
|
修复新手引导
|
2024-11-04 10:25:52 +08:00 |
|
by
|
778de206ca
|
引導增加url
|
2024-11-04 09:38:25 +08:00 |
|
sk
|
e77714fded
|
登录返回玩家id
|
2024-11-04 09:14:11 +08:00 |
|
sk
|
53c94f47fc
|
游戏中不允许接口扣道具
|
2024-11-01 18:03:11 +08:00 |