96 Commits

Author SHA1 Message Date
Fang
335ab77238 竞技场皮肤属性完善 2023-08-15 12:20:55 +08:00
Fang
a4c6fb8e38 英雄生命值显示fix、资源替换 2023-08-14 11:15:06 +08:00
Fang
5f53448c75 新加颜色生命值加成 2023-08-11 18:16:16 +08:00
Fang
51891b4d27 夏日活动功能 2023-08-11 12:00:11 +08:00
Fang
9c9cde6a89 皮肤功能 2023-08-09 14:15:12 +08:00
xiekaidong
433ec88ba1 编译lua 2023-08-08 16:00:08 +08:00
xiekaidong
cd5f588a66 统一接口,金币不足提示弹窗询问 2023-08-03 14:54:55 +08:00
xiekaidong
8cdcbd5c1f 多语言 2023-07-25 16:36:56 +08:00
xiekaidong
66d69032e6 英雄属性bug修复,查看其他玩家信息时带入装备信息 2023-07-22 18:16:26 +08:00
xiekaidong
ef7fed0faa buff机制修改 2023-07-21 11:39:02 +08:00
Fang
02da483630 装备升级材料获取 2023-07-21 09:51:28 +08:00
xiekaidong
cdcc498a7e 支线副本 2023-07-20 19:46:26 +08:00
Fang
043dbf29c1 review 2023-07-20 19:35:17 +08:00
Fang
047f17e6f3 装备系统 2023-07-20 19:35:17 +08:00
xiekaidong
61336e5d6c 编译lua 2023-07-19 20:24:13 +08:00
Fang
2101a422bb 英雄图鉴 2023-07-14 17:08:08 +08:00
xiekaidong
cdf3186a61 设置界面新增社区链接按钮 2023-07-11 15:46:31 +08:00
Fang
44ee6c0d52 添加头像、头像框道具解锁逻辑 2023-07-07 11:05:29 +08:00
Fang
90b1e8ed97 编译 2023-07-06 19:23:46 +08:00
xiekaidong
b8e057fab3 英雄面板属性加密 2023-07-05 17:25:46 +08:00
Fang
829a6e65b0 fix 2023-07-04 15:15:36 +08:00
Fang
efe355a0c4 完善细节 2023-07-03 18:35:49 +08:00
xiekaidong
4aaaf714bd 竞技场敌方自动战斗 2023-06-29 20:52:39 +08:00
Fang
38619144f6 显示fix 2023-06-21 15:17:57 +08:00
chenxi
b56dc5fe04 白名单和审核模式 2023-06-21 11:36:31 +08:00
Fang
32364f7c4d 超框 2023-06-20 20:20:23 +08:00
Fang
ccd4276e6f 英雄编队拆分出来 2023-06-20 11:08:11 +08:00
Fang
dfa698542b 玩家头像抽象成独立cell 2023-06-19 14:59:02 +08:00
Fang
d275c58ad4 头像昵称 2023-06-19 10:57:28 +08:00
chenxi
7a141820b4 merge 2023-06-14 15:43:17 +08:00
chenxi
b51d130b3b Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
# Conflicts:
#	Assets/proto/protocol.bytes
2023-06-14 15:41:50 +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
20aea655a1 支付转菊花 2023-06-12 22:19:42 +08:00
chenxi
29832da12e 编译 2023-06-06 18:44:31 +08:00
xiekaidong
77cd8d33ac 编译lua 2023-06-06 15:06:56 +08:00
CloudJ
f413a2fadb 音效 2023-06-06 11:09:18 +08:00
CloudJ
ade6fd169a 编译 2023-06-06 10:22:05 +08:00
chenxi
4582299d87 英雄展示界面 2023-06-05 10:24:53 +08:00
chenxi
33edfece08 替换战令界面 2023-06-04 22:38:12 +08:00
chenxi
2fa49ed069 邮箱 2023-06-03 23:54:18 +08:00
CloudJ
3b8bf3106a 编译 2023-06-02 19:59:29 +08:00
CloudJ
ae21941b99 编译 2023-06-01 21:09:57 +08:00
chenxi
6d8fd7bf5e 功能解锁图标 2023-05-31 20:55:01 +08:00
xiekaidong
4b805302fc bug修复 2023-05-31 18:06:48 +08:00
Fang
645d23fb74 编译 2023-05-31 14:42:15 +08:00
CloudJ
fdd3963902 编译 2023-05-31 11:38:15 +08:00
chenxi
86a321a568 七天乐界面调整 2023-05-31 10:12:26 +08:00
CloudJ
71c0d6729b 编译 2023-05-31 09:46:56 +08:00
xiekaidong
29a8e59133 编译lua 2023-05-30 17:50:23 +08:00