yuanshuai
|
991a16eebd
|
Revert "Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_protocol into master_test_gn"
This reverts commit a6721e2f5c , reversing
changes made to c187fb3c49 .
|
2021-09-09 20:37:46 +08:00 |
yuanshuai
|
a6721e2f5c
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_protocol into master_test_gn
# Conflicts:
# protos/CommonProto.proto
# protos/PlayerInfoProto.proto
|
2021-09-09 16:57:21 +08:00 |
yuanshuai
|
d4e96a43d3
|
四象心法协议提交
|
2021-09-09 16:54:29 +08:00 |
duhui
|
e0d5058c04
|
四灵试炼修改
|
2021-08-31 11:38:36 +08:00 |
duhui
|
59dd029a1b
|
Merge branch 'master_test_hw_four_challenge' into dev_dh_fourspirit2
# Conflicts:
# protos/CommonProto.proto
# protos/MessageTypeProto.proto
# protos/PlayerInfoProto.proto
四灵试炼合并
|
2021-08-31 11:38:12 +08:00 |
xuexinpeng
|
3b51b925a7
|
太初密卷
|
2021-08-16 16:57:31 +08:00 |
xuexinpeng
|
43b3dbe56f
|
寻宝迷踪
|
2021-08-10 10:02:58 +08:00 |
lvxinran
|
35c1267af8
|
充值前检测
|
2021-08-07 16:58:39 +08:00 |
duhui
|
a2b561512e
|
跨服状态推送
|
2021-07-30 14:44:54 +08:00 |
duhui
|
0d7d84e07b
|
协议修改
|
2021-07-29 14:29:10 +08:00 |
duhui
|
01b8e75ecb
|
获取跨服信息
|
2021-07-28 16:48:19 +08:00 |
lvxinran
|
e4361e0061
|
查看回放协议号
|
2021-07-31 00:30:05 +08:00 |
lvxinran
|
f604d885da
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-07-30 23:59:29 +08:00 |
lvxinran
|
69e6440c21
|
称号激活推送
|
2021-07-23 15:28:41 +08:00 |
lvxinran
|
e3e1a3d6b4
|
Merge branch 'master_test_gn' into master_test_gn_arena
|
2021-08-01 08:08:49 +08:00 |
lvxinran
|
d334387be6
|
阶段推送
|
2021-08-01 01:44:18 +08:00 |
lvxinran
|
7852fdbaf9
|
无尽秘宝刷新推送
|
2021-07-22 15:52:18 +08:00 |
mengchengzhen
|
8021945db7
|
Merge branch 'master_test_gn' into master_test_gn_zbh
# Conflicts:
# protos/MessageTypeProto.proto
|
2021-07-15 17:09:39 +08:00 |
duhui
|
79f16401f1
|
Merge branch 'dh_dev_qimendunjia' into master_test_gn
奇门遁甲协议合并
|
2021-07-15 16:36:59 +08:00 |
mengchengzhen
|
a9278353d7
|
//许愿魂印
|
2021-07-13 17:05:09 +08:00 |
duhui
|
7507ed50ab
|
心愿抽卡,删除无用协议
|
2021-06-29 15:23:00 +08:00 |
duhui
|
668bb6af12
|
心愿抽卡
|
2021-06-29 11:08:11 +08:00 |
duhui
|
eb7e575ed7
|
奇门遁甲协议初版
|
2021-06-09 13:39:07 +08:00 |
duhui
|
c9195e2cd9
|
Merge branch 'dh_dev_draw' into master_test_gn
|
2021-05-28 10:11:27 +08:00 |
lvxinran
|
a84116efb9
|
Merge branch 'master_test_gn' into master_test_gn_endless
|
2021-07-03 01:21:32 +08:00 |
mengchengzhen
|
b93d268293
|
福利红包
|
2021-05-26 11:16:06 +08:00 |
lvxinran
|
6eca63ddbc
|
Merge branch 'master_test_gn' into master_test_gn_endless
|
2021-05-25 11:57:22 +08:00 |
xuexinpeng
|
ffb1e0c064
|
心魔试炼
|
2021-05-25 11:49:29 +08:00 |
duhui
|
a497fb87fb
|
选择抽卡
|
2021-05-24 17:19:12 +08:00 |
xuexinpeng
|
8ed31b55e3
|
Merge branch 'master_test_gn_hardstage' into master_test_gn
# Conflicts:
# protos/CommonProto.proto
# protos/PlayerInfoProto.proto
|
2021-05-24 11:15:54 +08:00 |
lvxinran
|
d96dec8506
|
无尽秘宝
|
2021-05-20 18:34:30 +08:00 |
mengchengzhen
|
e6d260f004
|
福利红包
|
2021-05-20 11:29:40 +08:00 |
xuexinpeng
|
833fa7d1ad
|
等级奖励
|
2021-05-19 19:03:20 +08:00 |
mengchengzhen
|
6ee55ef495
|
福利红包
|
2021-05-18 14:21:19 +08:00 |
xuexinpeng
|
d31120889d
|
合并
|
2021-05-17 11:09:08 +08:00 |
duhui
|
cf1e0e2c85
|
修行突破神印推送
|
2021-05-14 16:46:14 +08:00 |
duhui
|
b7c9bd9c72
|
神印返回修改
|
2021-05-13 10:32:00 +08:00 |
duhui
|
b33c4d70b8
|
修行玩法
|
2021-05-12 18:03:07 +08:00 |
mengchengzhen
|
174701995f
|
山河社稷图
|
2021-05-11 13:36:15 +08:00 |
lvxinran
|
6ba733425e
|
无尽副本获得新英雄推送
|
2021-05-08 18:17:09 +08:00 |
lvxinran
|
4d0dd49782
|
获取无尽编队
|
2021-05-14 16:06:32 +08:00 |
xuexinpeng
|
8b934e6557
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_protocol into master_test_gn
|
2021-04-26 18:32:35 +08:00 |
mengchengzhen
|
d0277fe533
|
新礼包推送
|
2021-04-26 10:45:36 +08:00 |
xuexinpeng
|
8e6402710e
|
踏碎凌霄协议
|
2021-04-23 17:52:32 +08:00 |
mengchengzhen
|
6deaeac11f
|
装备升星(云游商人)
|
2021-04-16 17:16:59 +08:00 |
lvxinran
|
a0bf47d562
|
福星高照购买协议
|
2021-04-19 18:38:14 +08:00 |
whb
|
0b44deb17f
|
Merge branch 'master_test_gn' into master_test_gn_whb
# Conflicts:
# protos/PlayerInfoProto.proto
|
2021-03-30 13:52:11 +08:00 |
mengchengzhen
|
b5836049e9
|
称号,皮肤,坐骑
|
2021-03-29 12:00:56 +08:00 |
whb
|
ad93e085c0
|
修改激活图鉴名字
|
2021-03-22 14:12:43 +08:00 |
lvxinran
|
6c66acc9b4
|
充值成功推送
|
2021-03-20 21:11:28 +08:00 |