Commit Graph

876 Commits

Author SHA1 Message Date
bdb0932bd4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 14:59:57 +08:00
ee517f963e 修改完成条件校验 2023-05-24 14:57:29 +08:00
liwei1dao
bcb60fc93e 上传任务代码 2023-05-23 17:06:37 +08:00
liwei
693c1fc434 上传任务配置 2023-05-23 15:49:25 +08:00
018a382080 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-23 11:18:53 +08:00
5af2fbda0b worldtask json update 2023-05-23 11:16:16 +08:00
liwei1dao
27ca07a422 上传代码修复 2023-05-23 10:26:54 +08:00
liwei1dao
95dc4efb22 同步代码 2023-05-22 18:31:49 +08:00
ae069e2504 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-22 18:08:33 +08:00
90de92da72 任务记录类型判断 2023-05-22 18:08:26 +08:00
d417eec3ce 新增任务埋点 2023-05-22 15:02:18 +08:00
a1f28a0ba6 出售加价计算错误 2023-05-19 20:15:43 +08:00
1e32c6c476 商队优化 2023-05-19 18:37:31 +08:00
2d49493354 城市和货物刷新时间一致 2023-05-19 15:16:09 +08:00
85b38d5099 虚拟币资源分发类型 2023-05-19 10:00:24 +08:00
e586f872f1 跑商修改 2023-05-18 19:42:24 +08:00
92ff2ee31e 配置同步 2023-05-18 17:01:19 +08:00
a36b7e5767 木桩任务完成条件 2023-05-17 22:14:51 +08:00
c90d58d75a 天赋配置 2023-05-17 19:53:21 +08:00
96114aa867 配置同步 2023-05-17 19:50:12 +08:00
9485d650f1 配置整理 2023-05-17 15:35:55 +08:00
7246ba738a 配置同步 2023-05-17 14:17:28 +08:00
1da5837986 移出不需要的配置 2023-05-17 14:13:41 +08:00
6ccc98d308 天赋配置调整 新增解锁技能需求 2023-05-17 14:10:22 +08:00
liwei1dao
4359c2ac17 上传 2023-05-17 11:19:42 +08:00
liwei1dao
dfdadc8b09 上传配置代码 2023-05-15 11:32:54 +08:00
liwei1dao
7a331ccefb 上传战斗优化 2023-05-12 20:50:41 +08:00
f814ed19ce 维京新增奖励 2023-05-12 10:13:24 +08:00
72565977fe 英雄新增属性 2023-05-11 19:36:53 +08:00
liwei1dao
e2ee778ba1 上传配置同步 2023-05-10 11:57:08 +08:00
97db59c032 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-08 21:11:32 +08:00
d15efb7cf8 配置更新 2023-05-08 21:11:26 +08:00
liwei1dao
34f506bea1 上传开启列表 2023-05-08 20:35:05 +08:00
liwei1dao
4d697b4e70 上传代码 2023-05-08 19:38:52 +08:00
liwei1dao
41c3ce9d09 同步配置 2023-05-08 10:59:03 +08:00
af5808a748 功能条件开启 2023-05-05 16:09:46 +08:00
1bc334123a 配置整理 以table表导出的数据为准 2023-05-05 10:58:10 +08:00
f6d0dbb7dd 赠送礼物优化 2023-05-04 16:30:56 +08:00
c26bcdbed3 update config 2023-04-28 22:02:34 +08:00
4df9447b01 配置同步 2023-04-28 21:06:40 +08:00
dc73de7b4e 配置同步 2023-04-28 19:13:56 +08:00
385693e2ca npc 踢馆时间修改为10分钟 + 其他配置同步 2023-04-28 15:52:32 +08:00
6b98fda510 配置同步 2023-04-28 11:09:16 +08:00
fc2d61a130 配置同步 2023-04-27 22:38:34 +08:00
635e7617d9 配置同步 2023-04-27 19:17:54 +08:00
041bcb7d37 商队修改 2023-04-27 17:03:02 +08:00
91fd5c0823 配置同步 2023-04-27 12:01:45 +08:00
83e26c8986 周任务 领取奖励后 自动发放宝箱奖励 2023-04-26 20:00:02 +08:00
57b9b40982 update global 2023-04-26 11:03:28 +08:00
48ac8dc350 更新旧时光 2023-04-25 18:27:51 +08:00
124e869e05 配置同步 2023-04-25 11:30:03 +08:00
c53191b872 配置同步 2023-04-25 11:26:55 +08:00
d511fb2756 商队系统改造 2023-04-24 20:35:03 +08:00
08c6070abc 初始默认给坐骑 2023-04-24 11:16:52 +08:00
83e76c2bd5 配置同步 2023-04-24 09:53:12 +08:00
dccbdde57f 签到小游戏 玩法调整 2023-04-23 15:24:51 +08:00
aa383233a6 配置更新 2023-04-21 21:49:52 +08:00
9448a51507 配置同步 2023-04-21 21:08:54 +08:00
liwei1dao
8bb7c27a7b 同步配置文件和捕羊大赛代码 2023-04-21 18:11:49 +08:00
liwei1dao
ec088d4b13 上传捕羊大赛代码 2023-04-21 16:54:26 +08:00
liwei1dao
44319e8d2c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-20 17:05:28 +08:00
liwei1dao
10f8849fbe 同步代码 2023-04-20 17:05:14 +08:00
1a741fd8ef 条件开启配置同步 2023-04-20 16:34:15 +08:00
302e292041 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-20 14:53:33 +08:00
2a70daf1ef update配置 2023-04-20 14:40:13 +08:00
liwei1dao
3cce3dfb04 同步配置 2023-04-19 20:20:05 +08:00
liwei1dao
62cf386449 同步json 2023-04-18 21:48:57 +08:00
liwei1dao
ee83d78681 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-18 20:31:13 +08:00
liwei1dao
0bdcd919ce 上传服务配置 2023-04-18 20:28:43 +08:00
882adadc3e 配置同步 2023-04-18 20:08:33 +08:00
3553d4c309 好感度解析 2023-04-18 16:04:28 +08:00
liwei1dao
f27130c3b4 上传配置文件 2023-04-17 18:55:11 +08:00
e9a9f99b65 配置同步 2023-04-14 18:19:17 +08:00
260d936e20 购买价格组整合 2023-04-14 18:11:42 +08:00
d18679f4cb 跨服消息分发 2023-04-14 14:14:34 +08:00
liwei1dao
9f5aa7baa8 同步配置 2023-04-12 18:41:42 +08:00
f8beab3a84 优化 2023-04-12 15:38:35 +08:00
liwei1dao
5fbd68322b 上传代码 2023-04-11 20:07:30 +08:00
958d1a8939 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-11 17:37:22 +08:00
fcf0b3a048 掉落相关处理 2023-04-11 17:37:18 +08:00
5e26c30c53 更新配置 2023-04-11 15:28:03 +08:00
d706a41d13 掉落配置解析 2023-04-11 10:58:00 +08:00
liwei1dao
6da2eeb0a6 上传聊天聊天代码 2023-04-10 12:01:24 +08:00
83093f2dc0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-04 17:53:36 +08:00
b77c28dd0d update condi配置 2023-04-04 17:53:14 +08:00
5e3456b990 同步配置 2023-04-04 14:14:49 +08:00
d1dcc03e3a 新版日周常 2023-04-03 19:20:41 +08:00
0a011f4dd9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-03 14:43:38 +08:00
27266cad54 记录手动激活功能开启数据 2023-04-03 14:43:01 +08:00
liwei1dao
6272919a6a 同步配置,优化战斗规则配置 2023-04-03 14:31:46 +08:00
liwei1dao
89de41d6d5 上传配置 2023-04-01 19:39:04 +08:00
liwei1dao
3d6492f289 上传配置 2023-04-01 19:10:35 +08:00
liwei
cfc89c0ef4 上传配置 2023-04-01 18:28:34 +08:00
liwei1dao
33a8bf9074 上传配置 2023-04-01 18:27:50 +08:00
liwei1dao
56ef085449 上传配置 2023-04-01 17:37:48 +08:00
liwei1dao
72cc4fb9e0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-01 17:24:58 +08:00
liwei1dao
f38c9f106c 上传 代码 2023-04-01 17:24:33 +08:00
e8d18907ed update 2023-04-01 15:20:38 +08:00
b47afba64e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 18:53:26 +08:00
d586df1a85 配置同步 2023-03-31 18:53:22 +08:00
7d9e4030ac Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 18:39:49 +08:00
08dcfb5e59 opencond 2023-03-31 18:39:38 +08:00
liwei1dao
b0e7818a45 上传魔药代码 2023-03-31 17:42:06 +08:00
829953b4ff update 2023-03-31 14:54:17 +08:00
233c0f5f70 签到额外奖励,存储提示次数 2023-03-31 14:30:47 +08:00
e1cbced24b 签到功能调整 2023-03-31 12:02:03 +08:00
188f50c130 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 20:53:40 +08:00
703dc468df 配置同步 2023-03-30 20:53:34 +08:00
liwei1dao
c832d16998 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 20:45:43 +08:00
liwei1dao
8fbbd1e3f8 上传装备回收系数 2023-03-30 20:45:04 +08:00
bf49db1b35 update config 2023-03-30 20:39:07 +08:00
7213920a47 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 16:49:23 +08:00
liwei1dao
a45896a24a 上传同步代码 2023-03-30 16:28:34 +08:00
2c35ca7388 铁匠铺NPC数量读配置 2023-03-30 16:26:05 +08:00
liwei1dao
b0d9346f82 上传武馆配置表更新 2023-03-30 15:01:57 +08:00
cfe15751c0 更新配置 2023-03-30 10:42:11 +08:00
ed4c5c6788 update 2023-03-29 21:10:37 +08:00
58978bb084 配置同步 2023-03-29 17:52:06 +08:00
liwei1dao
7ddad6fa97 上传配置 2023-03-29 16:50:14 +08:00
liwei1dao
3cb44f1ce5 上传武馆雕像留存时间 2023-03-29 15:13:50 +08:00
liwei1dao
97b0dad942 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 10:16:13 +08:00
liwei1dao
e7f5b858d6 上传魔药接口 2023-03-29 10:16:02 +08:00
3dce048b58 配置同步 2023-03-28 18:09:30 +08:00
1a3a2e2e1e 配置更新 2023-03-28 14:41:10 +08:00
d41600bbdc update 2023-03-28 14:19:19 +08:00
397ab14b79 多路任务支持 2023-03-27 19:56:13 +08:00
7068b0c635 美食馆菜品图鉴激活+功夫塔配置迁移 2023-03-27 19:01:06 +08:00
2fa129fceb 配置同步 2023-03-27 16:27:40 +08:00
5d08d1610c 配置更新 2023-03-27 16:06:08 +08:00
50d02359c7 铁匠铺小游戏 概率双倍打造双倍 2023-03-27 15:00:03 +08:00
393350b886 新增美食城配置 2023-03-27 11:56:54 +08:00
7997dfef81 配置更新 2023-03-27 10:38:39 +08:00
liwei
94936c907b 上传配置 2023-03-24 23:17:47 +08:00
d8dd0d6ebf update 2023-03-24 15:53:38 +08:00
95c22e3bec 美食馆配置 2023-03-24 15:52:21 +08:00
64a50c4f57 worldtask 2023-03-24 09:29:49 +08:00
bf98281c0a update 2023-03-24 09:29:49 +08:00
45cd97c978 update config 2023-03-23 17:28:26 +08:00
5c964cf63f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-23 12:02:29 +08:00
21800d3fd9 update 2023-03-23 12:02:11 +08:00
liwei
cf0dac6f8e 上传配置 2023-03-23 11:16:14 +08:00
53999edfbe 需求调整,能同时打不同页签的塔 2023-03-20 18:19:31 +08:00
bd21f7ee76 武馆塔添加前置解锁条件 2023-03-20 16:11:21 +08:00
a2f6075eba 解锁木桩,任务统计 配置更新 2023-03-17 18:57:22 +08:00
4631257e62 爬塔奖励配置 2023-03-16 20:58:54 +08:00
liwei
729b150d5a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
Conflicts:
	bin/json/game_pandamasmryl.json
	bin/json/game_pandamastj.json
