tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,045 Commits 9 Branches 0 Tags 86 MiB
Commit Graph

871 Commits

Author SHA1 Message Date
by bdb9faa471 增加log 2025-01-09 17:08:37 +08:00
by 05581aa1e8 增加log 2025-01-09 17:02:29 +08:00
sk e2ce12b74d fix 推币机 2025-01-09 16:38:51 +08:00
sk 2f9f2513c6 fix 订单发货重复 2025-01-09 15:59:26 +08:00
sk 87a9a65643 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2025-01-09 15:54:28 +08:00
sk 6db4ceec10 add 推币机 2025-01-09 15:53:19 +08:00
by f5d7e36611 充值订单 2025-01-09 14:59:11 +08:00
by 26ac8c302e 充值订单 2025-01-09 14:37:05 +08:00
by 9a1bccf14c 年兽排行榜 2025-01-12 00:01:55 +08:00
by 438e868342 年兽排行榜 2025-01-12 00:01:40 +08:00
by 2820f26132 年兽排行榜修改 2025-01-09 09:18:42 +08:00
sk 1d52b88bdd Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2025-01-08 15:09:34 +08:00
sk a92a04a81d add 推币机活动 2025-01-08 14:46:29 +08:00
by 62f27c4723 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2025-01-08 11:27:37 +08:00
by 6dffae7546 年兽排行榜 2025-01-08 11:27:20 +08:00
sk cf196814e0 解决冲突 2025-01-08 11:25:17 +08:00
sk ac0daa39a4 fix 红包活动顺序 2025-01-08 11:24:09 +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 d494205ede 年兽排行榜 2025-01-08 11:09:02 +08:00
by f6d0fa3b02 年兽签到额外奖励 2025-01-08 10:38:36 +08:00
sk a40b25d437 解决冲突 2025-01-07 16:10:33 +08:00
by 2beffda5b6 年兽礼包 2025-01-07 11:42:28 +08:00
by 8462343715 年兽礼包 2025-01-07 11:25:21 +08:00
by ebc662d636 更新配置 2025-01-07 09:28:09 +08:00
by 03d1f119fe 年兽任务 2025-01-06 17:59:24 +08:00
by 601a5efe87 删除log 2025-01-06 17:53:13 +08:00
by bed3214631 年兽任务 2025-01-06 17:51:42 +08:00
by 6a712e5b19 年兽排行榜统计 2025-01-07 00:24:25 +08:00
sk 56bfab6cbe modify 红包活动 2025-01-06 16:44:49 +08:00
by 4923b057df 年兽排行榜统计 2025-01-06 16:20:17 +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 579c579118 add 累消活动账变类型 2025-01-06 14:46:36 +08:00
sk ee9878957a modify 累消活动开关 2025-01-06 14:08:40 +08:00
by b4c377fc44 年兽 2025-01-06 13:40:57 +08:00
by de391699b8 年兽排行榜奖励走后台+帐变记录 2025-01-06 11:59:12 +08:00
by a5bf9df289 年兽 2025-01-04 11:55:08 +08:00
by a51ec6667d 年兽 2025-01-04 11:04:48 +08:00
by 18e9575aa3 年兽 2025-01-04 10:31:02 +08:00
sk b76949b468 fix 好友申请列表 2025-01-04 10:23:58 +08:00
by 044cf9f863 年兽排行榜 2025-01-03 16:57:40 +08:00
sk 5db3c767e4 fix 红包活动 2025-01-03 15:50:06 +08:00
sk 2bcbfaec2f fix 红包活动 2025-01-03 15:02:33 +08:00
sk 2aff7b19fb Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2025-01-03 14:13:42 +08:00
sk e6baf7ef86 fix 红包活动 2025-01-03 14:12:23 +08:00
by 79abb14bd3 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2025-01-03 14:09:48 +08:00
by 8a0502302f 年兽排行榜 2025-01-03 14:09:43 +08:00
sk 03ac53b7e8 fix 数据修复 2025-01-03 13:56:50 +08:00
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