Commit Graph

5966 Commits

Author SHA1 Message Date
5bf499430c 龙属性问题 2023-11-08 11:52:28 +08:00
336b60f3f8 成龙 加速槽回复 2023-11-08 11:27:54 +08:00
67e4b39a78 update 2023-11-08 11:06:58 +08:00
0269d5ba8e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-08 11:00:27 +08:00
0ca938652b 增加积分显示 2023-11-08 11:00:23 +08:00
liwei1dao
685bb300e9 上传补羊优化 2023-11-08 10:33:28 +08:00
liwei1dao
594bb731af 上传传功等级修复 2023-11-07 20:42:08 +08:00
liwei1dao
b931ab9da5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-07 20:29:47 +08:00
liwei1dao
928c9d3bdb 上传全满级英雄 出发虚拟等级显示问题 2023-11-07 20:29:41 +08:00
3b549fe732 修复散弹方块 随机带走元素位置不正确bug 2023-11-07 18:25:06 +08:00
25a15adc08 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-07 17:49:26 +08:00
86acb03ad9 两个特殊元素在一起也可以消除 2023-11-07 17:48:48 +08:00
22442bfb79 房间数据整理 2023-11-07 16:03:12 +08:00
liwei1dao
6714d58b57 上传补羊成龙过滤代码 2023-11-07 15:27:07 +08:00
dcd4818cb1 房间回收 离线处理 2023-11-07 15:11:36 +08:00
liwei1dao
7f8c62dd81 上传json 2023-11-07 10:25:38 +08:00
liwei1dao
a89d65bdc3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-06 18:26:43 +08:00
liwei1dao
95582456d4 上传用户日志功能实现 2023-11-06 18:26:39 +08:00
ebee3aaa0c 玩法规则带入 2023-11-06 17:56:27 +08:00
da7c4a1bdd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-06 16:12:59 +08:00
5629f5439b 递归消除特殊元素 2023-11-06 16:12:56 +08:00
liwei1dao
a6ae6bf2cb Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-06 16:07:55 +08:00
liwei1dao
daee5fd630 上传竞技场积分计算bug 2023-11-06 16:07:50 +08:00
e3509b4023 玩法临时修改 等最终配置 2023-11-06 15:33:35 +08:00
876a33e84b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-06 15:19:34 +08:00
9312d422f8 玩法类型3 ,4 带入 2023-11-06 15:19:30 +08:00
liwei1dao
98051b1f38 上传捕羊数据混乱修复 2023-11-06 14:46:50 +08:00
liwei1dao
42090505db Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-06 14:20:59 +08:00
liwei1dao
abf90a7592 上传用户段位错误处理 2023-11-06 14:20:55 +08:00
a180a13972 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-06 12:07:29 +08:00
5239a6eeab 消息Push 2023-11-06 12:07:25 +08:00
liwei1dao
d7e5929595 上传累计积分 2023-11-06 11:30:27 +08:00
liwei1dao
5711a882c4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-06 10:03:25 +08:00
liwei1dao
592503d08d 上传颜色游戏 2023-11-06 10:03:20 +08:00
4c521fe92e 上传代码 2023-11-04 20:55:35 +08:00
adce173e29 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-04 18:10:48 +08:00
15da64c7cd 新增特殊元素炸弹烟花相关消除规则 2023-11-04 18:10:45 +08:00
liwei1dao
8ad90274dd 上传补羊重连机制 2023-11-04 15:40:26 +08:00
liwei1dao
3bb79c6ec7 上传补羊大赛代码 2023-11-04 15:29:37 +08:00
liwei1dao
e172a7cd5d 上传补羊和兔子游戏协议 2023-11-04 15:23:15 +08:00
liwei1dao
fad9238c32 上传补羊大赛游戏优化 2023-11-04 15:00:45 +08:00
liwei1dao
bc01685ba4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-03 21:34:19 +08:00
liwei1dao
940f4f8681 上传 2023-11-03 21:34:13 +08:00
bfdf47f87f 测试时间 2023-11-03 20:08:20 +08:00
8e3ab8effa Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-03 18:47:00 +08:00
8d56b0c4a9 游戏结束 销毁房间 2023-11-03 18:46:56 +08:00
liwei1dao
ea8743811c 上传协议提交 2023-11-03 18:42:43 +08:00
liwei1dao
4d996fba1d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-03 18:08:44 +08:00
liwei1dao
57f0b8963d 上传兔子猎犬 2023-11-03 18:08:40 +08:00
4c01b7fc75 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-03 18:05:59 +08:00
96d06af605 三消优化 2023-11-03 18:05:54 +08:00
liwei1dao
a63be757e5 上传取消匹配代码 2023-11-03 17:52:51 +08:00
liwei1dao
25c2739d88 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-03 15:28:29 +08:00
liwei1dao
af2485fc19 上传关卡编辑器 2023-11-03 15:28:24 +08:00
866b768e96 时间里计时器处理 2023-11-03 09:45:08 +08:00
aff72fa398 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-02 22:10:06 +08:00
4572cc7f11 update 2023-11-02 22:10:01 +08:00
liwei1dao
dc1fdefcda 上传犬兔游戏调试代码 2023-11-02 21:18:05 +08:00
liwei1dao
3cc0d746f9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-02 18:00:00 +08:00
liwei1dao
2f1779b311 上传补羊优化 2023-11-02 17:59:54 +08:00
a920f31d81 update 2023-11-02 15:52:25 +08:00
d544c13b64 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-02 15:28:36 +08:00
6197622282 宝箱奖励 2023-11-02 15:28:32 +08:00
liwei1dao
f14bfa7567 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-02 15:09:22 +08:00
liwei1dao
20e5472621 上传世界任务战斗奖励 2023-11-02 15:09:17 +08:00
977fe8fd34 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-02 14:38:06 +08:00
b6ab1f6df8 update 2023-11-02 14:38:03 +08:00
liwei1dao
7bc8592e27 上传彩蛋模块 2023-11-02 14:35:04 +08:00
liwei1dao
8ba9dff155 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-02 14:01:46 +08:00
liwei1dao
c7ed61fb5a 上传走棋游戏代码 2023-11-02 14:01:42 +08:00
9fc5e5815b update 2023-11-02 11:05:17 +08:00
3b673a5b10 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-02 11:03:16 +08:00
e0b45c9c9c 接口补充通过卡池随机获取指定数量的英雄卡 2023-11-02 11:03:13 +08:00
liwei1dao
5d77d749b5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-02 10:48:22 +08:00
liwei1dao
1bdbc69064 海岛探险代码 2023-11-02 10:48:17 +08:00
dcfde4a766 技能参数带入 2023-11-02 10:12:14 +08:00
223a0dcd1d 技能调整 2023-11-02 10:11:14 +08:00
330301441d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-01 21:08:59 +08:00
cbf5cd8f3f 英雄技能 2023-11-01 21:08:55 +08:00
liwei1dao
4a9b83f204 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-01 20:34:22 +08:00
liwei1dao
e0039dcc41 上传代码 2023-11-01 20:34:14 +08:00
03b8514aee 秘境手动结算可以领取之前关卡的奖励 2023-11-01 19:52:23 +08:00
672948eb18 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-01 19:34:05 +08:00
8f4792ccb7 update 2023-11-01 19:33:56 +08:00
liwei1dao
2d0d9aa0c1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-01 15:47:59 +08:00
liwei1dao
c98b05e4c6 优化竞技场信息 2023-11-01 15:47:52 +08:00
2a633f9256 超时走配置 2023-11-01 14:51:02 +08:00
4202883df2 测试优化 2023-11-01 14:24:32 +08:00
d675f2099e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-01 11:48:36 +08:00
11bd3e4742 部分技能不增加积分 2023-11-01 11:48:33 +08:00
liwei1dao
cb91f98843 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-01 10:41:54 +08:00
liwei1dao
210498560f 上传游戏协议 2023-11-01 10:41:47 +08:00
59e9a20756 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-11-01 10:01:15 +08:00
54a8f103b6 技能+消除校验 2023-11-01 10:01:11 +08:00
liwei1dao
309d03df18 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-30 18:10:57 +08:00
liwei1dao
f0c34e5a10 上传资源推送 2023-10-30 18:10:51 +08:00
6d83897951 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-30 17:54:28 +08:00
bbe346b6b6 房间逻辑完善 2023-10-30 17:54:24 +08:00
liwei1dao
18ccd3ca0d 上传海盗代码 2023-10-30 17:09:32 +08:00
liwei1dao
c889b45192 上传海盗养成 2023-10-30 17:06:21 +08:00
liwei1dao
e003aa156c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-30 16:31:10 +08:00
liwei1dao
d966496fd2 上传代码 2023-10-30 16:31:04 +08:00
4f9f4ae507 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-30 15:59:07 +08:00
906ca81ff1 创房 加入 解散 开始 流程 2023-10-30 15:59:04 +08:00
liwei1dao
67cce21c5e 上传头像框 2023-10-30 15:58:50 +08:00
liwei1dao
d0606fdb75 上传皮肤资源 2023-10-30 15:28:19 +08:00
liwei1dao
4f92e94968 上传配置 2023-10-30 15:12:12 +08:00
liwei1dao
4dca086bed 上传皮肤代码 2023-10-30 15:04:23 +08:00
liwei1dao
927df75d9f 上传配置文件 2023-10-30 15:00:56 +08:00
liwei1dao
d4d1549592 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-30 14:19:40 +08:00
liwei1dao
7096dc4e22 上传协议 2023-10-30 14:19:36 +08:00
5235272d94 每天随机N个类型玩法 2023-10-30 11:10:50 +08:00
liwei1dao
5f6b164aaf 上传商店协议和商品中心协议 2023-10-30 09:44:09 +08:00
db89a8b32e update 2023-10-27 20:07:02 +08:00
90d05da98f 匹配校验卡数量 2023-10-27 19:24:20 +08:00
c8c9fec17d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-27 18:25:52 +08:00
d8fa73a48b 上传代码 2023-10-27 18:25:49 +08:00
liwei1dao
29b4928fd1 上传犬兔大战 2023-10-27 15:46:56 +08:00
liwei1dao
d8a88755a5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-27 14:58:44 +08:00
liwei1dao
e677aa468b 上传配置 2023-10-27 14:58:38 +08:00
liwei1dao
c8230de27c 上传配置 2023-10-27 14:58:23 +08:00
9609b8e72a 上传代码 2023-10-27 14:14:38 +08:00
20521ee985 三消外围英雄相关功能 2023-10-27 12:01:56 +08:00
57dc3f721b 地图消除测试修改 2023-10-26 18:53:17 +08:00
d684e12e93 进入游戏随机生成一张不能自消的地图 2023-10-26 18:32:09 +08:00
adcd237cad Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-26 18:12:20 +08:00
0dd61aabb4 三消地图检测是否有交换不能消除的情况 2023-10-26 18:12:17 +08:00
liwei1dao
75491c82d4 上传表格配置 2023-10-26 17:57:11 +08:00
liwei1dao
87c9dbdbfa Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-26 17:55:32 +08:00
liwei1dao
b7e0a26fd1 上传犬兔大战 2023-10-26 17:42:56 +08:00
1ce5b473eb 修改表名 2023-10-26 16:15:58 +08:00
4bb4be7204 新增玩家基本信息 2023-10-26 15:33:05 +08:00
liwei1dao
58595c5a9e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-26 14:13:33 +08:00
liwei1dao
957c6de0cf 上传配置 2023-10-26 14:13:11 +08:00
bcc6e797d7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-26 12:34:37 +08:00
9acdd2b778 配置更新 2023-10-26 12:34:34 +08:00
liwei1dao
110b7386ba Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-26 10:29:47 +08:00
liwei1dao
fd270c204b 上传埋点 2023-10-26 10:29:43 +08:00
58898f4d3f xxl发奖校验 如果是AI胜利 不发将 2023-10-26 09:58:48 +08:00
e5f95645e4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-26 09:29:50 +08:00
689b2babbe 取消匹配 2023-10-26 09:29:47 +08:00
liwei1dao
0034cea756 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-26 09:25:30 +08:00
liwei1dao
14a92fe425 上传代码 2023-10-26 09:25:22 +08:00
37d433b09c 游戏结算新增谁赢了 2023-10-25 19:47:45 +08:00
090345b4ac 对战开始初始化满体力 2023-10-25 18:24:37 +08:00
1d4276e6af 接口调整 优化 2023-10-25 18:09:36 +08:00
1d7207461e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-25 16:07:26 +08:00
f7431e126f xxl匹配 2023-10-25 16:07:22 +08:00
liwei1dao
ab07e59c30 上传藏宝图 2023-10-25 15:00:35 +08:00
liwei1dao
8b79cd7aae Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-25 14:17:07 +08:00
liwei1dao
833312fa68 上传游戏邀请 2023-10-25 14:17:02 +08:00
f406d53316 消除积分改累计值 2023-10-25 14:15:43 +08:00
86ea90004b 技能能量 2023-10-25 13:48:47 +08:00
a404633165 上传代码 2023-10-25 13:41:25 +08:00
a718218993 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-25 11:10:03 +08:00
a0c6b5485e 完善对战 2023-10-25 11:10:00 +08:00
liwei1dao
52fbce426e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-25 10:06:39 +08:00
liwei1dao
6d992bd005 上传代码 2023-10-25 10:06:33 +08:00
ad64ecc289 ai 能量进度统计 2023-10-25 09:53:36 +08:00
7822cff7ee 释放技能没有连消的情况 2023-10-24 20:10:26 +08:00
88ab2ea016 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-24 18:36:13 +08:00
2377793a98 新增错误 2023-10-24 18:36:10 +08:00
liwei1dao
821367a9e7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-24 18:17:19 +08:00
liwei1dao
dc1a28339b 上传配置 2023-10-24 18:17:13 +08:00
a640c50d22 玩家技能 2023-10-24 18:09:58 +08:00
88dd4aea0e update 2023-10-24 17:39:14 +08:00
8e97e8d84e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-24 15:21:28 +08:00
79f58144d5 技能 2023-10-24 15:21:25 +08:00
liwei1dao
0ed81a543b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-24 14:04:14 +08:00
liwei1dao
ecc9144e42 上传主城同屏 2023-10-24 14:04:08 +08:00
a57f0eeeca Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-24 12:00:21 +08:00
ca2a842154 恢复能量 体力 最大回合数读取配置 2023-10-24 12:00:17 +08:00
liwei1dao
c5db0bf402 上传代码 2023-10-24 11:47:42 +08:00
liwei1dao
c1cdd58324 上传捕羊游戏结束时间配置 2023-10-24 11:07:00 +08:00
liwei1dao
0f546d1be5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-24 10:55:07 +08:00
liwei1dao
f2dafe1e48 上传捕羊aiCD间隔 2023-10-24 10:55:02 +08:00
eb83dd957a 4消或5消生成新的元素 2023-10-24 10:30:21 +08:00
6cfbac78eb 协议同步 2023-10-24 10:28:39 +08:00
8ea3174625 update 2023-10-24 10:23:44 +08:00
liwei1dao
ed7bbef31f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-24 09:14:51 +08:00
liwei1dao
bb3a292585 上传猜颜色代码 2023-10-24 09:14:02 +08:00
3f2bf270ae 三消货币 2023-10-23 20:28:46 +08:00
7387b376ed 上传代码 2023-10-23 19:49:13 +08:00
9057112fda 操作结果返回操作动作 2023-10-23 19:05:13 +08:00
c55161fb6c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-23 16:52:18 +08:00
da4b238cb9 不能交换的情况处理 2023-10-23 16:52:15 +08:00
liwei1dao
f7ac90a153 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-23 16:41:26 +08:00
liwei1dao
74344f18ac 上床捕羊匹配优化 2023-10-23 16:41:21 +08:00
90a1daf23a 初始玩家体力 2023-10-23 15:58:02 +08:00
48d84dc0bc 补充消除逻辑 优化权限 2023-10-23 15:32:40 +08:00
6d86f3a05b AI移动元素 2023-10-20 22:55:06 +08:00
1c23a60bf2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-20 20:58:50 +08:00
4504afde92 移除重复代码 2023-10-20 20:58:48 +08:00
liwei1dao
d9cc7346c2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-20 20:57:49 +08:00
liwei1dao
125fc9cddd 上传测试服 2023-10-20 20:57:45 +08:00
c214107ff3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-20 20:57:43 +08:00
c8cf135258 update 2023-10-20 20:57:39 +08:00
liwei1dao
4139e2e36c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-20 18:28:49 +08:00
liwei1dao
d010bb73c3 上传才颜色和好友接口 以及同屏代码 2023-10-20 18:28:44 +08:00
a6aa603dc3 连消优化 2023-10-20 16:26:02 +08:00