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 |
|
Fang
|
d829c85777
|
编译
|
2023-07-25 16:13:33 +08:00 |
|
xiekaidong
|
ebeda8b20e
|
超框问题
|
2023-07-25 16:09:25 +08:00 |
|
xiekaidong
|
23ea46e1e2
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
# Conflicts:
# Assets/lua/app/config/strings/cn/global.lua.bytes
|
2023-07-25 16:06:27 +08:00 |
|
xiekaidong
|
4cc90051a4
|
韩国社区跳转处理
|
2023-07-25 16:06:17 +08:00 |
|
Fang
|
4d508ec53d
|
1
|
2023-07-25 15:45:52 +08:00 |
|
Fang
|
e7927efe57
|
编译
|
2023-07-25 15:45:24 +08:00 |
|
xiekaidong
|
7752930572
|
bug修复
|
2023-07-25 15:36:24 +08:00 |
|
xiekaidong
|
e0e6ebfd4b
|
显示调整
|
2023-07-24 22:01:10 +08:00 |
|
xiekaidong
|
a89f9ed725
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
|
2023-07-24 21:48:07 +08:00 |
|
xiekaidong
|
2aaf6afd0c
|
优化
|
2023-07-24 21:48:04 +08:00 |
|
Fang
|
f821a6e6d1
|
显示fix
|
2023-07-24 21:39:48 +08:00 |
|
xiekaidong
|
ae520c3757
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
|
2023-07-24 21:20:27 +08:00 |
|
xiekaidong
|
863446d377
|
bug修复
|
2023-07-24 21:20:23 +08:00 |
|
Fang
|
60652a2829
|
防具升级显示的增加绿色数值不计算加成百分比、扫荡界面奖励动画、武器漂浮动画
|
2023-07-24 21:07:54 +08:00 |
|
xiekaidong
|
613e62e3ab
|
加一个底板
|
2023-07-24 21:04:54 +08:00 |
|
xiekaidong
|
8b4a69cb90
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
|
2023-07-24 20:55:07 +08:00 |
|
xiekaidong
|
0a7c4c5170
|
bug修复
|
2023-07-24 20:55:03 +08:00 |
|
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 |
|
