36 Commits

Author SHA1 Message Date
puxuan
077a4d0f14 副本 2025-10-10 19:46:33 +08:00
puxuan
e32c238a90 副本 2025-10-10 19:22:45 +08:00
puxuan
4ce72abeb5 res 2025-08-04 18:49:43 +08:00
kai
3a47091fa5 主界面 2025-06-29 16:36:24 +08:00
xiekaidong
35193331ef 符文副本 2023-09-12 10:09:29 +08:00
Fang
7f99b9d771 装备礼包fix 2023-08-28 15:26:21 +08:00
Fang
6097fc7c7f 装备升级礼包 2023-08-24 17:29:22 +08:00
Fang
d3dbfd0b51 1、材料本扫荡后次数刷新不及时fix 2、装备副本扫荡触发礼包未立即弹出fix 2023-08-09 10:20:31 +08:00
Fang
e79f3ea767 装备材料副本扫荡排序修改 2023-08-04 10:53:22 +08:00
Fang
6fabe5b071 资源副本扫荡不关闭关卡界面 2023-08-03 10:09:36 +08:00
Fang
fcba09b85b 装备副本材料获取界面排序 2023-08-01 16:44:29 +08:00
Fang
a8b82718d0 1、抽卡界面不展示装备升级红点2、英雄未解锁时显示初始数值3、修改副本入口命名 2023-07-28 18:05:35 +08:00
xiekaidong
0cbb46e649 设置adName 2023-07-25 22:15:06 +08:00
Fang
d829c85777 编译 2023-07-25 16:13:33 +08:00
Fang
e7927efe57 编译 2023-07-25 15:45:24 +08:00
Fang
d5c0fb562f bug fix 2023-07-24 14:37:35 +08:00
Fang
37463a8704 材料获取显示修复 2023-07-21 18:04:40 +08:00
Fang
02da483630 装备升级材料获取 2023-07-21 09:51:28 +08:00
xiekaidong
cdcc498a7e 支线副本 2023-07-20 19:46:26 +08:00
xiekaidong
61336e5d6c 编译lua 2023-07-19 20:24:13 +08:00
Fang
eb54d58240 碎片副本奖励展示优化 2023-07-11 14:53:58 +08:00
xiekaidong
f7c7f3ad27 bug修复 2023-06-30 17:54:39 +08:00
xiekaidong
4aaaf714bd 竞技场敌方自动战斗 2023-06-29 20:52:39 +08:00
Fang
38619144f6 显示fix 2023-06-21 15:17:57 +08:00
Fang
32364f7c4d 超框 2023-06-20 20:20:23 +08:00
Fang
7939d1630d 跨天关闭副本关卡选择界面 2023-06-19 16:00:11 +08:00
Fang
8c7286c1b8 编译 2023-06-19 11:58:44 +08:00
chenxi
3791c54170 ab name 2023-06-16 21:55:12 +08:00
chenxi
f04af250ac 编译 2023-06-16 10:37:25 +08:00
xiekaidong
0b5670c7a4 每日挑战任务完成情况上报 2023-06-15 17:30:49 +08:00
Fang
a5ca47d201 金币副本新增boss抗性 2023-06-15 10:47:11 +08:00
Fang
ee97ab1c93 Merge branch 'dev' into fang/dungeon
# Conflicts:
#	Assets/lua/app/config/item.lua.bytes
#	Assets/lua/app/config/localization/localization_global_const.lua.bytes
#	Assets/lua/app/config/skill.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/global.lua.bytes
#	Assets/lua/app/config/strings/en/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/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/global.lua.bytes
#	Assets/lua/app/config/strings/zh/item.lua.bytes
#	Assets/lua/app/module/battle/battle_const.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
#	Assets/lua/app/ui/battle/battle_ui.lua.bytes
#	Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
2023-06-14 11:42:03 +08:00
xiekaidong
3e92da4286 界面处理 2023-06-13 10:20:17 +08:00
chenxi
a517dbb7dc 删除多余的 2023-05-08 20:08:45 +08:00
chenxi
4809253845 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
# Conflicts:
#	Assets/arts/textures/ui/common.meta
#	Assets/arts/textures/ui/common/common_alpha.png.meta
#	Assets/arts/textures/ui/common/common_arrow_3.png
#	Assets/arts/textures/ui/common/common_arrow_3.png.meta
#	Assets/arts/textures/ui/common/common_arrow_4.png
#	Assets/arts/textures/ui/common/common_arrow_4.png.meta
#	Assets/arts/textures/ui/common/common_bg_0.png.meta
#	Assets/arts/textures/ui/common/common_bg_3.png
#	Assets/arts/textures/ui/common/common_bg_3.png.meta
#	Assets/arts/textures/ui/common/common_board_10.png
#	Assets/arts/textures/ui/common/common_board_10.png.meta
#	Assets/arts/textures/ui/common/common_board_6.png
#	Assets/arts/textures/ui/common/common_board_6.png.meta
#	Assets/arts/textures/ui/common/common_board_7.png
#	Assets/arts/textures/ui/common/common_board_7.png.meta
#	Assets/arts/textures/ui/common/common_btn_2.png
#	Assets/arts/textures/ui/common/common_btn_2.png.meta
#	Assets/arts/textures/ui/common/common_btn_3.png
#	Assets/arts/textures/ui/common/common_btn_3.png.meta
#	Assets/arts/textures/ui/common/common_check_1.png
#	Assets/arts/textures/ui/common/common_check_1.png.meta
#	Assets/arts/textures/ui/common/common_chest_1.png
#	Assets/arts/textures/ui/common/common_chest_1.png.meta
#	Assets/arts/textures/ui/common/common_dec_1.png
#	Assets/arts/textures/ui/common/common_dec_1.png.meta
#	Assets/arts/textures/ui/common/common_hp.png
#	Assets/arts/textures/ui/common/common_hp.png.meta
#	Assets/arts/textures/ui/common/common_inf.png
#	Assets/arts/textures/ui/common/common_inf.png.meta
#	Assets/arts/textures/ui/common/common_lock_2.png
#	Assets/arts/textures/ui/common/common_lock_2.png.meta
#	Assets/arts/textures/ui/common/common_progress_4.png
#	Assets/arts/textures/ui/common/common_progress_4.png.meta
2023-04-07 15:27:09 +08:00
xiekaidong
87af2478d9 整理项目 2023-04-03 11:04:31 +08:00