Commit Graph

296 Commits (9841869b38e34acd110291da72d8dda552a9b1c5)

Author SHA1 Message Date
gaojie 02250eacda 好友聊天推送 2019-06-12 18:14:25 +08:00
wangyuan 8dd0438140 修改indication回复 2019-06-11 20:21:18 +08:00
gaojie 14bed7e3f6 好友聊天推送 2019-06-11 17:57:57 +08:00
wangyuan 7b55af89bc 回执indication 2019-06-11 16:35:40 +08:00
gaojie 17c133ab4c 搜索好友 2019-06-11 14:20:29 +08:00
gaojie 7d9a7d4601 删除好友,领取赠礼 2019-06-11 11:41:25 +08:00
gaojie a567484c5c 赠送体力,删除好友 2019-06-11 10:45:23 +08:00
gaojie ce75d59625 lua协议提交 2019-06-10 17:02:29 +08:00
gaojie 875a171514 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-06-10 10:37:54 +08:00
gaojie 5348c9d16a 好友申请 2019-06-10 10:37:49 +08:00
wangyuan dd061a5f87 历史买过礼包id 2019-06-06 18:26:33 +08:00
gaojie b32cef852a Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/CommonProto.proto
#	protos/MessageTypeProto.proto
#	protos/PlayerInfoProto.proto
2019-06-06 17:23:25 +08:00
gaojie 4ea63dbdbf 好友 2019-06-06 17:22:03 +08:00
wangyuan ed8a860468 活动开启状态 2019-06-06 14:22:52 +08:00
wangyuan fe9e6d3826 提交首冲 2019-06-06 12:14:28 +08:00
wangyuan 58076f61d1 购买礼包 2019-06-06 10:15:01 +08:00
gaojie dd9651f8f7 fix 2019-06-05 15:39:39 +08:00
gaojie 1405ed0a78 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/MessageTypeProto.proto
2019-06-05 14:36:22 +08:00
wangyuan 69f41d63cf fix 2019-06-06 19:03:37 +08:00
gaojie b4c8f0be9f 聊天 2019-06-05 14:35:30 +08:00
wangyuan f3d340f839 每日任务 2019-06-05 10:47:38 +08:00
wangyuan c61e623dcc 累计充值活动 2019-06-04 09:52:53 +08:00
jiahuiwen 341c590c05 回退 2019-05-31 17:26:56 +08:00
jiahuiwen 364c321118 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-05-31 17:25:28 +08:00
wangyuan d2b9af5cc7 fix comment 2019-06-02 17:09:57 +08:00
wangyuan 35aa61409f delete unuse 2019-06-03 17:38:52 +08:00
jiahuiwen 537b847442 快速战斗推 主线任务 2019-05-31 17:25:17 +08:00
wangyuan 6bb775a7c8 fix 2019-05-28 15:22:59 +08:00
wangyuan f694a4529f 锻造个数 2019-05-28 14:42:24 +08:00
wangyuan 0679029853 fix 2019-05-28 09:58:02 +08:00
wangyuan 6569401a46 fix 2019-05-27 20:21:42 +08:00
wangyuan b59f3e25e7 战力变更 2019-05-27 20:18:55 +08:00
wangyuan 09f75235fb Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-05-27 14:02:01 +08:00
wangyuan f0034260c9 vip任务相关协议 2019-05-27 14:01:40 +08:00
wangyuan bd840fc87f fix name 2019-05-24 16:26:43 +08:00
wangyuan 3fc5344b23 vip特权 2019-05-24 07:34:22 +08:00
wangyuan 11abb3d96a 区域等级 2019-05-21 17:37:25 +08:00
wangyuan b4ba4a8e5e 挂机奖励 2019-05-20 14:50:16 +08:00
wangyuan 39cf14b335 增加怪物是否被击杀 2019-05-16 20:33:55 +08:00
gaojie c791eaa706 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-05-16 20:22:03 +08:00
gaojie 48b1889e27 分解卡牌 2019-05-16 20:21:57 +08:00
wangyuan ff151b470d 挂机推送 2019-05-16 20:18:34 +08:00
wangyuan 46bb38fde3 delete 2019-05-16 19:22:49 +08:00
wangyuan 8a76db460c 修改名称 2019-05-16 16:53:11 +08:00
wangyuan bcbab8834d fix 2019-05-16 16:45:11 +08:00
wangyuan 5397f27327 挂机刷新发现boss 2019-05-16 16:33:33 +08:00
wangyuan fadd30c694 delete unuse 2019-05-16 14:44:16 +08:00
wangyuan e6532f394e Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-05-16 14:37:13 +08:00
wangyuan 9872ff269f 挂机协议 2019-05-16 14:36:57 +08:00
gaojie 7563a5c03a Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/PlayerInfoProto.proto
2019-05-14 17:15:01 +08:00
gaojie 7254e72af6 fix 2019-05-14 17:14:13 +08:00
wangyuan d82265d293 time function 2019-05-14 16:31:30 +08:00
wangyuan 90dfae824a 秘盒今日抽取次数 2019-05-14 13:44:23 +08:00
wangyuan 1b1d14f4a2 fix 2019-05-14 10:36:48 +08:00
wangyuan d13086812d fix 2019-05-14 10:23:58 +08:00
wangyuan be9d558f17 时间控制功能 2019-05-14 10:23:05 +08:00
wangyuan 2ba6acdf68 增加是否跳过战斗 2019-05-13 15:17:17 +08:00
gaojie b7be080011 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-05-13 14:58:05 +08:00
gaojie 7035b62cc4 商店刷新 2019-05-13 14:58:01 +08:00
wangyuan 56553a36a3 查看战斗回放 2019-05-13 12:07:20 +08:00
gaojie d88f58b835 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/CommonProto.proto
2019-05-11 17:22:51 +08:00
gaojie 5265a6302b 获取商店信息 2019-05-11 17:22:16 +08:00
wangyuan 5b9874121c arena record 2019-05-11 16:24:06 +08:00
wangyuan c1396c4970 秘盒协议 2019-05-11 15:16:37 +08:00
wangyuan 08d899480e 删除无效字段 2019-05-11 10:47:37 +08:00
wangyuan bdaff6d8b0 我的进攻队伍 2019-05-10 17:43:12 +08:00
wangyuan 5f9a967322 只给我自己分数&排名 2019-05-10 16:15:50 +08:00
wangyuan aa28a176ba 竞技场进攻 2019-05-10 13:42:09 +08:00
wangyuan f4f4ba33f4 秘盒 2019-05-10 13:33:25 +08:00
wangyuan 427b1e8f92 排行榜信息 2019-05-10 10:31:06 +08:00
wangyuan 04f4958ab3 删除排名 2019-05-10 10:11:57 +08:00
wangyuan c62740355b fight time 2019-05-09 17:44:53 +08:00
wangyuan ffc5f435ee fix 2019-05-09 16:34:31 +08:00
wangyuan ebe0467572 fix 2019-05-09 15:50:20 +08:00
wangyuan 7cf2919302 获取竞技场基本信息 2019-05-09 15:37:36 +08:00
wangyuan 02f7b662b4 重铸等级 2019-05-09 11:03:49 +08:00
wangyuan 5df64e1a0b 装备重铸确认 2019-05-07 11:05:58 +08:00
wangyuan 4f8acaf535 gm response 2019-04-30 15:56:18 +08:00
jiahuiwen 918df26d74 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-04-30 13:49:36 +08:00
jiahuiwen 81ddc08e7b 任务完成奖励 2019-04-30 13:49:30 +08:00
wangyuan 56b8cdf80e gm response 2019-04-30 10:27:36 +08:00
jiahuiwen 84fcee959a 战斗事件 nextEventId 放到战后给 2019-04-29 15:10:25 +08:00
gaojie 4432eafb25 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-04-25 18:16:33 +08:00
wangyuan a38049b909 挂机 界面不展示背包信息 2019-04-25 23:52:24 +08:00
gaojie 4af0fa2467 起名 2019-04-25 18:16:28 +08:00
gaojie cde6387572 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-04-25 14:52:14 +08:00
gaojie c8888f89ee 随机名字 2019-04-25 14:52:06 +08:00
wangyuan c8990f16e4 进地图给最大血量 2019-04-25 14:37:05 +08:00
wangyuan ca61dbca3d 活动返回list 2019-04-22 18:00:38 +08:00
wangyuan 2ef1f58f1a 章节奖励移到活动中 2019-04-22 14:53:08 +08:00
wangyuan d0baaa1c7a 章节奖励 2019-04-22 11:48:22 +08:00
gaojie e2e5f55710 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-04-19 18:20:51 +08:00
gaojie 4bf1fbc2d1 分解 2019-04-19 18:20:47 +08:00
wangyuan 7d08c6f7fb Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-04-19 11:30:11 +08:00
wangyuan 445b09b7c7 delete unuse 2019-04-19 11:29:00 +08:00
jiahuiwen 7fe15d037a Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-04-19 11:28:27 +08:00
jiahuiwen 26e55d63b5 地图信息 2019-04-19 11:28:15 +08:00
wangyuan b1ad11676a outtime 2019-04-19 11:27:35 +08:00
wangyuan 1a1a709d3b outtime 2019-04-19 10:59:58 +08:00
jiahuiwen ebbd3145ec 快速战斗 2019-04-18 15:20:16 +08:00