puxuan
|
69dc46402f
|
fix bug
|
2025-10-27 18:35:17 +08:00 |
|
puxuan
|
71820d787f
|
广告
|
2025-10-20 11:09:54 +08:00 |
|
puxuan
|
e6afcd0ccd
|
fix bug
|
2025-10-18 18:05:05 +08:00 |
|
puxuan
|
ebb3797170
|
fix bug
|
2025-10-17 20:37:11 +08:00 |
|
puxuan
|
0736e58c5f
|
主界面图标
|
2025-09-28 16:09:37 +08:00 |
|
xiekaidong
|
44356ebb52
|
增加战斗前后上阵英雄参数，方便查询作弊
|
2023-09-19 10:51:40 +08:00 |
|
xiekaidong
|
820a22b051
|
Merge branch 'dev_20230919' into limit_pvp
# Conflicts:
# lua/app/common/bi_report.lua
# lua/app/common/data_manager.lua
# lua/app/common/pay_manager.lua
# lua/app/config/activity_pvp_board.lua.meta
# lua/app/config/const.lua
# lua/app/config/item.lua
# lua/app/config/monster_activity.lua
# lua/app/config/monster_base.lua
# lua/app/config/skill.lua
# lua/app/config/skin.lua
# lua/app/config/skin_skill.lua
# lua/app/config/strings/cn/global.lua
# lua/app/config/strings/cn/item.lua
# lua/app/config/strings/cn/skill_rogue.lua
# lua/app/config/strings/cn/skin.lua
# lua/app/config/strings/de/item.lua
# lua/app/config/strings/de/skin.lua
# lua/app/config/strings/en/item.lua
# lua/app/config/strings/en/skin.lua
# lua/app/config/strings/es/item.lua
# lua/app/config/strings/es/skin.lua
# lua/app/config/strings/fr/item.lua
# lua/app/config/strings/fr/skin.lua
# lua/app/config/strings/id/item.lua
# lua/app/config/strings/id/skin.lua
# lua/app/config/strings/ja/item.lua
# lua/app/config/strings/ja/skin.lua
# lua/app/config/strings/ko/item.lua
# lua/app/config/strings/ko/skin.lua
# lua/app/config/strings/pt/item.lua
# lua/app/config/strings/pt/skin.lua
# lua/app/config/strings/ru/item.lua
# lua/app/config/strings/ru/skin.lua
# lua/app/config/strings/th/item.lua
# lua/app/config/strings/th/skin.lua
# lua/app/config/strings/vi/item.lua
# lua/app/config/strings/vi/skin.lua
# lua/app/config/strings/zh/item.lua
# lua/app/config/strings/zh/skin.lua
# lua/app/config/task_type.lua.meta
# lua/app/global/global_const.lua
# lua/app/module/battle/battle_const.lua
# lua/app/module/battle/battle_manager.lua
|
2023-09-16 17:55:38 +08:00 |
|
Fang
|
8c1082793e
|
圆月活动
|
2023-09-15 19:22:15 +08:00 |
|
xiekaidong
|
8b6b8d2772
|
数据层
|
2023-09-15 17:28:14 +08:00 |
|
xiekaidong
|
10253fbafb
|
符文副本
|
2023-09-11 20:01:55 +08:00 |
|
xiekaidong
|
c0a3356cfd
|
符文副本主界面
|
2023-09-07 19:14:39 +08:00 |
|
xiekaidong
|
eed3f88d79
|
首领公开赛
|
2023-09-01 21:10:05 +08:00 |
|
xiekaidong
|
fe245efaba
|
接入数据
|
2023-09-01 11:55:16 +08:00 |
|
xiekaidong
|
f5ed280271
|
优化木棍障碍物
|
2023-08-11 11:24:52 +08:00 |
|
xiekaidong
|
62ee8bab01
|
木棍边缘障碍物
|
2023-08-02 18:07:44 +08:00 |
|
xiekaidong
|
caf1fd0af9
|
战斗续关
|
2023-07-31 16:22:05 +08:00 |
|
xiekaidong
|
6bc0ce7738
|
添加一些容错
|
2023-07-24 17:04:40 +08:00 |
|
xiekaidong
|
cd41579159
|
支线副本
|
2023-07-20 21:46:49 +08:00 |
|
xiekaidong
|
2ffd6e88ba
|
装备副本
|
2023-07-19 20:16:17 +08:00 |
|
xiekaidong
|
9718eca3d7
|
竞技场任务
|
2023-07-05 10:15:33 +08:00 |
|
xiekaidong
|
d030ee5988
|
bug修复
|
2023-07-04 20:21:23 +08:00 |
|
xiekaidong
|
87cacec30c
|
竞技场暂停界面
|
2023-07-04 15:03:37 +08:00 |
|
Fang
|
9dc155e593
|
ui动画、结算界面逻辑
|
2023-06-30 16:50:50 +08:00 |
|
xiekaidong
|
d4d92cf97d
|
pvp战斗和整合pve战斗
|
2023-06-28 21:24:15 +08:00 |
|
xiekaidong
|
a623c25f6f
|
pvp战斗概念引入
|
2023-06-26 15:28:40 +08:00 |
|
xiekaidong
|
eb7d04a5dc
|
修改格子计算方式
|
2023-06-26 11:13:13 +08:00 |
|
xiekaidong
|
5de785f28e
|
bug修复
|
2023-06-20 11:35:23 +08:00 |
|
xiekaidong
|
7dae3a6ab5
|
火蛇海蛇效果
|
2023-06-16 15:13:38 +08:00 |
|
xiekaidong
|
5be91b491c
|
暂存
|
2023-06-12 15:21:26 +08:00 |
|
chenxi
|
b609f796ba
|
只有主线关卡战斗结算显示金猪
|
2023-06-02 12:11:29 +08:00 |
|
xiekaidong
|
197fcb9518
|
过场动画
|
2023-06-02 11:07:23 +08:00 |
|
xiekaidong
|
fdbafd1dfe
|
增加一个战斗内使用的gm命令
|
2023-05-30 15:56:29 +08:00 |
|
xiekaidong
|
13d470ad5b
|
每日挑战战斗内部界面
|
2023-05-26 15:43:01 +08:00 |
|
xiekaidong
|
7fa2c93ad5
|
每日战斗战斗部分
|
2023-05-26 15:42:35 +08:00 |
|
xiekaidong
|
bff772a1de
|
技能刷新接入联网
|
2023-05-24 10:01:36 +08:00 |
|
xiekaidong
|
2959b8db73
|
弹窗
|
2023-05-22 10:24:45 +08:00 |
|
xiekaidong
|
2023930d62
|
宝箱
|
2023-05-17 19:19:24 +08:00 |
|
xiekaidong
|
4605282d53
|
障碍物
|
2023-05-16 19:13:08 +08:00 |
|
xiekaidong
|
39a2eee61a
|
格子类型的一些配置改为配置表控制
|
2023-05-12 11:43:49 +08:00 |
|
xiekaidong
|
7de12f99e5
|
搬运一下b5的网络模块
|
2023-05-05 10:42:56 +08:00 |
|
chenxi
|
467e775042
|
战斗清理
|
2023-04-26 19:33:25 +08:00 |
|
xiekaidong
|
ce5d8a9832
|
日志打点
|
2023-04-26 18:12:49 +08:00 |
|
xiekaidong
|
a6bf141658
|
技能选择界面改到战斗界面中
|
2023-04-25 23:27:19 +08:00 |
|
xiekaidong
|
3a4a6b4e0b
|
随机消除元素bug修复
|
2023-04-25 20:38:17 +08:00 |
|
xiekaidong
|
405aad10f7
|
消除bug修复
|
2023-04-24 20:49:53 +08:00 |
|
xiekaidong
|
495f02084d
|
动画
|
2023-04-23 15:29:22 +08:00 |
|
xiekaidong
|
eeb0af1262
|
战斗引导
|
2023-04-21 16:10:28 +08:00 |
|
xiekaidong
|
c874c9026b
|
特效
|
2023-04-20 18:13:56 +08:00 |
|
xiekaidong
|
06bc25c2d2
|
rogue技能显示修改
|
2023-04-20 15:17:14 +08:00 |
|
xiekaidong
|
0de7ceb3b3
|
切大波次
|
2023-04-18 19:52:15 +08:00 |
|