2023-03-16 15:07:14 +08:00
liwei
05d2d80b98 同步配置 2023-03-16 15:06:16 +08:00
liwei1dao
b1eb026dab 上传配置 2023-03-16 15:05:02 +08:00
d21716fa20 英雄登记支持批量操作 2023-03-16 12:36:30 +08:00
liwei1dao
7c973ad1aa 上传配置 2023-03-15 16:39:58 +08:00
liwei1dao
02830457ed Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-14 18:54:14 +08:00
liwei1dao
c3cc2740a6 上传服务端配置 2023-03-14 18:53:52 +08:00
813083f63a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-14 18:19:43 +08:00
413362e21a 任务条件优化 2023-03-14 18:19:31 +08:00
liwei1dao
b90daeeb2f 上传世界任务配置 2023-03-14 17:58:04 +08:00
liwei1dao
f8b0ee3faf 上传木桩解锁条件 2023-03-14 17:51:33 +08:00
a16fdaf150 配置同步 2023-03-14 09:56:28 +08:00
8f8756cc07 移除旧模块 2023-03-14 09:48:45 +08:00
a0a22dbd49 删除旧铁匠铺解析数据等信息 2023-03-13 14:19:34 +08:00
liwei
090dbe1521 同步代码 2023-03-11 18:12:49 +08:00
af8de5362c 配置更新 2023-03-10 18:09:18 +08:00
e2c1e89ef4 配置更新 2023-03-10 11:00:49 +08:00
1dba115251 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-10 09:54:13 +08:00
7a927c4f4f 配置同步 2023-03-10 09:53:31 +08:00
liwei
00d84a8de6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
Conflicts:
	bin/json/game_drawcard.json
	bin/json/game_mainchapter.json
	bin/json/game_mainstage.json
