Commit Graph

5817 Commits

Author SHA1 Message Date
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
e730baf179 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-20 14:13:40 +08:00
70f51721a0 update 2023-10-20 14:13:37 +08:00
liwei1dao
faff6c4269 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-20 14:13:33 +08:00
liwei1dao
7fb5b1963b 上传猜颜色配置读取 2023-10-20 14:13:28 +08:00
36a37c8c7c update 2023-10-20 12:44:36 +08:00
86111c04ea AI计时器整理 2023-10-20 11:37:08 +08:00
1ea7fb31bb 优化 2023-10-20 11:11:29 +08:00
41c5ad951a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-19 22:13:01 +08:00
236875a380 xxl 优化+测试 2023-10-19 22:12:58 +08:00
liwei1dao
eb000d90b7 上传代码 2023-10-19 18:45:47 +08:00
liwei1dao
daffb7d975 猜颜色 2023-10-19 18:38:23 +08:00
liwei1dao
2d36ac69a6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-19 18:08:15 +08:00
liwei1dao
264ad9411f 上传猜颜色 2023-10-19 18:08:11 +08:00
c1c2790ddd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-19 16:19:30 +08:00
785b2f7881 规则完善 2023-10-19 16:19:26 +08:00
d89e6b0898 月卡每日奖励发放 2023-10-24 15:53:23 +08:00
liwei1dao
5834494afc 伤处签到和捕羊开启 2023-10-19 16:07:26 +08:00
liwei1dao
59843155f6 上传猜颜色 2023-10-19 15:52:30 +08:00
liwei1dao
5d667c74b4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-19 15:03:01 +08:00
liwei1dao
5efc94222d 上传猜颜色 2023-10-19 15:02:57 +08:00
4ddf74c351 对战计时器+AI逻辑 2023-10-19 11:46:54 +08:00
4a3a03a811 检查月卡每日邮件奖励发放 2023-10-19 19:08:05 +08:00
20480d9104 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-18 19:00:10 +08:00
c69d00f744 xxl代码 2023-10-18 19:00:06 +08:00
liwei1dao
d28a2f3e65 上传捕羊代码 2023-10-18 18:37:51 +08:00
liwei1dao
d377ecca4b 上传代码 2023-10-18 18:33:23 +08:00
5711dd24ff 普通菜不入图鉴 2023-10-18 18:22:44 +08:00
500202dfe7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-18 11:33:34 +08:00
30970cb7d9 ui小游戏额外奖励 2023-10-18 11:33:13 +08:00
liwei1dao
c7d382fe09 上传聊天信息 2023-10-18 11:30:14 +08:00
liwei1dao
af1884205d 上传头像框信息 2023-10-18 11:05:48 +08:00
8c3fe6c9e2 xxl 规则 2023-10-18 09:40:37 +08:00
f3d5dd51d3 接龙一键领取key修改 2023-10-17 17:44:59 +08:00
52a01ad52d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 16:17:31 +08:00
2167ade864 接龙新增本周最高记录字段 2023-10-17 16:17:28 +08:00
liwei1dao
976c305d50 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 16:09:27 +08:00
liwei1dao
f4184e1bcd 同步配置 2023-10-17 16:09:23 +08:00
684892291f update 2023-10-17 15:04:58 +08:00
6f5e36524b update 2023-10-17 14:40:32 +08:00
ed6c8f4171 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 14:36:29 +08:00
87ae8573e8 接龙增加游戏开始协议 2023-10-17 14:36:26 +08:00
liwei1dao
bfc79ea3ce Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 14:17:34 +08:00
liwei1dao
c2e625b3db 上传协议 2023-10-17 14:17:30 +08:00
df1c5e9d5b update 2023-10-17 14:16:51 +08:00
8f75f5a770 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 14:13:37 +08:00
dc14a1fa81 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 14:13:33 +08:00
liwei1dao
eeee4679d8 上传奖励发放 2023-10-17 14:09:17 +08:00
f270d0dcf3 奖励资源统一类型发放 2023-10-17 14:08:20 +08:00
liwei1dao
34e4761b47 上传奖励协议代码 2023-10-17 13:54:53 +08:00