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

261 Commits

Author SHA1 Message Date
kxdd e95d55ed10 Merge branch 'dev_timeitem_n1' into develop 
# Conflicts:
#	model/player.go
 2024-05-13 16:07:25 +08:00
kxdd 8a5752bf38 --story=1000624 --user=李海亮 记牌器优化二版 https://www.tapd.cn/31044302/s/1011279 2024-05-13 16:01:49 +08:00
kxdd c4161a6b39 --story=1000624 --user=李海亮 记牌器优化二版 https://www.tapd.cn/31044302/s/1011235 2024-05-13 15:18:13 +08:00
sk 1de1383383 tienlen排位加成 2024-05-13 12:02:16 +08:00
kxdd 437ec223f7 --story=1000624 --user=李海亮 记牌器优化二版 https://www.tapd.cn/31044302/s/1011235 2024-05-13 10:52:53 +08:00
sk dcb54a2f58 修改道具掉落功能 2024-05-11 15:54:33 +08:00
sk d7316c0ef2 review 2024-05-10 18:23:03 +08:00
sk 995cabbea6 update DB_GameItem.xlsx 2024-05-10 18:04:25 +08:00
sk 0d81105909 添加配置参数 
CloseChannelSwitch 关闭渠道开关功能
 2024-05-10 17:10:45 +08:00
sk f45708a8cc 道具掉落添加渠道开关 2024-05-10 16:38:10 +08:00
sk 9474b0dc30 修改游戏掉落物品配置规则 2024-05-10 14:47:38 +08:00
sk 6bd9d8f6c5 重置水池 2024-05-08 18:49:00 +08:00
sk 05f1e805b5 重置水池 2024-05-08 18:33:33 +08:00
sk a822e21524 代码优化 2024-05-08 14:10:27 +08:00
sk 48456483c7 tienlen牌库随机索引错误 2024-05-07 16:19:03 +08:00
kxdd 04cf926909 Merge branch 'dev_pigbank' into develop 2024-05-07 13:43:15 +08:00
kxdd 7b79b0defd 存钱罐 tienlen场景判断修改 2024-05-07 13:41:24 +08:00
kxdd ad4a424024 Merge branch 'dev_newTimeitem' into develop 
# Conflicts:
#	gamesrv/tienlen/playerdata_tienlen.go
 2024-05-06 18:34:37 +08:00
kxdd 7113465765 记牌器优化 2024-05-06 16:37:09 +08:00
kxdd bbf2e11d8b 记牌器调整添加 
--story=1000618 --user=李海亮 记牌器调整 https://www.tapd.cn/31044302/s/1010552
 2024-05-06 16:18:11 +08:00
sk 9338164838 兼容以0开头的手机号登录 2024-05-06 15:45:06 +08:00
kxdd 7756f3ae19 还原本来的道具功能 
--task=1000620 --user=李海亮 记牌器调整多道具修改逻辑 https://www.tapd.cn/31044302/s/1010514
 2024-05-06 13:44:49 +08:00
kxdd 83f571b543 Merge branch 'dev_pigbank' into develop 2024-05-06 10:31:22 +08:00
kxdd 84373d1297 【对局失败后存钱罐内没有存钱】https://www.tapd.cn/31044302/bugtrace/bugs/view?bug_id=1131044302001000241 2024-05-06 10:30:45 +08:00
kxdd 016ea68379 Merge branch 'dev_pigbank' into develop 2024-04-30 18:45:34 +08:00
kxdd 7c689dc6ec 存钱罐修改 2024-04-30 18:44:51 +08:00
sk 1979637197 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-04-30 17:45:51 +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 b10cf493b5 存钱罐添加日志 2024-04-30 14:05:36 +08:00
kxdd c2d7c1bfb5 存钱罐功能 2024-04-30 09:45:40 +08:00
sk f4205e72ac no message 2024-04-29 18:20:38 +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
kxdd a7ec02b38e 1.记牌器道具时限修改 
2.存钱罐数据创建
 2024-04-28 17:36:08 +08:00
sk 40822ad4d0 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-04-26 15:11:01 +08:00
by 7fb33896de 周卡礼包需求修改 2024-04-26 14:57:26 +08:00
sk 2fe90f46a5 游戏牌局统计 2024-04-26 14:51:37 +08:00
lihailiang e2e2a446bf tienlen时效类道具控制 2024-04-26 10:08:55 +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 82b406cbcd 水池添加调节赔率和新手池 2024-04-24 16:26:35 +08:00
by 9f4d1089cb Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-04-23 10:29:21 +08:00
by 91ec9259bb 玩家等级排行榜 2024-04-23 09:58:57 +08:00
sk 12383a1e20 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-04-23 09:05:26 +08:00
sk 0de01b7eaa 复仇者联盟 2024-04-22 18:39:27 +08:00
kxdd 5c37af3fe1 添加记牌器 2024-04-22 18:36:04 +08:00
sk 9a9c62c1da etcd优化 2024-04-20 10:20:22 +08:00
sk 65aa4efebb fix:个人水池全局配置读取失败 2024-04-19 17:55:05 +08:00
sk 33a087d1d7 开启拉霸游戏 2024-04-19 11:43:13 +08:00
sk aadfc98306 no message 2024-04-19 09:57:48 +08:00
sk 4fb1ec47b9 集卡活动 2024-04-18 15:01:43 +08:00
sk 8ac802e2a3 fix:道具数量同步错误 2024-04-17 17:49:34 +08:00
kxdd d792e0ceb1 【高棉象棋的每步时长优化】 
https://www.tapd.cn/31044302/prong/stories/view/1131044302001000540
 2024-04-17 14:48:40 +08:00
sk c6799597c3 rename 2024-04-17 10:19:01 +08:00
sk 4702c2d8bb 过滤rabbitmq机器人消息 2024-04-17 09:15:07 +08:00
sk 737fea1e23 活动代码优化 2024-04-16 17:44:56 +08:00
sk f67df3c8df 集卡活动 2024-04-16 14:07:42 +08:00
sk 84dd2bdc79 init 2024-04-15 15:12:47 +08:00
sk 9405ae091e init 2024-04-12 10:35:47 +08:00