xiekaidong
|
1bbe630e25
|
Merge branch 'mugun' into dev_20230815
|
2023-08-02 18:08:39 +08:00 |
|
xiekaidong
|
a199c25d16
|
木棍边缘障碍物
|
2023-08-02 18:07:58 +08:00 |
|
zhangpengfei
|
0812b11677
|
新角色上传
|
2023-08-01 21:02:03 +08:00 |
|
Fang
|
70ab6525f1
|
礼包布局显示fix
|
2023-08-01 11:37:12 +08:00 |
|
xiekaidong
|
30d6ac5a5e
|
删除模型
|
2023-07-31 17:05:07 +08:00 |
|
zhangpengfei
|
7359fed73e
|
新角色上传
|
2023-07-31 16:54:26 +08:00 |
|
zhangpengfei
|
93f00bcbe4
|
新角色上传
|
2023-07-31 16:48:50 +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 |
|
xiekaidong
|
5906b8053b
|
资源检查，设置abName
|
2023-07-25 23:18:24 +08:00 |
|
Fang
|
ccacd36da3
|
更新特效
|
2023-07-25 22:55:31 +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 |
|
|
|
f490ca5040
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
|
2023-07-24 11:57:01 +08:00 |
|
|
|
e52240330f
|
111111
|
2023-07-24 11:56:47 +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 |
|
|
|
96102a9e8e
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
|
2023-07-21 17:43:18 +08:00 |
|
|
|
dff189af22
|
1111111
|
2023-07-21 17:43:08 +08:00 |
|
xiekaidong
|
5b804f59f5
|
更新配置，上传资源
|
2023-07-21 17:18:21 +08:00 |
|
