xiekaidong
|
ce7ad3cb8c
|
新buff和新机制
|
2023-08-08 16:39:03 +08:00 |
|
xiekaidong
|
3b61c03934
|
Merge branch 'dev_20230809' into dev_20230815
# Conflicts:
# Assets/lua/app/common/local_data.lua.bytes
# Assets/lua/app/config/act_gift.lua.bytes
# Assets/lua/app/config/arena_rank.lua.bytes
# Assets/lua/app/config/chapter_board.lua.bytes
# Assets/lua/app/config/const.lua.bytes
# Assets/lua/app/config/item.lua.bytes
# Assets/lua/app/config/skill.lua.bytes
# Assets/lua/app/config/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/cn/buff.lua.bytes
# Assets/lua/app/config/strings/cn/global.lua.bytes
# Assets/lua/app/config/strings/cn/item.lua.bytes
# Assets/lua/app/config/strings/de/item.lua.bytes
# Assets/lua/app/config/strings/en/item.lua.bytes
# Assets/lua/app/config/strings/es/item.lua.bytes
# Assets/lua/app/config/strings/fr/item.lua.bytes
# Assets/lua/app/config/strings/id/item.lua.bytes
# Assets/lua/app/config/strings/ja/item.lua.bytes
# Assets/lua/app/config/strings/ja/skill.lua.bytes
# Assets/lua/app/config/strings/ko/item.lua.bytes
# Assets/lua/app/config/strings/pt/item.lua.bytes
# Assets/lua/app/config/strings/ru/item.lua.bytes
# Assets/lua/app/config/strings/th/item.lua.bytes
# Assets/lua/app/config/strings/vi/item.lua.bytes
# Assets/lua/app/config/strings/zh/item.lua.bytes
# Assets/lua/app/config/strings/zh/skill.lua.bytes
# Assets/lua/app/global/global_func.lua.bytes
# Assets/lua/app/module/arena/arena_manager.lua.bytes
# Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
# Assets/lua/app/module/battle/helper/battle_snapshot_helper.lua.bytes
# Assets/lua/app/module/equip/equip_manager.lua.bytes
# Assets/lua/app/module/shop/shop_manager.lua.bytes
# Assets/lua/app/proto/proto_msg_type.lua.bytes
# Assets/lua/app/ui/battle/battle_base_ui.lua.bytes
# Assets/lua/app/ui/main_city/component/main_comp.lua.bytes
# Assets/lua/app/ui/ui_manager.lua.bytes
# Assets/proto/protocol.bytes
|
2023-08-08 15:59:22 +08:00 |
|
xiekaidong
|
32e93ec980
|
木棍边缘障碍物
|
2023-08-02 18:10:43 +08:00 |
|
xiekaidong
|
31a57fddc6
|
技能机制优化
|
2023-08-01 17:39:15 +08:00 |
|
xiekaidong
|
ef7fed0faa
|
buff机制修改
|
2023-07-21 11:39:02 +08:00 |
|
xiekaidong
|
84ae5c96c6
|
出包前得资源检查和设置abName
|
2023-07-07 16:04:44 +08:00 |
|
xiekaidong
|
3b67015da8
|
bug修复
|
2023-07-06 17:42:19 +08:00 |
|
xiekaidong
|
de21e7b5d7
|
显示问题修复
|
2023-07-05 14:26:04 +08:00 |
|
xiekaidong
|
4aaaf714bd
|
竞技场敌方自动战斗
|
2023-06-29 20:52:39 +08:00 |
|
xiekaidong
|
06191c7e8c
|
bug修复
|
2023-06-21 17:16:12 +08:00 |
|
xiekaidong
|
989a7c63e5
|
火蛇海蛇效果
|
2023-06-16 15:14:33 +08:00 |
|
xiekaidong
|
19084e41f4
|
bug修复
|
2023-06-15 14:07:48 +08:00 |
|
chenxi
|
358a41e2ed
|
参数以及上报
|
2023-06-14 21:43:46 +08:00 |
|
xiekaidong
|
b60f9b1ca4
|
boss机制棋盘效果处理
|
2023-06-02 22:28:55 +08:00 |
|
xiekaidong
|
88008cdf67
|
显示优化
|
2023-06-01 22:10:51 +08:00 |
|
xiekaidong
|
7e25cb28cb
|
三消格子支持spine动画表现
|
2023-05-31 20:18:57 +08:00 |
|
xiekaidong
|
075d7a2480
|
层级调整
|
2023-05-30 22:04:57 +08:00 |
|
xiekaidong
|
cd99e669cb
|
更新配置
|
2023-05-30 15:08:30 +08:00 |
|
xiekaidong
|
cf654fe422
|
技能tips
|
2023-05-22 16:00:44 +08:00 |
|
xiekaidong
|
63ad1d641a
|
神灯障碍物
|
2023-05-16 21:24:26 +08:00 |
|
xiekaidong
|
098220b08c
|
编译lua
|
2023-05-12 20:30:10 +08:00 |
|
xiekaidong
|
05965fa97e
|
bug修复
|
2023-04-27 15:24:50 +08:00 |
|
xiekaidong
|
1bf268b859
|
显示优化
|
2023-04-25 22:24:27 +08:00 |
|
xiekaidong
|
9e03ce63fc
|
章节障碍物和棋盘地图
|
2023-04-25 18:39:02 +08:00 |
|
xiekaidong
|
0ed41e1da1
|
显示修改
|
2023-04-25 15:50:04 +08:00 |
|
xiekaidong
|
65a8cb252f
|
技能特效
|
2023-04-24 21:03:51 +08:00 |
|
xiekaidong
|
39e9ba43a0
|
动画
|
2023-04-24 17:21:12 +08:00 |
|
xiekaidong
|
9184710970
|
显示优化
|
2023-04-24 14:16:44 +08:00 |
|
xiekaidong
|
11219e4716
|
bug修复
|
2023-04-24 10:14:38 +08:00 |
|
xiekaidong
|
1da0916885
|
编译lua
|
2023-04-23 19:03:58 +08:00 |
|
xiekaidong
|
9249bc74f7
|
消除技能特效
|
2023-04-23 19:03:00 +08:00 |
|
xiekaidong
|
fd6eb94de4
|
bug和显示优化
|
2023-04-23 17:22:33 +08:00 |
|
xiekaidong
|
e82acf920a
|
编译lua
|
2023-04-23 14:20:08 +08:00 |
|
xiekaidong
|
97f473eb2c
|
修改特效，消除影响改为十字形
|
2023-04-22 00:47:15 +08:00 |
|
chenxi
|
1cf51cc739
|
资源处理和ab name
|
2023-04-21 22:55:50 +08:00 |
|
chenxi
|
40b4ce4bf4
|
结算界面
|
2023-04-21 22:42:16 +08:00 |
|
xiekaidong
|
0b47632138
|
bug修复
|
2023-04-21 11:00:32 +08:00 |
|
xiekaidong
|
6c0307c660
|
动画
|
2023-04-21 10:57:51 +08:00 |
|
xiekaidong
|
46818a52e9
|
技能解锁
|
2023-04-20 21:27:33 +08:00 |
|
xiekaidong
|
96cba83db9
|
动画调整
|
2023-04-20 20:30:56 +08:00 |
|
chenxi
|
6991dd2d36
|
伤害
|
2023-04-20 19:04:56 +08:00 |
|
xiekaidong
|
c1119c5b9a
|
修复
|
2023-04-20 18:50:27 +08:00 |
|
xiekaidong
|
5222c799bb
|
动画
|
2023-04-20 18:46:11 +08:00 |
|
chenxi
|
779ae429f2
|
编译
|
2023-04-20 15:22:06 +08:00 |
|
chenxi
|
3d3276eaf2
|
编译
|
2023-04-19 16:29:38 +08:00 |
|
chenxi
|
5182596112
|
merge
|
2023-04-19 10:48:28 +08:00 |
|
chenxi
|
534deaf72d
|
编译
|
2023-04-18 20:37:49 +08:00 |
|
chenxi
|
7024404d8f
|
编译
|
2023-04-18 20:10:27 +08:00 |
|
chenxi
|
07dd3631c4
|
编译
|
2023-04-16 23:06:53 +08:00 |
|
xiekaidong
|
10159333ea
|
战斗回合概念
|
2023-04-14 18:00:58 +08:00 |
|