895 Commits

Author SHA1 Message Date
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
3d37d44aa7 编译 2023-09-18 16:57:46 +08:00
Fang
b92f858295 界面优化 2023-09-18 16:38:04 +08:00
Fang
448aa0659e 符文自动淬炼修改、特效完善 2023-09-18 14:57:00 +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
2b78eb4cc0 显示fix 2023-09-14 11:08:09 +08:00
Fang
0679e04395 属性fix 2023-09-13 18:24:56 +08:00
Fang
f409368faa bug fix 2023-09-13 15:45:27 +08:00
xiekaidong
75abb7d2bb 一些优化和审核模式处理 2023-09-13 14:56:25 +08:00
Fang
0a231c3f94 自动铸造开启等级 2023-09-13 11:03:18 +08:00
xiekaidong
00e06273ad 优化 2023-09-12 20:34:37 +08:00
xiekaidong
bcf3982203 显示bug修复 2023-09-12 20:27:00 +08:00
xiekaidong
17a349c66d 优化点击 2023-09-12 20:12:12 +08:00
xiekaidong
2a8cfe31e9 点击优化 2023-09-12 20:10:19 +08:00
xiekaidong
ce6127b71d 显示优化 2023-09-12 20:08:08 +08:00
xiekaidong
9f0fd56ab4 修复bug 2023-09-12 19:46:47 +08:00
Fang
a6d3bb1803 bug fix 2023-09-12 18:44:00 +08:00
Fang
1e970493b3 优化 2023-09-12 16:17:22 +08:00
Fang
37bd501110 容错处理 2023-09-12 15:05:52 +08:00
陈希
4094f79f7b Merge branch 'fang/runes' into 'dev_20230919'
符文功能

See merge request b6-client/b6-unity!17
2023-09-12 06:50:32 +00:00
xiekaidong
06f81a091a Merge branch 'master' into dev_20230919
# Conflicts:
#	Assets/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua.bytes
2023-09-12 14:41:48 +08:00
xiekaidong
34953bab97 回合数提示 2023-09-12 14:32:16 +08:00
xiekaidong
9ff6dbeee0 战斗优化调整 2023-09-12 12:23:40 +08:00
xiekaidong
57131fb59b 调整 2023-09-12 11:40:45 +08:00
Fang
6eeff31530 符文功能 2023-09-12 10:41:44 +08:00
xiekaidong
35193331ef 符文副本 2023-09-12 10:09:29 +08:00
Fang
a586912584 添加容错 2023-09-08 10:02:17 +08:00
Fang
de30482954 礼包红点刷新fix 2023-09-06 16:54:20 +08:00
xiekaidong
5587b000e9 显示修复 2023-09-05 23:44:20 +08:00
xiekaidong
e936d45746 设置abname 2023-09-05 20:55:51 +08:00
xiekaidong
ac9253f074 编译lua 2023-09-05 17:36:54 +08:00
xiekaidong
ea75430a03 bug修复 2023-09-05 15:28:33 +08:00
xiekaidong
4dc5debc7c 优化 2023-09-05 12:02:00 +08:00
xiekaidong
6f0a9720b2 bug修复和优化 2023-09-05 11:47:58 +08:00
xiekaidong
68614b6ba8 bug修复 2023-09-05 10:06:59 +08:00