Fang
|
30bf431636
|
编译
|
2023-08-11 16:03:20 +08:00 |
|
xiekaidong
|
b08ab375cc
|
bug修复
|
2023-08-10 19:29:42 +08:00 |
|
xiekaidong
|
ce7ad3cb8c
|
新buff和新机制
|
2023-08-08 16:39:03 +08:00 |
|
xiekaidong
|
433ec88ba1
|
编译lua
|
2023-08-08 16:00:08 +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
|
93bd2796b6
|
战斗血条优化
|
2023-08-02 20:34:37 +08:00 |
|
xiekaidong
|
32e93ec980
|
木棍边缘障碍物
|
2023-08-02 18:10:43 +08:00 |
|
xiekaidong
|
31a57fddc6
|
技能机制优化
|
2023-08-01 17:39:15 +08:00 |
|
xiekaidong
|
dfb2714266
|
更新配置
|
2023-07-31 16:28:15 +08:00 |
|
xiekaidong
|
0cbb46e649
|
设置adName
|
2023-07-25 22:15:06 +08:00 |
|
Fang
|
f821a6e6d1
|
显示fix
|
2023-07-24 21:39:48 +08:00 |
|
xiekaidong
|
b4ddfb7945
|
一些报错修复
|
2023-07-24 18:32:51 +08:00 |
|
xiekaidong
|
a3ab8f74fa
|
副本引导
|
2023-07-24 17:10:59 +08:00 |
|
xiekaidong
|
8bf2ff1968
|
界面调整
|
2023-07-21 16:16:46 +08:00 |
|
xiekaidong
|
ef7fed0faa
|
buff机制修改
|
2023-07-21 11:39:02 +08:00 |
|
xiekaidong
|
7011bbce34
|
支线副本
|
2023-07-20 21:47:56 +08:00 |
|
xiekaidong
|
61336e5d6c
|
编译lua
|
2023-07-19 20:24:13 +08:00 |
|
xiekaidong
|
01d8ba6a49
|
木兰试玩
|
2023-07-10 12:00:46 +08:00 |
|
xiekaidong
|
84ae5c96c6
|
出包前得资源检查和设置abName
|
2023-07-07 16:04:44 +08:00 |
|
xiekaidong
|
1e461a0926
|
竞技场暂停界面可滑动
|
2023-07-07 11:44:02 +08:00 |
|
Fang
|
44ee6c0d52
|
添加头像、头像框道具解锁逻辑
|
2023-07-07 11:05:29 +08:00 |
|
xiekaidong
|
3b67015da8
|
bug修复
|
2023-07-06 17:42:19 +08:00 |
|
xiekaidong
|
a048f7d2d9
|
编译lua
|
2023-07-06 10:42:17 +08:00 |
|
xiekaidong
|
483d505cbd
|
显示
|
2023-07-05 18:36:06 +08:00 |
|
xiekaidong
|
3405a1b1ae
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-07-05 17:55:15 +08:00 |
|
xiekaidong
|
7bedad109d
|
bug修复
|
2023-07-05 17:55:12 +08:00 |
|
Fang
|
4c45a9db92
|
修改头像框界面布局、竞技场赛季刷新fix等
|
2023-07-05 17:49:39 +08:00 |
|
Fang
|
1d337ed62f
|
显示修复
|
2023-07-05 15:56:46 +08:00 |
|
Fang
|
0767c6eae5
|
编译
|
2023-07-05 15:04:42 +08:00 |
|
Fang
|
48293f54c1
|
竞技场宝箱功能补全
|
2023-07-05 14:54:34 +08:00 |
|
xiekaidong
|
37c4da852d
|
bug修复
|
2023-07-05 14:45:49 +08:00 |
|
xiekaidong
|
de21e7b5d7
|
显示问题修复
|
2023-07-05 14:26:04 +08:00 |
|
xiekaidong
|
2ce21cba6d
|
连击提示
|
2023-07-05 11:23:19 +08:00 |
|
Fang
|
7000dff1bb
|
竞技场fix
|
2023-07-05 10:52:36 +08:00 |
|
xiekaidong
|
2e605fabc0
|
适配
|
2023-07-05 10:42:39 +08:00 |
|
xiekaidong
|
c5ec2e1853
|
竞技场任务
|
2023-07-05 10:16:00 +08:00 |
|
xiekaidong
|
0320ef81bd
|
prefab资源检查，更新字体
|
2023-07-04 20:16:20 +08:00 |
|
Fang
|
91efb4bf35
|
fix and 替图
|
2023-07-04 18:34:41 +08:00 |
|
xiekaidong
|
cc0b2c05f8
|
战斗速度
|
2023-07-04 18:25:20 +08:00 |
|
xiekaidong
|
3c66b5c3da
|
取消连线
|
2023-07-04 18:05:41 +08:00 |
|
Fang
|
829a6e65b0
|
fix
|
2023-07-04 15:15:36 +08:00 |
|
xiekaidong
|
d2a75b56d1
|
竞技场节奏调整
|
2023-07-04 10:55:31 +08:00 |
|
xiekaidong
|
efb2fc57ba
|
竞技场弹窗礼包
|
2023-07-03 20:02:46 +08:00 |
|
Fang
|
efe355a0c4
|
完善细节
|
2023-07-03 18:35:49 +08:00 |
|
Fang
|
007e810cf2
|
动效添加、替图
|
2023-07-03 17:17:36 +08:00 |
|
Fang
|
0e7f765ca2
|
fix
|
2023-07-03 09:51:15 +08:00 |
|
xiekaidong
|
f7c7f3ad27
|
bug修复
|
2023-06-30 17:54:39 +08:00 |
|
xiekaidong
|
03cce7d521
|
战斗处理
|
2023-06-30 16:04:26 +08:00 |
|
xiekaidong
|
ad57cef6ea
|
竞技场节奏调整
|
2023-06-30 14:46:02 +08:00 |
|
xiekaidong
|
cbca95b111
|
战斗bug修复
|
2023-06-29 21:25:44 +08:00 |
|