570 Commits

Author SHA1 Message Date
aozhiwei
4a3ece88f7 merge master 2019-06-11 12:00:59 +08:00
aozhiwei
281c3b1fe4 1 2019-06-11 11:54:18 +08:00
aozhiwei
c5ac9753ce 1 2019-06-11 11:53:59 +08:00
aozhiwei
a4fbedb72b 1 2019-06-11 11:53:20 +08:00
aozhiwei
9bb20edbe0 1 2019-06-11 11:52:39 +08:00
aozhiwei
975bc60598 1 2019-06-11 11:52:11 +08:00
aozhiwei
ef671471d2 1 2019-06-11 11:51:58 +08:00
aozhiwei
6cf6ab0d20 添加碰撞检测walkzone 2019-06-11 11:51:09 +08:00
aozhiwei
5669d2d156 add walk zone 2019-06-11 09:24:50 +08:00
aozhiwei
d9b4ce5554 碰撞体 重构 2019-06-11 09:09:02 +08:00
aozhiwei
c00c0aad31 1 2019-06-10 17:18:58 +08:00
aozhiwei
6ad0a30010 1 2019-06-10 17:16:09 +08:00
aozhiwei
1d405bd088 1 2019-06-10 17:09:54 +08:00
aozhiwei
66410aefce 1 2019-06-10 15:39:48 +08:00
aozhiwei
34d91a7942 1 2019-06-10 11:40:00 +08:00
aozhiwei
66f692e324 1 2019-06-10 11:37:40 +08:00
aozhiwei
5e2122d2a9 1 2019-06-10 10:36:28 +08:00
aozhiwei
dc557b32ae 1 2019-06-07 23:02:27 +08:00
aozhiwei
d52daccd94 human add movement 2019-06-07 22:59:32 +08:00
aozhiwei
7515adebae 1 2019-06-07 22:32:47 +08:00
aozhiwei
b52ba4ee77 1 2019-06-07 22:25:17 +08:00
aozhiwei
3854633a19 add movement.* 2019-06-07 21:38:15 +08:00
aozhiwei
5af648f6c0 1 2019-06-07 21:14:05 +08:00
aozhiwei
d1d5820e88 add GetAabbBox GetCircleBox 2019-06-07 21:07:17 +08:00
aozhiwei
2b119145c7 remove touch object 2019-06-07 21:01:38 +08:00
zhulongjun
da61f163bf 1 2019-06-06 19:04:03 +08:00
aozhiwei
b3fb8beff5 1 2019-06-06 14:48:33 +08:00
aozhiwei
714e755a96 1 2019-06-06 14:14:22 +08:00
aozhiwei
529ca37af4 添加机器人处理 2019-06-06 09:38:07 +08:00
aozhiwei
1e170d2c6c 1 2019-06-05 18:50:48 +08:00
aozhiwei
28825c7d9a merge master 2019-06-05 15:55:45 +08:00
aozhiwei
c0ead578bf add ssping sspong 2019-06-05 15:54:57 +08:00
aozhiwei
e786241149 master server ok 2019-06-05 14:42:14 +08:00
aozhiwei
8fc94f972f 1 2019-06-04 16:19:03 +08:00
aozhiwei
9a66bb86e2 1 2019-06-04 16:16:00 +08:00
aozhiwei
9d35a46c41 merge master 2019-06-04 16:10:39 +08:00
aozhiwei
b8a9a1a618 1 2019-06-04 16:05:54 +08:00
aozhiwei
e6231e0e49 merge master 2019-06-04 15:38:24 +08:00
aozhiwei
727352fb9c 修复武器问题 2019-06-04 15:31:03 +08:00
aozhiwei
4fdcfae520 1 2019-06-04 15:29:27 +08:00
aozhiwei
ca1093988a 添加在线数日志 2019-06-04 14:40:59 +08:00
aozhiwei
4cdcc694ac 添加技能timer初始化 2019-06-04 13:50:22 +08:00
aozhiwei
bc5b1ca1eb battleReport添加map_id map_tpl_name字段 2019-06-04 11:49:10 +08:00
aozhiwei
693f732864 机器人不发结算 2019-06-04 11:28:41 +08:00
aozhiwei
eb3b0f4e9b merge master 2019-06-04 10:41:29 +08:00
aozhiwei
027a3de2ea 房间内所有玩家下线后自动释放房间对象 2019-06-04 10:37:46 +08:00
aozhiwei
87ac55c041 结算添加日志 2019-06-04 09:49:46 +08:00
aozhiwei
f20fd2a1cd 1 2019-06-04 09:27:56 +08:00
aozhiwei
8934f22818 1 2019-06-03 19:52:46 +08:00
aozhiwei
d2b770c9fb 1 2019-06-03 17:02:39 +08:00