sk
|
71b5e2599d
|
Merge branch 'release' into 0507
|
2024-05-07 13:46:54 +08:00 |
|
sk
|
cb1a157813
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-05-07 13:42:27 +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 |
|
sk
|
6aed244c8c
|
update data
还原
DB_Createroom.xlsx
DB_Game_Drop.xlsx
|
2024-05-07 09:53:38 +08:00 |
|
kxdd
|
ad4a424024
|
Merge branch 'dev_newTimeitem' into develop
# Conflicts:
# gamesrv/tienlen/playerdata_tienlen.go
|
2024-05-06 18:34:37 +08:00 |
|
sk
|
6ffe1d5375
|
更新v卡掉落表
|
2024-05-06 17:55:32 +08:00 |
|
kxdd
|
e6b3084bc5
|
Merge branch 'dev_pigbank' into develop
|
2024-05-06 17:15:37 +08:00 |
|
kxdd
|
161d215ffd
|
--bug=1000247 --user=李海亮 存钱罐购买后相关问题 https://www.tapd.cn/31044302/s/1010551
|
2024-05-06 17:14:59 +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
|
1430e96752
|
update data
|
2024-05-06 16:09:25 +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 |
|
sk
|
23b44237d8
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-05-06 11:32:29 +08:00 |
|
sk
|
d6cb1f3266
|
兼容以0开头的手机号登录
|
2024-05-06 11:19:41 +08:00 |
|
sk
|
404017c33e
|
no message
|
2024-05-06 11:19:41 +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
|
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
|
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 |
|
sk
|
1231f711dc
|
xlsx工具支持索引
|
2024-04-29 16:50:35 +08:00 |
|
sk
|
c6c507ecb0
|
修复手机号登录问题
|
2024-04-29 16:47:05 +08:00 |
|
kxdd
|
a01eba7242
|
Merge branch 'dev_timeitem' into develop
|
2024-04-29 11:40:17 +08:00 |
|
kxdd
|
2fbb9d0d0e
|
记牌器时效道具修改
|
2024-04-29 11:39:50 +08:00 |
lihailiang
|
f7ae511332
|
存钱罐数据添加
|
2024-04-29 11:33:53 +08:00 |
|
lihailiang
|
c65946aec0
|
Merge branch 'dev_timeitem' into develop
|
2024-04-29 10:10:06 +08:00 |
|
kxdd
|
4b04e554f8
|
记牌器配置修改
|
2024-04-29 09:54:43 +08:00 |
|
kxdd
|
a2bfdd1d01
|
合并代码
|
2024-04-28 18:30:00 +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
|
cad0f24bd8
|
机器人比赛场数量参数
|
2024-04-28 18:02:16 +08:00 |
|
kxdd
|
a7ec02b38e
|
1.记牌器道具时限修改
2.存钱罐数据创建
|
2024-04-28 17:36:08 +08:00 |
|
kxdd
|
a6a255f04b
|
1.记牌器时限修改
2.存钱罐配置数据
|
2024-04-28 17:34:49 +08:00 |
|
by
|
95701368a6
|
上传服务器脚本提交
|
2024-04-28 17:30:08 +08:00 |
|
sk
|
0cc96a5747
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-04-28 16:47:49 +08:00 |
|
sk
|
3bfcaaf110
|
修复钻石账变记录
|
2024-04-28 16:47:41 +08:00 |
|
by
|
cfa469a02e
|
log修改
|
2024-04-28 15:51:13 +08:00 |
|
sk
|
0da4aa2f09
|
evt_online临时删除
|
2024-04-28 15:28:55 +08:00 |
|
sk
|
cc4125fee5
|
机器人互动表情
|
2024-04-28 14:59:13 +08:00 |
|
sk
|
2e6928f317
|
添加渠道信息
|
2024-04-28 11:45:43 +08:00 |
|
sk
|
4d9fee9b11
|
机器人互动表情
|
2024-04-28 11:34:37 +08:00 |
|
sk
|
864074490b
|
忽略xlsx2binary
|
2024-04-26 18:22:42 +08:00 |