xiekaidong
|
4d1635dc3b
|
背景特效
|
2023-08-15 14:59:48 +08:00 |
|
Fang
|
ea1d84b065
|
编译
|
2023-08-15 11:37:54 +08:00 |
|
Fang
|
566ac2d369
|
容错、导表
|
2023-08-14 18:33:10 +08:00 |
|
Fang
|
0531830c75
|
配置更新
|
2023-08-14 14:44:04 +08:00 |
|
Fang
|
0aba4ec004
|
更表
|
2023-08-14 09:50:16 +08:00 |
|
Fang
|
302452e76d
|
竞技场宝箱弹出优化、bugfix
|
2023-08-11 15:50:38 +08:00 |
|
xiekaidong
|
62907b1a83
|
边缘障碍物逻辑优化
|
2023-08-11 15:17:49 +08:00 |
|
xiekaidong
|
425bfe2fd7
|
更新配置
|
2023-08-11 10:41:28 +08:00 |
|
xiekaidong
|
5c1fa9be63
|
更新配置
|
2023-08-10 09:41:33 +08:00 |
|
Fang
|
9c9cde6a89
|
皮肤功能
|
2023-08-09 14:15:12 +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
|
dff0b5b08a
|
更新配置
|
2023-08-08 11:44:40 +08:00 |
|
xiekaidong
|
dd1a91051a
|
bug修复
|
2023-08-04 16:59:30 +08:00 |
|
Fang
|
e79f3ea767
|
装备材料副本扫荡排序修改
|
2023-08-04 10:53:22 +08:00 |
|
xiekaidong
|
3b182e56c5
|
英雄竞技场段位解锁
|
2023-08-03 18:08:02 +08:00 |
|
xiekaidong
|
cd5f588a66
|
统一接口，金币不足提示弹窗询问
|
2023-08-03 14:54:55 +08:00 |
|
xiekaidong
|
8de4c3340b
|
武器副本增加体力消耗
|
2023-08-03 11:08:40 +08:00 |
|
xiekaidong
|
410cc6b903
|
优化显示逻辑
|
2023-08-02 18:47:41 +08:00 |
|
xiekaidong
|
32e93ec980
|
木棍边缘障碍物
|
2023-08-02 18:10:43 +08:00 |
|
xiekaidong
|
dfb2714266
|
更新配置
|
2023-07-31 16:28:15 +08:00 |
|
xiekaidong
|
5e81a3a03c
|
Merge branch 'master' into dev_20230809
# Conflicts:
# Assets/lua/app/ui/hero/hero_info_comp.lua.bytes
# Assets/lua/app/userdata/hero/hero_entity.lua.bytes
|
2023-07-31 16:23:57 +08:00 |
|
xiekaidong
|
9a3549ad43
|
引导修改
|
2023-07-28 18:40:31 +08:00 |
|
Fang
|
74dec91e6d
|
技能tips
|
2023-07-28 11:46:58 +08:00 |
|
xiekaidong
|
56cf140e85
|
更新配置
|
2023-07-27 12:33:23 +08:00 |
|
xiekaidong
|
b74826ee90
|
更新配置
|
2023-07-27 10:28:08 +08:00 |
|
Fang
|
a43ea6c7d7
|
编译
|
2023-07-26 16:15:13 +08:00 |
|
Fang
|
e31bf25fa3
|
装备红点、文案
|
2023-07-26 15:16:01 +08:00 |
|
xiekaidong
|
0cbb46e649
|
设置adName
|
2023-07-25 22:15:06 +08:00 |
|
xiekaidong
|
2af5fb2301
|
资源检查，更新配置，编译lua，更新pb
|
2023-07-25 22:09:41 +08:00 |
|
Fang
|
aa45c8bbf2
|
编译
|
2023-07-25 20:18:47 +08:00 |
|
xiekaidong
|
5e6093378c
|
更新配置
|
2023-07-25 19:29:18 +08:00 |
|
Fang
|
698bf8e05c
|
编译
|
2023-07-25 18:12:06 +08:00 |
|
xiekaidong
|
97708c861a
|
更新配置
|
2023-07-25 16:50:58 +08:00 |
|
Fang
|
d829c85777
|
编译
|
2023-07-25 16:13:33 +08:00 |
|
xiekaidong
|
23ea46e1e2
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
# Conflicts:
# Assets/lua/app/config/strings/cn/global.lua.bytes
|
2023-07-25 16:06:27 +08:00 |
|
xiekaidong
|
4cc90051a4
|
韩国社区跳转处理
|
2023-07-25 16:06:17 +08:00 |
|
Fang
|
e7927efe57
|
编译
|
2023-07-25 15:45:24 +08:00 |
|
xiekaidong
|
aaf9e7520c
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
# Conflicts:
# Assets/lua/app/userdata/dungeon/dungeon_armor_entity.lua.bytes
|
2023-07-24 18:48:16 +08:00 |
|
xiekaidong
|
3cfb991ee9
|
调整一下逻辑
|
2023-07-24 18:48:04 +08:00 |
|
Fang
|
04730d1ad9
|
装备属性加成计算fix
|
2023-07-24 18:38:23 +08:00 |
|
xiekaidong
|
a3ab8f74fa
|
副本引导
|
2023-07-24 17:10:59 +08:00 |
|
Fang
|
6b52dc9f1d
|
支线基金
|
2023-07-24 11:54:43 +08:00 |
|
xiekaidong
|
fb8aee8370
|
新增道具宝箱显示
|
2023-07-24 11:18:48 +08:00 |
|
xiekaidong
|
b1bb2f0302
|
处理界面显示
|
2023-07-24 10:36:45 +08:00 |
|
xiekaidong
|
66d69032e6
|
英雄属性bug修复，查看其他玩家信息时带入装备信息
|
2023-07-22 18:16:26 +08:00 |
|
xiekaidong
|
5b804f59f5
|
更新配置，上传资源
|
2023-07-21 17:18:21 +08:00 |
|
xiekaidong
|
5cb6ae349b
|
优化技能的释放位置逻辑
|
2023-07-21 15:36:27 +08:00 |
|
xiekaidong
|
b38cc4acca
|
新增buff和叠加方式优化
|
2023-07-21 14:40:39 +08:00 |
|