|
|
b3a2f3719e
|
更新字段
|
2022-08-18 12:06:42 +08:00 |
|
|
|
aa8914c14e
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-18 11:36:22 +08:00 |
|
|
|
0e2db951be
|
Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-18 11:36:10 +08:00 |
|
|
|
117019a57d
|
随机掉落逻辑
|
2022-08-18 11:35:47 +08:00 |
|
liwei
|
e3d177e476
|
修复空对象异常错误
|
2022-08-18 11:34:56 +08:00 |
|
liwei
|
34bc631c9c
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-18 11:33:21 +08:00 |
|
|
|
51d0f01383
|
更新在线好友搜索
|
2022-08-18 11:32:33 +08:00 |
|
|
|
85c0fc0b72
|
更新本服在线用户
|
2022-08-18 11:32:33 +08:00 |
|
liwei
|
0af3ef8c60
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-18 11:05:41 +08:00 |
|
liwei1dao
|
6d844a192f
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-18 11:05:32 +08:00 |
|
liwei1dao
|
d56453ebb2
|
移除socket 过期代码，后面加心跳机制后再补上去
|
2022-08-18 11:05:25 +08:00 |
|
|
|
5da57b76ec
|
update
|
2022-08-18 10:46:13 +08:00 |
|
|
|
eda8d58118
|
update
|
2022-08-18 10:46:13 +08:00 |
|
liwei
|
714b2369e5
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-18 10:33:55 +08:00 |
|
liwei1dao
|
58e8c9002d
|
上传socket 读取超时设置
|
2022-08-18 10:32:47 +08:00 |
|
liwei1dao
|
ad390040d7
|
广播消息不发送未登录用户修复
|
2022-08-18 10:28:31 +08:00 |
|
liwei
|
1e8873c096
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-18 10:03:17 +08:00 |
|
|
|
bad7c44903
|
更新配置
|
2022-08-18 10:01:04 +08:00 |
|
liwei1dao
|
98f149b3ee
|
上传聊天成功返回
|
2022-08-18 09:52:18 +08:00 |
|
|
|
e3a3f3396b
|
更新配置
|
2022-08-18 09:46:37 +08:00 |
|
|
|
6c258e903b
|
好友搜索
|
2022-08-18 09:31:24 +08:00 |
|
|
|
d735a6bb15
|
随机任务
|
2022-08-18 09:31:21 +08:00 |
|
|
|
48270ee931
|
刪除不用的文件
|
2022-08-17 19:09:53 +08:00 |
|
|
|
b0db5645ea
|
丛林美食馆
|
2022-08-17 18:57:15 +08:00 |
|
liwei
|
5dc57b66c8
|
上传装备配置表穿戴错误问题
|
2022-08-17 17:20:59 +08:00 |
|
liwei
|
fe69c0bfbe
|
装备升级配置表异常保护处理
|
2022-08-17 17:15:57 +08:00 |
|
|
|
4402d62a42
|
升到满级还想继续升级的bug
|
2022-08-17 15:18:59 +08:00 |
|
|
|
1b55e1fadb
|
Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-17 14:56:35 +08:00 |
|
|
|
d853b31603
|
美食家
|
2022-08-17 14:55:22 +08:00 |
|
liwei1dao
|
94db272d64
|
上传武馆解锁接口
|
2022-08-17 10:38:23 +08:00 |
|
liwei1dao
|
5452d8a93c
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei
|
2022-08-17 09:55:00 +08:00 |
|
liwei1dao
|
ba0169ab47
|
上传转呗强化扣款逻辑修复
|
2022-08-17 09:54:41 +08:00 |
|
|
|
2dcebd44c4
|
发奖励
|
2022-08-17 09:53:03 +08:00 |
|
liwei1dao
|
a317fca98c
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei
|
2022-08-17 09:37:58 +08:00 |
|
|
|
fc788396dc
|
美食家
|
2022-08-16 18:53:15 +08:00 |
|
|
|
8b7822b836
|
抽卡推送获取英雄数据
美食家代码
|
2022-08-16 16:24:04 +08:00 |
|
|
|
61c9f00eaa
|
抽卡推送获取卡信息
美食家
|
2022-08-16 16:22:35 +08:00 |
|
|
|
4434f27e4c
|
模块名修改
|
2022-08-16 15:05:12 +08:00 |
|
|
|
6dc481f07d
|
给英雄加经验接口
|
2022-08-16 15:02:44 +08:00 |
|
|
|
96c421265d
|
领取奖励
|
2022-08-16 14:44:05 +08:00 |
|
liwei1dao
|
030eb04f44
|
上传武馆代码
|
2022-08-16 14:24:57 +08:00 |
|
|
|
302e85dc59
|
爬塔数据保存bug
|
2022-08-16 14:15:43 +08:00 |
|
|
|
3fdd7fe115
|
配置文件修改
|
2022-08-16 13:37:56 +08:00 |
|
|
|
3eb6773160
|
美食馆
|
2022-08-16 11:05:46 +08:00 |
|
|
|
6368eee720
|
获取数据断线问题
|
2022-08-16 10:48:58 +08:00 |
|
|
|
123132b175
|
Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-16 10:31:41 +08:00 |
|
|
|
42ee59ff2f
|
爬塔db 错误
|
2022-08-16 10:30:03 +08:00 |
|
liwei1dao
|
32086143e7
|
上传熊猫武馆代码
|
2022-08-16 10:10:20 +08:00 |
|
|
|
eefc249ba3
|
update list
|
2022-08-15 18:35:28 +08:00 |
|
|
|
9a040f7b94
|
json 上传
|
2022-08-15 18:25:47 +08:00 |
|
|
|
afc2468ef6
|
配置修改
|
2022-08-15 17:37:56 +08:00 |
|
|
|
bc9fdabfc3
|
抽卡协议修改
|
2022-08-15 17:11:45 +08:00 |
|
liwei1dao
|
e845ed0adc
|
上传武馆模块代码
|
2022-08-15 16:35:18 +08:00 |
|
liwei
|
8f80f08d5f
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-15 14:40:41 +08:00 |
|
liwei
|
7e9ca63928
|
上传道具使用的bug
|
2022-08-15 14:39:24 +08:00 |
|
|
|
1484b92816
|
抽卡
|
2022-08-15 13:00:58 +08:00 |
|
liwei1dao
|
d8284654d7
|
上传道具使用
|
2022-08-12 18:59:38 +08:00 |
|
liwei1dao
|
c9f67d7414
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei
|
2022-08-12 18:55:18 +08:00 |
|
liwei1dao
|
bcd9916491
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei
|
2022-08-12 18:53:51 +08:00 |
|
|
|
d7fbfe3dd6
|
配置表更新
|
2022-08-12 18:53:51 +08:00 |
|
liwei1dao
|
cecd70bfa9
|
修复道具使用的问题
|
2022-08-12 18:30:22 +08:00 |
|
|
|
24fb25692f
|
共鸣属性分配BUG
|
2022-08-12 10:43:49 +08:00 |
|
|
|
d61274b14f
|
共鸣协议 修改 支持多参数
|
2022-08-11 20:58:40 +08:00 |
|
|
|
02148af676
|
共鸣bug
|
2022-08-11 20:20:08 +08:00 |
|
|
|
0e0c88c29a
|
创建单个英雄接口调整
|
2022-08-11 19:45:16 +08:00 |
|
|
|
80a8fb20c5
|
Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-11 18:09:39 +08:00 |
|
|
|
601019c9b1
|
共鸣能量分配属性类型修改
|
2022-08-11 18:09:20 +08:00 |
|
|
|
206fa0f9bb
|
添加测试接口
|
2022-08-11 18:07:12 +08:00 |
|
liwei1dao
|
8c158797c6
|
修复db层代码接口错误
|
2022-08-11 18:05:21 +08:00 |
|
liwei1dao
|
c834ab0d9a
|
上传道具合成处理以及掉落组表二次处理
|
2022-08-11 18:00:42 +08:00 |
|
|
|
a8a42d97c1
|
Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-11 17:10:57 +08:00 |
|
|
|
6ee83fa224
|
配置表重定义key 并支持热更
|
2022-08-11 17:10:33 +08:00 |
|
liwei1dao
|
d8e5f48caa
|
优化聊天私聊不推送自己的问题
|
2022-08-11 16:20:28 +08:00 |
|
liwei1dao
|
63c2aa8b7f
|
上传评论问题
|
2022-08-11 15:53:11 +08:00 |
|
liwei1dao
|
a515c59e21
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-11 12:02:18 +08:00 |
|
liwei1dao
|
9ade1bb5a5
|
修复聊天系统消息群发机制
|
2022-08-11 12:02:13 +08:00 |
|
|
|
e289290571
|
Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-11 11:37:22 +08:00 |
|
|
|
161f8a4c20
|
技能升级配置表结构变化 对应读取程序修改
|
2022-08-11 11:37:03 +08:00 |
|
liwei1dao
|
377026b7ab
|
聊天业务bug修复
|
2022-08-11 10:41:43 +08:00 |
|
liwei1dao
|
36d3f893c8
|
上传聊天业务代码优化
|
2022-08-11 10:40:54 +08:00 |
|
liwei1dao
|
fe159fb96e
|
上传日志输出规范调整
|
2022-08-11 09:59:25 +08:00 |
|
|
|
55127dc69b
|
更新推送监听
|
2022-08-10 19:31:21 +08:00 |
|
|
|
646cabda56
|
更新点赞
|
2022-08-10 19:31:21 +08:00 |
|
liwei1dao
|
fcc53d71c6
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-10 19:28:57 +08:00 |
|
liwei1dao
|
18edbbad87
|
上传武器添加数据库报错问题，以及日志堆栈信息调整
|
2022-08-10 19:28:53 +08:00 |
|
|
|
2f96ac75b7
|
Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-10 18:48:51 +08:00 |
|
|
|
88afd36d50
|
爬塔发奖
|
2022-08-10 18:48:30 +08:00 |
|
liwei1dao
|
ccbac50506
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei
|
2022-08-10 18:43:03 +08:00 |
|
liwei1dao
|
0712c670fe
|
优化rpcx系统握手连接机制，避免重复连接情况，优化日志系统，错误日志自动输出错误文件以及行号
|
2022-08-10 18:42:06 +08:00 |
|
|
|
e7b9aabd08
|
爬塔相关
|
2022-08-10 16:55:54 +08:00 |
|
|
|
b20759142d
|
Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-10 15:25:14 +08:00 |
|
|
|
1670917a59
|
用户扩展数据图鉴数据保存
|
2022-08-10 15:24:47 +08:00 |
|
|
|
000219e54b
|
解决冲突
|
2022-08-10 15:17:49 +08:00 |
|
liwei1dao
|
3132135e6f
|
上传论坛模块测试优化以及编解码系统修复
|
2022-08-10 14:46:34 +08:00 |
|
liwei1dao
|
676770156e
|
上传装备添加的bug
|
2022-08-10 13:40:30 +08:00 |
|
liwei1dao
|
c03ba65bf6
|
上传论坛模块
|
2022-08-10 13:38:11 +08:00 |
|
liwei1dao
|
1785037abb
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-09 18:39:26 +08:00 |
|
liwei1dao
|
81f0247969
|
上传数据层代码优化
|
2022-08-09 18:39:21 +08:00 |
|
|
|
b457b06bc9
|
Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-09 18:09:38 +08:00 |
|
|
|
e69db22bf1
|
优化+爬塔
|
2022-08-09 18:09:14 +08:00 |
|
zhaocy
|
4338450e0f
|
update gui
|
2022-08-09 18:03:02 +08:00 |
|
liwei1dao
|
5e2a9fdf45
|
升级db系统 维护多数据节点连接实例
|
2022-08-09 13:35:23 +08:00 |
|
|
|
de510f42ac
|
同步dev 增加英雄的共鸣附加属性
|
2022-08-09 11:29:05 +08:00 |
|
liwei1dao
|
fb419359d0
|
上传编码指针代码内存重叠问题
|
2022-08-08 19:44:52 +08:00 |
|
liwei1dao
|
76011b4405
|
上传新的日志系统以及编解码系统升级
|
2022-08-08 14:05:40 +08:00 |
|
liwei1dao
|
35d0080275
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-08 09:25:09 +08:00 |
|
liwei1dao
|
43ec7f57cf
|
上传日志系统以及redis库接口升级
|
2022-08-08 09:25:02 +08:00 |
|
|
|
c70465f741
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-05 16:49:45 +08:00 |
|
|
|
3f2cb94f1e
|
一键领取推送
|
2022-08-05 16:48:16 +08:00 |
|
liwei1dao
|
b4ac656754
|
上传道具出售价格叠加bug
|
2022-08-05 16:15:59 +08:00 |
|
|
|
299a430127
|
整理优化
|
2022-08-03 17:53:32 +08:00 |
|
|
|
5277ca09cf
|
技能升级 请求参数支持一次消耗多个技能卡
|
2022-08-03 14:05:06 +08:00 |
|
|
|
e54b34c550
|
bug
|
2022-08-03 10:45:42 +08:00 |
|
|
|
49a42793c6
|
配置表更新
|
2022-08-03 10:29:27 +08:00 |
|
|
|
f327295b52
|
去掉newhero 解析 使用hero配表
|
2022-08-03 10:02:51 +08:00 |
|
|
|
796ec966dd
|
登录推送服务器时间戳
|
2022-08-03 09:33:02 +08:00 |
|
|
|
ba619a1c08
|
Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-02 12:05:18 +08:00 |
|
|
|
4b150256d0
|
资源发放消耗批量处理，接口返回值统一
|
2022-08-02 12:05:00 +08:00 |
|
liwei1dao
|
50c50a4490
|
上传背包格子使用 完毕 清理的问题
|
2022-08-02 09:46:05 +08:00 |
|
liwei1dao
|
79d8cf4e31
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-01 19:28:22 +08:00 |
|
liwei1dao
|
f3d9577674
|
上传英雄合成代码
|
2022-08-01 19:28:11 +08:00 |
|
|
|
7bb39c45e2
|
一次创建多个英雄接口
|
2022-08-01 19:01:41 +08:00 |
|
|
|
2d7ee15f07
|
Merge branches 'dev' and 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-01 18:40:11 +08:00 |
|
|
|
80ff9fffc7
|
一键领取
|
2022-08-01 18:39:44 +08:00 |
|
liwei1dao
|
2a435e6833
|
Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-01 18:23:46 +08:00 |
|
liwei1dao
|
d14eea92de
|
优化道具使用
|
2022-08-01 18:23:32 +08:00 |
|
|
|
b6f1fe1c02
|
Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-01 18:11:36 +08:00 |
|
|
|
1445c7629e
|
bug
|
2022-08-01 18:11:08 +08:00 |
|
liwei1dao
|
c1c5481f44
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-01 17:41:43 +08:00 |
|
liwei1dao
|
74aad51512
|
上传道具使用修改
|
2022-08-01 17:41:29 +08:00 |
|
|
|
1d942d918f
|
Merge branches 'dev' and 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-01 17:11:05 +08:00 |
|
|
|
5fb205395e
|
配置表更新
|
2022-08-01 17:10:39 +08:00 |
|
zhaocy
|
38ebd454d0
|
update
|
2022-08-01 16:16:02 +08:00 |
|
|
|
880d0f0fcb
|
Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-01 15:58:51 +08:00 |
|
|
|
2c0bb0087e
|
加一些日志
|
2022-08-01 15:58:29 +08:00 |
|
zhaocy
|
7681be0aba
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
# Conflicts:
# modules/task/api_receive.go
|
2022-08-01 15:23:56 +08:00 |
|
zhaocy
|
739d2324f3
|
update
|
2022-08-01 15:21:40 +08:00 |
|
|
|
335de3109a
|
记录扩展数据
|
2022-08-01 15:14:13 +08:00 |
|
|
|
fb40ce3f19
|
Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-01 15:02:34 +08:00 |
|
|
|
9a0666f828
|
更新代码，修改一些错误命名
|
2022-08-01 15:02:14 +08:00 |
|
zhaocy
|
fe90ea1ec4
|
update
|
2022-08-01 14:49:26 +08:00 |
|
zhaocy
|
c2bd05cac8
|
update
|
2022-08-01 14:27:33 +08:00 |
|
zhaocy
|
48306f8119
|
update
|
2022-08-01 14:14:34 +08:00 |
|
|
|
b65e44ee95
|
Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-01 13:54:38 +08:00 |
|
|
|
91f56e50b1
|
cmg 单元测试
|
2022-08-01 13:54:21 +08:00 |
|
liwei
|
50069fe7c2
|
升级武器模块类的日志输出
|
2022-08-01 12:10:13 +08:00 |
|
liwei
|
3e411d20ff
|
修复装备升级异常bug
|
2022-08-01 12:02:29 +08:00 |
|
liwei1dao
|
3fa1d9a74d
|
上传道具的使用逻辑补充
|
2022-08-01 11:39:42 +08:00 |
|
|
|
ff497dbb36
|
创建指定英雄错误码返回
|
2022-08-01 11:36:37 +08:00 |
|
|
|
57cbd8460a
|
Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2022-08-01 11:20:32 +08:00 |
|
