Fang
|
91efb4bf35
|
fix and 替图
|
2023-07-04 18:34:41 +08:00 |
|
xiekaidong
|
3c66b5c3da
|
取消连线
|
2023-07-04 18:05:41 +08:00 |
|
xiekaidong
|
83b8dbe82d
|
Merge branch 'dev' into arena
# Conflicts:
# Assets/arts/atlas/ui/common.spriteatlas
# Assets/lua/app/common/bi_report.lua.bytes
# Assets/lua/app/common/data_manager.lua.bytes
# Assets/lua/app/config/localization/localization_global_const.lua.bytes
# Assets/lua/app/config/strings/cn/global.lua.bytes
# Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
# Assets/lua/app/module/chapter/chapter_manager.lua.bytes
# Assets/lua/app/proto/proto_msg_type.lua.bytes
# Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
# Assets/lua/app/userdata/hero/hero_data.lua.bytes
# Assets/proto/protocol.bytes
|
2023-07-04 15:33:45 +08:00 |
|
Fang
|
829a6e65b0
|
fix
|
2023-07-04 15:15:36 +08:00 |
|
Fang
|
007e810cf2
|
动效添加、替图
|
2023-07-03 17:17:36 +08:00 |
|
xiekaidong
|
b7fb8bff59
|
评价弹窗
|
2023-07-03 15:57:42 +08:00 |
|
CloudJ
|
2fe1593610
|
banner
|
2023-07-03 15:03:14 +08:00 |
|
Fang
|
813af1dff1
|
替图
|
2023-07-03 14:15:22 +08:00 |
|
CloudJ
|
4adea4f216
|
更换战令图片
|
2023-07-03 10:28:11 +08:00 |
|
Fang
|
0e7f765ca2
|
fix
|
2023-07-03 09:51:15 +08:00 |
|
xiekaidong
|
8e804732b5
|
替换资源
|
2023-06-30 16:10:57 +08:00 |
|
Fang
|
aae1ec0c8c
|
完善逻辑
|
2023-06-29 16:10:22 +08:00 |
|
Fang
|
764645f4d5
|
逻辑补充
|
2023-06-28 18:36:07 +08:00 |
|
Fang
|
80c02c4c82
|
竞技场
|
2023-06-27 18:27:38 +08:00 |
|
Fang
|
32364f7c4d
|
超框
|
2023-06-20 20:20:23 +08:00 |
|
chenxi
|
86949e1dc5
|
ab name
|
2023-06-20 19:59:48 +08:00 |
|
Fang
|
7c79623e92
|
超框处理
|
2023-06-20 18:43:08 +08:00 |
|
xiekaidong
|
bb0b9a6673
|
bug修复，上传资源
|
2023-06-20 17:51:19 +08:00 |
|
chenxi
|
622d9918d3
|
ab name
|
2023-06-20 14:32:36 +08:00 |
|
chenxi
|
7d10ad4261
|
更新资源
|
2023-06-20 10:19:45 +08:00 |
|
chenxi
|
d9befbff7a
|
开几个语言
|
2023-06-20 10:08:24 +08:00 |
|
chenxi
|
ea2eb1778f
|
更新战斗资源
|
2023-06-19 18:52:28 +08:00 |
|
Fang
|
d275c58ad4
|
头像昵称
|
2023-06-19 10:57:28 +08:00 |
|
chenxi
|
3791c54170
|
ab name
|
2023-06-16 21:55:12 +08:00 |
|
chenxi
|
7a82aff2db
|
界面调整
|
2023-06-16 17:36:27 +08:00 |
|
chenxi
|
0c06bb7b7e
|
界面调整
|
2023-06-16 17:16:39 +08:00 |
|
xiekaidong
|
cca6553178
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-06-16 16:23:25 +08:00 |
|
xiekaidong
|
f81d586bca
|
上传资源
|
2023-06-16 16:23:14 +08:00 |
|
chenxi
|
e3d7fad227
|
公告
|
2023-06-16 15:11:05 +08:00 |
|
chenxi
|
c485c58962
|
设置和兑换码
|
2023-06-15 16:40:17 +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 |
|
Fang
|
656f096c03
|
ui资源补充替换
|
2023-06-13 16:16:29 +08:00 |
|
xiekaidong
|
59f0cd755b
|
修改每日挑战战斗界面的任务入口
|
2023-06-13 15:25:06 +08:00 |
|
chenxi
|
c64dcdf8f9
|
苹果账号绑定界面
|
2023-06-13 10:41:58 +08:00 |
|
xiekaidong
|
3e92da4286
|
界面处理
|
2023-06-13 10:20:17 +08:00 |
|
Fang
|
6aa23549f5
|
活动副本
|
2023-06-12 15:40:03 +08:00 |
|
chenxi
|
b409ab7e86
|
资源
|
2023-06-06 10:35:12 +08:00 |
|
CloudJ
|
ee24231070
|
替换界面
|
2023-06-06 10:16:30 +08:00 |
|
chenxi
|
d00eef7856
|
ab name
|
2023-06-05 21:33:26 +08:00 |
|
chenxi
|
e8cbf8ebc6
|
ui
|
2023-06-05 21:05:24 +08:00 |
|
chenxi
|
12ace817dd
|
战令
|
2023-06-05 20:08:57 +08:00 |
|
chenxi
|
83363f4694
|
主城资源
|
2023-06-05 19:54:50 +08:00 |
|
chenxi
|
d1ec620837
|
资源自动处理和ab name
|
2023-06-05 19:19:17 +08:00 |
|
chenxi
|
7963b91bbd
|
七天乐换界面
|
2023-06-05 17:57:32 +08:00 |
|
xiekaidong
|
dbc4b35bdd
|
更新资源
|
2023-06-05 15:42:41 +08:00 |
|
chenxi
|
2f6f2861b8
|
金猪动画
|
2023-06-05 15:08:25 +08:00 |
|
CloudJ
|
4661996247
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-06-05 14:10:59 +08:00 |
|
CloudJ
|
ab33223ea6
|
编译
|
2023-06-05 14:10:56 +08:00 |
|
Fang
|
4d914f84b0
|
每日挑战替图
|
2023-06-05 11:47:32 +08:00 |
|
CloudJ
|
9fc8ad0a0b
|
替换UI
|
2023-06-05 11:46:29 +08:00 |
|