xiekaidong
|
8089bc6e16
|
倒计时优化
|
2023-09-04 17:25:39 +08:00 |
|
xiekaidong
|
8c9945cc63
|
倒计时优化
|
2023-09-04 17:25:27 +08:00 |
|
xiekaidong
|
b36941172c
|
编译lua
|
2023-08-21 09:48:42 +08:00 |
|
xiekaidong
|
033c2e8d63
|
英雄基金
|
2023-08-18 18:10:12 +08:00 |
|
Fang
|
51891b4d27
|
夏日活动功能
|
2023-08-11 12:00:11 +08:00 |
|
Fang
|
9c9cde6a89
|
皮肤功能
|
2023-08-09 14:15:12 +08:00 |
|
Fang
|
a43ea6c7d7
|
编译
|
2023-07-26 16:15:13 +08:00 |
|
Fang
|
654c34d0b6
|
动效、fix
|
2023-07-25 22:35:04 +08:00 |
|
Fang
|
e7927efe57
|
编译
|
2023-07-25 15:45:24 +08:00 |
|
xiekaidong
|
cdcc498a7e
|
支线副本
|
2023-07-20 19:46:26 +08:00 |
|
Fang
|
047f17e6f3
|
装备系统
|
2023-07-20 19:35:17 +08:00 |
|
Fang
|
2101a422bb
|
英雄图鉴
|
2023-07-14 17:08:08 +08:00 |
|
Fang
|
44ee6c0d52
|
添加头像、头像框道具解锁逻辑
|
2023-07-07 11:05:29 +08:00 |
|
Fang
|
0767c6eae5
|
编译
|
2023-07-05 15:04:42 +08:00 |
|
Fang
|
829a6e65b0
|
fix
|
2023-07-04 15:15:36 +08:00 |
|
xiekaidong
|
f7c7f3ad27
|
bug修复
|
2023-06-30 17:54:39 +08:00 |
|
Fang
|
7939d1630d
|
跨天关闭副本关卡选择界面
|
2023-06-19 16:00:11 +08:00 |
|
Fang
|
d275c58ad4
|
头像昵称
|
2023-06-19 10:57:28 +08:00 |
|
chenxi
|
25534ecacb
|
编译
|
2023-06-14 15:40:09 +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
|
791a81438b
|
绑定账号
|
2023-05-31 22:23:48 +08:00 |
|
CloudJ
|
e36c841ade
|
编译
|
2023-05-31 15:43:07 +08:00 |
|
Fang
|
0b8904f47a
|
每日挑战界面调整、扣除次数修复
|
2023-05-31 10:27:09 +08:00 |
|
CloudJ
|
ba4231ea83
|
编译
|
2023-05-29 18:08:46 +08:00 |
|
CloudJ
|
13e23d167b
|
更配置
|
2023-05-29 15:38:58 +08:00 |
|
chenxi
|
f72bc2d7c1
|
任务没开启前不显示任务完成得toast
|
2023-05-29 12:06:51 +08:00 |
|
xiekaidong
|
f40ddbf2ea
|
技能刷新接入联网
|
2023-05-24 10:03:20 +08:00 |
|
chenxi
|
3894964322
|
编译
|
2023-05-22 21:25:43 +08:00 |
|
xiekaidong
|
f4b1d70efa
|
boss的buff自动提示
|
2023-05-22 17:24:07 +08:00 |
|
chenxi
|
c1f4013bb9
|
编译
|
2023-05-11 21:36:25 +08:00 |
|
chenxi
|
b6c15f641d
|
编译
|
2023-05-05 15:39:51 +08:00 |
|
xiekaidong
|
4e744fa0e1
|
编译lua
|
2023-04-21 16:28:05 +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 |
|