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 |
|
chenxi
|
2fbe01e673
|
每日挑战
|
2023-05-30 11:45:27 +08:00 |
|
CloudJ
|
ba4231ea83
|
编译
|
2023-05-29 18:08:46 +08:00 |
|
xiekaidong
|
eb07f98711
|
显示优化
|
2023-05-26 16:33:21 +08:00 |
|
chenxi
|
b8652d1bbc
|
七天乐
|
2023-05-26 14:52:05 +08:00 |
|
chenxi
|
f72c92e5ce
|
紧急
|
2023-05-25 17:08:25 +08:00 |
|
chenxi
|
56e27bfd3f
|
基金界面
|
2023-05-24 19:26:13 +08:00 |
|
chenxi
|
3b47c0dc1a
|
编译
|
2023-05-23 19:03:11 +08:00 |
|
xiekaidong
|
97953f1958
|
格挡动作表现、反击界面表现
|
2023-05-23 16:40:45 +08:00 |
|
CloudJ
|
012dd355ea
|
编译
|
2023-05-23 14:20:32 +08:00 |
|
xiekaidong
|
cf654fe422
|
技能tips
|
2023-05-22 16:00:44 +08:00 |
|
chenxi
|
14bf5e913d
|
编译
|
2023-05-19 21:58:07 +08:00 |
|
xiekaidong
|
ee9f6680b9
|
更新资源
|
2023-05-19 20:00:57 +08:00 |
|
chenxi
|
d2b296fe95
|
宝箱tips
|
2023-05-19 16:37:44 +08:00 |
|
chenxi
|
07fe75f380
|
挂机表现
|
2023-05-19 14:50:46 +08:00 |
|
chenxi
|
9a122cf094
|
编译
|
2023-05-18 20:32:53 +08:00 |
|
chenxi
|
ccd4a380d9
|
编译
|
2023-05-16 18:18:19 +08:00 |
|
chenxi
|
e5cf6e09bf
|
战令
|
2023-05-15 21:34:02 +08:00 |
|
chenxi
|
c1f4013bb9
|
编译
|
2023-05-11 21:36:25 +08:00 |
|
chenxi
|
9a027c3125
|
购买体力
|
2023-05-09 14:54:14 +08:00 |
|
chenxi
|
b781f3a483
|
设置
|
2023-05-08 20:40:33 +08:00 |
|
chenxi
|
a517dbb7dc
|
删除多余的
|
2023-05-08 20:08:45 +08:00 |
|
xiekaidong
|
33cad880c9
|
联网
|
2023-05-08 11:03:17 +08:00 |
|
chenxi
|
62b4039351
|
主城
|
2023-05-05 22:05:13 +08:00 |
|
xiekaidong
|
af35eb8118
|
节奏
|
2023-05-04 17:42:00 +08:00 |
|
xiekaidong
|
af05ae6dc5
|
棋盘死局
|
2023-04-27 20:15:53 +08:00 |
|
xiekaidong
|
2c7f63baeb
|
bug修复
|
2023-04-26 18:40:05 +08:00 |
|
xiekaidong
|
4f4f340b11
|
日志打点
|
2023-04-26 18:14:57 +08:00 |
|
xiekaidong
|
7cab14eba5
|
编译lua
|
2023-04-24 10:51:41 +08:00 |
|
xiekaidong
|
9249bc74f7
|
消除技能特效
|
2023-04-23 19:03:00 +08:00 |
|