xiekaidong
|
32704fc6cc
|
Merge branch 'master' into dev_20230725
# Conflicts:
# Assets/lua/app/ui/hero/hero_comp.lua.bytes
|
2023-07-18 09:34:10 +08:00 |
|
xiekaidong
|
e343016c9f
|
更新日语多语言
|
2023-07-17 17:40:30 +08:00 |
|
xiekaidong
|
b620281b43
|
更新配置和优化
|
2023-07-17 17:21:20 +08:00 |
|
Fang
|
6f8acc2673
|
新号报错处理
|
2023-07-17 15:18:57 +08:00 |
|
Fang
|
2101a422bb
|
英雄图鉴
|
2023-07-14 17:08:08 +08:00 |
|
xiekaidong
|
a19624ff92
|
更新配置
|
2023-07-12 14:58:26 +08:00 |
|
xiekaidong
|
cdf3186a61
|
设置界面新增社区链接按钮
|
2023-07-11 15:46:31 +08:00 |
|
xiekaidong
|
01d8ba6a49
|
木兰试玩
|
2023-07-10 12:00:46 +08:00 |
|
xiekaidong
|
ae12ce4101
|
更新配置
|
2023-07-07 16:06:18 +08:00 |
|
xiekaidong
|
84ae5c96c6
|
出包前得资源检查和设置abName
|
2023-07-07 16:04:44 +08:00 |
|
Fang
|
90b1e8ed97
|
编译
|
2023-07-06 19:23:46 +08:00 |
|
Fang
|
951cfb2d92
|
成长礼包触发方式修改
|
2023-07-06 18:21:15 +08:00 |
|
xiekaidong
|
3b67015da8
|
bug修复
|
2023-07-06 17:42:19 +08:00 |
|
Fang
|
5dc4ee1b78
|
竞技场段位替图、战令文案替换
|
2023-07-06 14:42:54 +08:00 |
|
xiekaidong
|
a048f7d2d9
|
编译lua
|
2023-07-06 10:42:17 +08:00 |
|
xiekaidong
|
6ac555593c
|
引导处理一下
|
2023-07-05 21:59:04 +08:00 |
|
Fang
|
1d337ed62f
|
显示修复
|
2023-07-05 15:56:46 +08:00 |
|
xiekaidong
|
29c5bb9021
|
更新配置
|
2023-07-05 15:36:23 +08:00 |
|
Fang
|
0767c6eae5
|
编译
|
2023-07-05 15:04:42 +08:00 |
|
Fang
|
48293f54c1
|
竞技场宝箱功能补全
|
2023-07-05 14:54:34 +08:00 |
|
xiekaidong
|
3c66b5c3da
|
取消连线
|
2023-07-04 18:05:41 +08:00 |
|
xiekaidong
|
c3789374c6
|
更新配置
|
2023-07-04 15:38:28 +08:00 |
|
Fang
|
829a6e65b0
|
fix
|
2023-07-04 15:15:36 +08:00 |
|
Fang
|
007e810cf2
|
动效添加、替图
|
2023-07-03 17:17:36 +08:00 |
|
Fang
|
c4dabad5c5
|
编译
|
2023-07-03 14:16:50 +08:00 |
|
xiekaidong
|
f7c7f3ad27
|
bug修复
|
2023-06-30 17:54:39 +08:00 |
|
xiekaidong
|
4aaaf714bd
|
竞技场敌方自动战斗
|
2023-06-29 20:52:39 +08:00 |
|
chenxi
|
5f9898ee06
|
更新配置
|
2023-06-21 11:21:41 +08:00 |
|
chenxi
|
2d47aa5288
|
编译
|
2023-06-20 22:20:16 +08:00 |
|
xiekaidong
|
dfd66067ec
|
更新配置
|
2023-06-20 21:03:38 +08:00 |
|
chenxi
|
86949e1dc5
|
ab name
|
2023-06-20 19:59:48 +08:00 |
|
chenxi
|
cf3e9051f8
|
编译
|
2023-06-20 19:58:29 +08:00 |
|
chenxi
|
c6103b2945
|
ab name
|
2023-06-20 17:12:48 +08:00 |
|
xiekaidong
|
8a358a1604
|
更新配置
|
2023-06-20 15:30:04 +08:00 |
|
chenxi
|
fe9ccf4325
|
更新配置
|
2023-06-20 14:44:12 +08:00 |
|
chenxi
|
622d9918d3
|
ab name
|
2023-06-20 14:32:36 +08:00 |
|
Fang
|
491599bf1a
|
导表
|
2023-06-20 11:44:52 +08:00 |
|
Fang
|
700b38d1fc
|
添加重命名与当前昵称相同提示
|
2023-06-19 16:25:25 +08:00 |
|
chenxi
|
3791c54170
|
ab name
|
2023-06-16 21:55:12 +08:00 |
|
chenxi
|
c3fdacbef8
|
编译
|
2023-06-16 21:34:55 +08:00 |
|
xiekaidong
|
da555bd8f3
|
怪物经验可配置根据血量的分段经验
|
2023-06-16 18:44:43 +08:00 |
|
chenxi
|
f3b3a3f117
|
更新配置
|
2023-06-16 12:05:53 +08:00 |
|
xiekaidong
|
fe19b35f7d
|
更新配置
|
2023-06-16 10:09:59 +08:00 |
|
xiekaidong
|
4c476a5188
|
更新配置
|
2023-06-16 10:09:30 +08:00 |
|
Fang
|
fa28d96027
|
修改副本显示顺序、碎片副本奖励逻辑
|
2023-06-15 16:09:12 +08:00 |
|
Fang
|
a5ca47d201
|
金币副本新增boss抗性
|
2023-06-15 10:47:11 +08:00 |
|
xiekaidong
|
a3a9ac1fb7
|
连携提示
|
2023-06-14 18:21:48 +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
|
7e8b46effc
|
技能音效
|
2023-06-13 17:44:37 +08:00 |
|