797 Commits

Author SHA1 Message Date
xiekaidong
410cc6b903 优化显示逻辑 2023-08-02 18:47:41 +08:00
xiekaidong
a199c25d16 木棍边缘障碍物 2023-08-02 18:07:58 +08:00
Fang
70ab6525f1 礼包布局显示fix 2023-08-01 11:37:12 +08:00
xiekaidong
5e81a3a03c Merge branch 'master' into dev_20230809
# Conflicts:
#	Assets/lua/app/ui/hero/hero_info_comp.lua.bytes
#	Assets/lua/app/userdata/hero/hero_entity.lua.bytes
2023-07-31 16:23:57 +08:00
Fang
0559fd514f 超框 2023-07-31 11:17:39 +08:00
xiekaidong
4f2afb81f4 Merge branch 'dev_20230731_hotupdate' of http://git.juzugame.com/b6-client/b6-unity into dev_20230731_hotupdate 2023-07-31 10:15:28 +08:00
xiekaidong
8a39baf5f7 界面对齐方式修改 2023-07-31 10:11:03 +08:00
Fang
23c7b3ed55 超框 2023-07-31 10:06:51 +08:00
Fang
69b6eaa5b9 超框 2023-07-31 10:01:59 +08:00
Fang
74dec91e6d 技能tips 2023-07-28 11:46:58 +08:00
xiekaidong
b74826ee90 更新配置 2023-07-27 10:28:08 +08:00
Fang
e31bf25fa3 装备红点、文案 2023-07-26 15:16:01 +08:00
xiekaidong
57867145a4 显示优化 2023-07-26 11:48:07 +08:00
Fang
654c34d0b6 动效、fix 2023-07-25 22:35:04 +08:00
xiekaidong
0cbb46e649 设置adName 2023-07-25 22:15:06 +08:00
xiekaidong
2104d20eed 资源检查 2023-07-25 22:06:48 +08:00
xiekaidong
728cea36a5 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725 2023-07-25 21:07:19 +08:00
xiekaidong
251ca6a3a7 资源调整 2023-07-25 21:07:10 +08:00
Fang
298a77cb44 显示修复、导入特效文件 2023-07-25 21:02:08 +08:00
xiekaidong
5b418c4878 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725 2023-07-25 18:22:42 +08:00
xiekaidong
565b7c9e2e 界面调整 2023-07-25 18:22:40 +08:00
Fang
698bf8e05c 编译 2023-07-25 18:12:06 +08:00
xiekaidong
282476fbd7 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725 2023-07-25 16:37:02 +08:00
xiekaidong
8cdcbd5c1f 多语言 2023-07-25 16:36:56 +08:00
Fang
5cff8c0e57 超框、修复报错 2023-07-25 16:33:15 +08:00
xiekaidong
ebeda8b20e 超框问题 2023-07-25 16:09:25 +08:00
Fang
4d508ec53d 1 2023-07-25 15:45:52 +08:00
xiekaidong
e0e6ebfd4b 显示调整 2023-07-24 22:01:10 +08:00
xiekaidong
613e62e3ab 加一个底板 2023-07-24 21:04:54 +08:00
xiekaidong
6ec08499de 界面调整 2023-07-24 18:37:55 +08:00
Fang
79fbc712f3 商城特惠加装备banner、装备礼包弹出规则fix 2023-07-24 17:08:28 +08:00
Fang
7879d441bd 道具获取扫荡文案修改、武器界面加anim组件 2023-07-24 15:59:13 +08:00
Fang
704dac4fa7 礼包资源上传、bug_fix 2023-07-24 15:13:32 +08:00
Fang
d5c0fb562f bug fix 2023-07-24 14:37:35 +08:00
陈希
1dc21c1cbd Merge branch 'fang/支线基金' into 'dev_20230725'
支线基金

See merge request b6-client/b6-unity!9
2023-07-24 05:19:45 +00:00
xiekaidong
b04a78e2e6 资源检查 2023-07-24 11:59:24 +08:00
Fang
6b52dc9f1d 支线基金 2023-07-24 11:54:43 +08:00
xiekaidong
fb8aee8370 新增道具宝箱显示 2023-07-24 11:18:48 +08:00
xiekaidong
b1bb2f0302 处理界面显示 2023-07-24 10:36:45 +08:00
xiekaidong
5b804f59f5 更新配置,上传资源 2023-07-21 17:18:21 +08:00
xiekaidong
59ea080c79 修改价格显示 2023-07-21 17:02:59 +08:00
xiekaidong
8bf2ff1968 界面调整 2023-07-21 16:16:46 +08:00
xiekaidong
59a19800d6 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725 2023-07-21 11:37:52 +08:00
xiekaidong
c3742f2cb9 buff机制修改 2023-07-21 11:37:49 +08:00
Fang
28f1271fdb 通行证赛季更新 2023-07-21 11:19:56 +08:00
xiekaidong
0d981f611d 价格的字体都改为普通字体 2023-07-21 10:04:45 +08:00
Fang
02da483630 装备升级材料获取 2023-07-21 09:51:28 +08:00
xiekaidong
dd538a387f 优化 2023-07-21 09:50:03 +08:00
xiekaidong
7a3cda1a1b 支线副本 2023-07-20 21:56:34 +08:00
xiekaidong
13754e2505 更新资源和资源检查 2023-07-20 21:51:04 +08:00