xiekaidong
|
24a0670365
|
配置更新
|
2023-09-19 18:34:04 +08:00 |
|
xiekaidong
|
60cb67ca4d
|
bug修复
|
2023-09-19 18:13:11 +08:00 |
|
xiekaidong
|
1d74ee3b77
|
bug修复
|
2023-09-19 17:17:18 +08:00 |
|
xiekaidong
|
02f32f15df
|
上报抽卡次数、特效
|
2023-09-19 16:05:58 +08:00 |
|
xiekaidong
|
c686640095
|
更新配置
|
2023-09-19 15:04:13 +08:00 |
|
xiekaidong
|
16da88351d
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919
# Conflicts:
# 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/en/equip.lua.bytes
# Assets/lua/app/config/strings/ja/global.lua.bytes
# Assets/lua/app/config/strings/vi/task_type.lua.bytes
# Assets/lua/app/config/strings/zh/task_type.lua.bytes
# Assets/lua/app/ui/hero/runes_info_comp.lua.bytes
|
2023-09-19 15:03:53 +08:00 |
|
xiekaidong
|
d32e88ac01
|
编译lua
|
2023-09-19 15:03:21 +08:00 |
|
Fang
|
0b59c2d77d
|
符文动画、属性fix
|
2023-09-19 15:03:02 +08:00 |
|
xiekaidong
|
9ca3f79c89
|
bug修复
|
2023-09-19 14:30:19 +08:00 |
|
Fang
|
8ec42e8a10
|
导入战令banner、fix
|
2023-09-19 11:52:59 +08:00 |
|
Fang
|
e003e236ec
|
更表
|
2023-09-19 11:28:36 +08:00 |
|
Fang
|
505a7cb8fb
|
fix
|
2023-09-19 11:22:05 +08:00 |
|
xiekaidong
|
edfc1d0b46
|
修复
|
2023-09-19 11:20:59 +08:00 |
|
xiekaidong
|
37979729e0
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919
|
2023-09-19 11:05:00 +08:00 |
|
xiekaidong
|
5c3b431d25
|
提示
|
2023-09-19 11:04:57 +08:00 |
|
Fang
|
9a44044fa6
|
修改
|
2023-09-19 10:59:02 +08:00 |
|
xiekaidong
|
1e766a87c7
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919
|
2023-09-19 10:52:15 +08:00 |
|
xiekaidong
|
71058ccfee
|
增加战斗前后上阵英雄参数，方便查询作弊
|
2023-09-19 10:52:11 +08:00 |
|
Fang
|
6f5f4d94e9
|
自动淬炼加同步
|
2023-09-19 10:51:20 +08:00 |
|
xiekaidong
|
8b235c7e3a
|
优化
|
2023-09-19 09:27:16 +08:00 |
|
xiekaidong
|
f07e452b82
|
提示
|
2023-09-18 21:51:21 +08:00 |
|
xiekaidong
|
f4a61a5cbd
|
bug修复
|
2023-09-18 21:35:23 +08:00 |
|
xiekaidong
|
c58757a314
|
优化
|
2023-09-18 21:29:17 +08:00 |
|
xiekaidong
|
7d6398835a
|
优化显示
|
2023-09-18 21:05:52 +08:00 |
|
xiekaidong
|
41434625e2
|
bug修复
|
2023-09-18 20:52:32 +08:00 |
|
xiekaidong
|
a2ff24f5a6
|
帮助界面
|
2023-09-18 20:22:02 +08:00 |
|
xiekaidong
|
c30e9d729c
|
优化和容错
|
2023-09-18 20:07:37 +08:00 |
|
Fang
|
37ec3978b5
|
fix
|
2023-09-18 18:40:27 +08:00 |
|
Fang
|
3d37d44aa7
|
编译
|
2023-09-18 16:57:46 +08:00 |
|
Fang
|
b92f858295
|
界面优化
|
2023-09-18 16:38:04 +08:00 |
|
xiekaidong
|
188a85d723
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919
|
2023-09-18 16:04:06 +08:00 |
|
xiekaidong
|
9b95508c42
|
优化
|
2023-09-18 16:04:03 +08:00 |
|
Fang
|
448aa0659e
|
符文自动淬炼修改、特效完善
|
2023-09-18 14:57:00 +08:00 |
|
xiekaidong
|
c54a6c48b9
|
更新图集，编译lua
|
2023-09-18 14:53:41 +08:00 |
|
xiekaidong
|
b6345dce5a
|
Merge branch 'master' into dev_20230919
# Conflicts:
# Assets/arts/atlas/ui/common.asset
# Assets/arts/textures/ui/common/common_lock_1.png
# Assets/arts/textures/ui/common/common_lock_1.png.meta
# Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
# Assets/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua.bytes
# Assets/lua/app/userdata/battle/battle_base_data.lua.bytes
|
2023-09-18 14:51:32 +08:00 |
|
xiekaidong
|
b0ca1e6132
|
循环活动的一些处理
|
2023-09-18 14:43:39 +08:00 |
|
xiekaidong
|
b044273afc
|
bug修复
|
2023-09-18 12:00:41 +08:00 |
|
xiekaidong
|
79c4fd7907
|
优化显示
|
2023-09-18 11:40:53 +08:00 |
|
xiekaidong
|
33e84e5cc1
|
优化显示
|
2023-09-18 11:21:37 +08:00 |
|
xiekaidong
|
c0aeccf71a
|
显示优化
|
2023-09-18 10:52:38 +08:00 |
|
xiekaidong
|
b3f490c9ac
|
bug修复
|
2023-09-18 10:38:18 +08:00 |
|
xiekaidong
|
ae1aeba1c5
|
编译lua
|
2023-09-18 09:39:22 +08:00 |
|
xiekaidong
|
1cf27e1a54
|
编译lua
|
2023-09-16 20:26:20 +08:00 |
|
Fang
|
0d50692a4f
|
请求优化
|
2023-09-15 20:54:35 +08:00 |
|
Fang
|
769cfbe34d
|
圆月活动
|
2023-09-15 19:23:25 +08:00 |
|
xiekaidong
|
cccce0625e
|
pvp战斗取消元素随机加权
|
2023-09-15 17:41:37 +08:00 |
|
xiekaidong
|
0ba16ffa0c
|
更新配置和优化显示
|
2023-09-15 17:37:15 +08:00 |
|
Fang
|
a86dbc2116
|
新用户报错fix
|
2023-09-14 12:05:04 +08:00 |
|
Fang
|
575a7a90f7
|
编译
|
2023-09-14 11:08:40 +08:00 |
|
Fang
|
2b78eb4cc0
|
显示fix
|
2023-09-14 11:08:09 +08:00 |
|