xiekaidong
|
8c3abfac91
|
bug修复
|
2023-07-26 00:18:57 +08:00 |
|
|
|
8d8869e3af
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
|
2023-07-24 20:37:11 +08:00 |
|
|
|
5b026d2d96
|
装备动画
|
2023-07-24 20:34:42 +08:00 |
|
Fang
|
4b93fa1335
|
修复装备升级后，总属性显示错误
|
2023-07-24 20:33:56 +08:00 |
|
xiekaidong
|
53af8c65af
|
调整一下逻辑
|
2023-07-24 18:48:32 +08:00 |
|
xiekaidong
|
aaf9e7520c
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
# Conflicts:
# Assets/lua/app/userdata/dungeon/dungeon_armor_entity.lua.bytes
|
2023-07-24 18:48:16 +08:00 |
|
xiekaidong
|
3cfb991ee9
|
调整一下逻辑
|
2023-07-24 18:48:04 +08:00 |
|
Fang
|
04730d1ad9
|
装备属性加成计算fix
|
2023-07-24 18:38:23 +08:00 |
|
xiekaidong
|
6ec08499de
|
界面调整
|
2023-07-24 18:37:55 +08:00 |
|
xiekaidong
|
b4ddfb7945
|
一些报错修复
|
2023-07-24 18:32:51 +08:00 |
|
xiekaidong
|
f760328136
|
修复一下报错问题
|
2023-07-24 18:02:04 +08:00 |
|
xiekaidong
|
894c979aa9
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
|
2023-07-24 17:11:03 +08:00 |
|
xiekaidong
|
a3ab8f74fa
|
副本引导
|
2023-07-24 17:10:59 +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 |
|
xiekaidong
|
288379dbc2
|
字段修改
|
2023-07-24 14:10:39 +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
|
c61a2fb229
|
增加资源
|
2023-07-24 11:52:29 +08:00 |
|
xiekaidong
|
b6116656d7
|
显示修改
|
2023-07-24 11:40:30 +08:00 |
|
xiekaidong
|
3506bc596f
|
修改描述
|
2023-07-24 11:22:42 +08:00 |
|
xiekaidong
|
fb8aee8370
|
新增道具宝箱显示
|
2023-07-24 11:18:48 +08:00 |
|
xiekaidong
|
b1bb2f0302
|
处理界面显示
|
2023-07-24 10:36:45 +08:00 |
|
chenxi
|
a063c83a48
|
上传资源
|
2023-07-23 18:42:20 +08:00 |
|
chenxi
|
4cff3d6cd2
|
更新资源
|
2023-07-23 18:35:09 +08:00 |
|
chenxi
|
b0e1f8a98f
|
道具资源
|
2023-07-23 18:05:39 +08:00 |
|
chenxi
|
431fad8874
|
武器资源
|
2023-07-23 15:45:47 +08:00 |
|
chenxi
|
351f6a2712
|
更新图标资源
|
2023-07-23 15:29:07 +08:00 |
|
xiekaidong
|
66d69032e6
|
英雄属性bug修复，查看其他玩家信息时带入装备信息
|
2023-07-22 18:16:26 +08:00 |
|
xiekaidong
|
f8e0a914b0
|
更新配置
|
2023-07-22 14:02:47 +08:00 |
|
xiekaidong
|
7c9356cc91
|
更新资源
|
2023-07-22 13:57:41 +08:00 |
|
xiekaidong
|
658379acc1
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
|
2023-07-21 18:14:17 +08:00 |
|
xiekaidong
|
f3a6a84fea
|
资源替换
|
2023-07-21 18:12:45 +08:00 |
|
Fang
|
37463a8704
|
材料获取显示修复
|
2023-07-21 18:04:40 +08:00 |
|
xiekaidong
|
18015279da
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
|
2023-07-21 17:47:18 +08:00 |
|
xiekaidong
|
2bb3d99058
|
伤害公式bug修复
|
2023-07-21 17:47:07 +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 |
|
xiekaidong
|
59ea080c79
|
修改价格显示
|
2023-07-21 17:02:59 +08:00 |
|
xiekaidong
|
0d6c9542a1
|
试玩弹窗优化
|
2023-07-21 16:24:12 +08:00 |
|
xiekaidong
|
8bf2ff1968
|
界面调整
|
2023-07-21 16:16:46 +08:00 |
|
xiekaidong
|
5cb6ae349b
|
优化技能的释放位置逻辑
|
2023-07-21 15:36:27 +08:00 |
|
xiekaidong
|
cb4147e794
|
bug修复
|
2023-07-21 15:15:28 +08:00 |
|
xiekaidong
|
06cee2197a
|
bug修复
|
2023-07-21 15:07:21 +08:00 |
|
