862 Commits

Author SHA1 Message Date
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
xiekaidong
df9fb7cabb bug修复 2023-09-04 20:06:58 +08:00
xiekaidong
284fbe9bc3 bug修复 2023-09-04 19:27:03 +08:00
xiekaidong
5666c71d2b 修复一些bug 2023-09-04 18:21:26 +08:00
xiekaidong
8c9945cc63 倒计时优化 2023-09-04 17:25:27 +08:00
xiekaidong
24b7793c44 bug修复 2023-09-04 16:55:13 +08:00
xiekaidong
072f845722 bug修复 2023-09-04 16:52:07 +08:00
xiekaidong
48c9e677c0 侧边栏 2023-09-04 16:48:24 +08:00
xiekaidong
2bd4d0aece 跳转 2023-09-04 16:31:45 +08:00
xiekaidong
8ec159b939 侧边栏 2023-09-04 16:07:07 +08:00
xiekaidong
e4aa6e2edd 更新配置 2023-09-01 21:21:02 +08:00
Fang
c04ae2e751 review 2023-09-01 17:45:52 +08:00
Fang
9d1d98ddd5 代码调整 2023-09-01 15:59:20 +08:00
Fang
9d6334e76e 新手14天乐 2023-09-01 15:35:31 +08:00
Fang
332789283b 点击英雄卡面,不显示皮肤fix 2023-08-31 18:10:26 +08:00
Fang
7d0f23df51 竞技场入口banner修改 2023-08-30 18:13:05 +08:00
Fang
1c4236a20f 竞技场战令spine修改 2023-08-30 17:44:54 +08:00
Fang
667e9dbe11 更换皮肤卡面变化 2023-08-30 17:32:14 +08:00
xiekaidong
b3b9e59f4a 优化 2023-08-29 21:32:29 +08:00
Fang
79f1369068 加载资源优化 2023-08-29 17:11:49 +08:00
xiekaidong
eb1a197cc0 Merge branch 'master' into dev_20230829
# Conflicts:
#	Assets/lua/app/config/skill_rogue.lua.bytes
#	Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
2023-08-29 16:02:44 +08:00
xiekaidong
67a46e7d06 增加容错 2023-08-29 14:55:13 +08:00
xiekaidong
66bf185bd7 每日任务宝箱动画 2023-08-28 18:56:35 +08:00
xiekaidong
6533c64892 Merge branch 'dev_20230829' of http://git.juzugame.com/b6-client/b6-unity into dev_20230829 2023-08-28 18:36:19 +08:00
xiekaidong
b5c144a98e 显示修复 2023-08-28 18:36:15 +08:00
Fang
eeae9e8382 段位奖励添加奖励光效 2023-08-28 17:42:13 +08:00
Fang
7f99b9d771 装备礼包fix 2023-08-28 15:26:21 +08:00
xiekaidong
5d690de886 封号删除账号 2023-08-28 14:13:04 +08:00
Fang
efd26331b4 档位奖励进度显示fix 2023-08-28 10:15:37 +08:00
Fang
b460d9d8c5 段位奖励段位图标显示修改 2023-08-25 10:36:35 +08:00
xiekaidong
c180b32e81 动画 2023-08-24 18:29:57 +08:00
xiekaidong
5bffd844c1 Merge branch 'dev_20230829' of http://git.juzugame.com/b6-client/b6-unity into dev_20230829 2023-08-24 18:26:12 +08:00
xiekaidong
0ec05b592c 更改基金开启时间 2023-08-24 18:26:03 +08:00
陈希
ca7f897efe Merge branch 'fang/装备礼包' into 'dev_20230829'
装备升级礼包

See merge request b6-client/b6-unity!15
2023-08-24 10:24:23 +00:00