2023-03-09 16:25:35 +08:00
liwei
43069284cb 上传配置 2023-03-09 16:24:49 +08:00
b990e1a43e 配置更新 2023-03-09 10:22:12 +08:00
liwei
1da5a70a17 上传配置 2023-03-08 19:02:27 +08:00
2d72bc5e5f 更新配置 2023-03-08 18:29:30 +08:00
e56446667e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-08 16:56:59 +08:00
0eeb1799be 3.10公会预创建 2023-03-08 16:56:48 +08:00
6fe3d364b8 好友功能条件开启 2023-03-08 16:08:23 +08:00
c2e1a230fe 创角发欢迎邮件 2023-03-08 11:17:31 +08:00
63291cde10 更新配置 2023-03-07 10:56:58 +08:00
liwei
d5ac3f986e 上传配置文件 2023-03-06 20:28:59 +08:00
ca9d9d4391 图鉴配置新增字段 2023-03-06 20:26:03 +08:00
liwei1dao
4c8d8e2bb4 上传配置代码 2023-03-06 18:16:57 +08:00
liwei
9511d21766 上传配置文件 2023-03-04 16:05:41 +08:00
liwei1dao
8f8b4f612e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-03 15:47:13 +08:00
liwei1dao
05a5135479 上传武馆代码 2023-03-03 15:46:58 +08:00
6d43e69f5f 配置同步 2023-03-03 10:53:21 +08:00
ebb8889403 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-02 18:57:43 +08:00
liwei1dao
2bc648ee7f 上传消息分发 2023-03-02 18:55:23 +08:00
9fa2855435 派遣 2023-03-02 18:54:53 +08:00
liwei
462bff3ecd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-02 18:50:46 +08:00
liwei
5f79123811 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-02 18:50:30 +08:00
liwei
8c15368877 上传配置文件 2023-03-02 18:49:26 +08:00
e1722eca92 跨服创建英雄对象+ 配置更新 2023-03-02 18:46:04 +08:00
liwei1dao
3573a05da9 上传每日一练代码 2023-03-02 16:16:17 +08:00
31abefaa86 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-02 14:20:45 +08:00
41a22b3cf0 特殊图鉴手动激活 2023-03-02 14:20:38 +08:00
liwei1dao
2043367dd1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-02 14:12:26 +08:00
liwei1dao
fbe1d21ed1 上传柱子解锁接口 2023-03-02 14:12:11 +08:00
9a241060e1 掉落规则修改 + 功夫大师挑战塔 2023-03-01 17:35:23 +08:00
liwei1dao
ae381980a3 上传教习登记 2023-02-28 11:06:54 +08:00
f4ec14b472 派遣 2023-02-24 18:29:46 +08:00
4d810402d9 领奖数据返回 2023-02-24 17:43:18 +08:00
d210e54fc0 工具台升级 条件补充 2023-02-24 11:48:24 +08:00
3387fce2f7 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-24 09:46:13 +08:00
3f464ddd94 武馆图鉴 2023-02-23 19:07:10 +08:00