xiekaidong
|
b38cc4acca
|
新增buff和叠加方式优化
|
2023-07-21 14:40:39 +08:00 |
|
xiekaidong
|
70591027b2
|
更新配置，英雄排序问题
|
2023-07-21 11:47:26 +08:00 |
|
xiekaidong
|
1824bc2470
|
优化
|
2023-07-21 11:41:45 +08:00 |
|
xiekaidong
|
ef7fed0faa
|
buff机制修改
|
2023-07-21 11:39:02 +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 |
|
xiekaidong
|
7af5978fad
|
bug修复
|
2023-07-21 10:00:35 +08:00 |
|
xiekaidong
|
16425b276a
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
|
2023-07-21 09:55:57 +08:00 |
|
xiekaidong
|
10653fa887
|
修改评价弹窗关卡
|
2023-07-21 09:55:39 +08:00 |
|
陈希
|
3493550391
|
Merge branch 'fang/材料获取' into 'dev_20230725'
装备升级材料获取
See merge request b6-client/b6-unity!7
|
2023-07-21 01:52:09 +00:00 |
|
Fang
|
02da483630
|
装备升级材料获取
|
2023-07-21 09:51:28 +08:00 |
|
xiekaidong
|
0c9cf3f6c9
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
|
2023-07-21 09:50:19 +08:00 |
|
xiekaidong
|
dd538a387f
|
优化
|
2023-07-21 09:50:03 +08:00 |
|
陈希
|
b3b3a1b192
|
Merge branch 'fang/礼包' into 'dev_20230725'
装备礼包
See merge request b6-client/b6-unity!8
|
2023-07-21 01:49:46 +00:00 |
|
Fang
|
3397f8d017
|
装备礼包
|
2023-07-20 22:23:44 +08:00 |
|
xiekaidong
|
f052906d83
|
结算界面异常处理
|
2023-07-20 22:05:03 +08:00 |
|
xiekaidong
|
7a3cda1a1b
|
支线副本
|
2023-07-20 21:56:34 +08:00 |
|
xiekaidong
|
13754e2505
|
更新资源和资源检查
|
2023-07-20 21:51:04 +08:00 |
|
xiekaidong
|
7011bbce34
|
支线副本
|
2023-07-20 21:47:56 +08:00 |
|
xiekaidong
|
e8e887d987
|
Merge branch 'dev_20230725' into dungeon
|
2023-07-20 21:47:31 +08:00 |
|
xiekaidong
|
69dfb8ca23
|
支线副本
|
2023-07-20 21:47:04 +08:00 |
|
Fang
|
69e0ea2db1
|
英雄升级显示、战斗报错fix
|
2023-07-20 21:23:42 +08:00 |
|
xiekaidong
|
a58933e708
|
支线副本战斗中的任务
|
2023-07-20 20:41:40 +08:00 |
|
Fang
|
2c7f90f837
|
英雄升级报错fix
|
2023-07-20 20:28:30 +08:00 |
|
Fang
|
26f13850c3
|
活动副本列表高度修改
|
2023-07-20 20:25:21 +08:00 |
|
xiekaidong
|
cdcc498a7e
|
支线副本
|
2023-07-20 19:46:26 +08:00 |
|
xiekaidong
|
2ac3c391a1
|
Merge branch 'dev_20230725' into dungeon
|
2023-07-20 19:45:03 +08:00 |
|
xiekaidong
|
2e3da36d8f
|
支线副本
|
2023-07-20 19:44:49 +08:00 |
|
陈希
|
c543fd6b70
|
Merge branch 'fang/equip' into 'dev_20230725'
装备系统
See merge request b6-client/b6-unity!6
|
2023-07-20 11:38:51 +00:00 |
|
Fang
|
622234139b
|
review
|
2023-07-20 19:35:17 +08:00 |
|
Fang
|
f01c611d72
|
导表
|
2023-07-20 19:35:17 +08:00 |
|
Fang
|
043dbf29c1
|
review
|
2023-07-20 19:35:17 +08:00 |
|
Fang
|
047f17e6f3
|
装备系统
|
2023-07-20 19:35:17 +08:00 |
|
|
|
3af6a41577
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
|
2023-07-20 17:42:06 +08:00 |
|
|
|
074d09307f
|
20042
|
2023-07-20 17:42:00 +08:00 |
|
xiekaidong
|
b14c7ff9cc
|
更新资源合pb
|
2023-07-20 17:40:52 +08:00 |
|
chenxi
|
b151021d36
|
升级版本号
v1.0.8_android
v1.1.8_ios
|
2023-07-20 15:27:44 +08:00 |
|
xiekaidong
|
57ca94a32c
|
改名异常修复
|
2023-07-20 15:11:40 +08:00 |
|
xiekaidong
|
b589275d49
|
支线副本资源
|
2023-07-20 15:01:54 +08:00 |
|
|
|
d0c6df253f
|
111111
|
2023-07-20 11:16:09 +08:00 |
|
xiekaidong
|
1d5e277d77
|
支线副本界面
|
2023-07-19 21:22:42 +08:00 |
|
xiekaidong
|
61336e5d6c
|
编译lua
|
2023-07-19 20:24:13 +08:00 |
|
xiekaidong
|
8bc091438b
|
Merge branch 'dev_20230725' into dungeon
# Conflicts:
# Assets/arts/spines/characters/m20039.meta
# Assets/arts/spines/characters/m20039/m20039.atlas.txt.meta
# Assets/arts/spines/characters/m20039/m20039.png.meta
# Assets/arts/spines/characters/m20039/m20039.skel.bytes.meta
# Assets/arts/spines/characters/m20039/m20039_atlas.asset
# Assets/arts/spines/characters/m20039/m20039_atlas.asset.meta
# Assets/arts/spines/characters/m20039/m20039_material.mat
# Assets/arts/spines/characters/m20039/m20039_material.mat.meta
# Assets/arts/spines/characters/m20039/m20039_skeletondata.asset
# Assets/arts/spines/characters/m20039/m20039_skeletondata.asset.meta
# Assets/arts/spines/characters/m20040.meta
# Assets/arts/spines/characters/m20040/m20040.atlas.txt.meta
# Assets/arts/spines/characters/m20040/m20040.png.meta
# Assets/arts/spines/characters/m20040/m20040.skel.bytes.meta
# Assets/arts/spines/characters/m20040/m20040_atlas.asset
# Assets/arts/spines/characters/m20040/m20040_atlas.asset.meta
# Assets/arts/spines/characters/m20040/m20040_material.mat
# Assets/arts/spines/characters/m20040/m20040_material.mat.meta
# Assets/arts/spines/characters/m20040/m20040_skeletondata.asset
# Assets/arts/spines/characters/m20040/m20040_skeletondata.asset.meta
# Assets/arts/spines/characters/m20041.meta
# Assets/arts/spines/characters/m20041/m20041.atlas.txt.meta
# Assets/arts/spines/characters/m20041/m20041.png.meta
# Assets/arts/spines/characters/m20041/m20041.skel.bytes.meta
# Assets/arts/spines/characters/m20041/m20041_atlas.asset
# Assets/arts/spines/characters/m20041/m20041_atlas.asset.meta
# Assets/arts/spines/characters/m20041/m20041_material.mat
# Assets/arts/spines/characters/m20041/m20041_material.mat.meta
# Assets/arts/spines/characters/m20041/m20041_skeletondata.asset
# Assets/arts/spines/characters/m20041/m20041_skeletondata.asset.meta
# Assets/arts/spines/characters/m20042.meta
# Assets/arts/spines/characters/m20042/m20042.atlas.txt.meta
# Assets/arts/spines/characters/m20042/m20042.png.meta
# Assets/arts/spines/characters/m20042/m20042.skel.bytes
# Assets/arts/spines/characters/m20042/m20042.skel.bytes.meta
# Assets/arts/spines/characters/m20042/m20042_atlas.asset
# Assets/arts/spines/characters/m20042/m20042_atlas.asset.meta
# Assets/arts/spines/characters/m20042/m20042_material.mat
# Assets/arts/spines/characters/m20042/m20042_material.mat.meta
# Assets/arts/spines/characters/m20042/m20042_skeletondata.asset
# Assets/arts/spines/characters/m20042/m20042_skeletondata.asset.meta
# Assets/arts/spines/characters/m20043.meta
# Assets/arts/spines/characters/m20043/m20043.atlas.txt.meta
# Assets/arts/spines/characters/m20043/m20043.png.meta
# Assets/arts/spines/characters/m20043/m20043.skel.bytes.meta
# Assets/arts/spines/characters/m20043/m20043_atlas.asset
# Assets/arts/spines/characters/m20043/m20043_atlas.asset.meta
# Assets/arts/spines/characters/m20043/m20043_material.mat
# Assets/arts/spines/characters/m20043/m20043_material.mat.meta
# Assets/arts/spines/characters/m20043/m20043_skeletondata.asset
# Assets/arts/spines/characters/m20043/m20043_skeletondata.asset.meta
# Assets/prefabs/spine/ui/characters/m20039.prefab
# Assets/prefabs/spine/ui/characters/m20039.prefab.meta
# Assets/prefabs/spine/ui/characters/m20040.prefab
# Assets/prefabs/spine/ui/characters/m20040.prefab.meta
# Assets/prefabs/spine/ui/characters/m20041.prefab
# Assets/prefabs/spine/ui/characters/m20041.prefab.meta
# Assets/prefabs/spine/ui/characters/m20042.prefab
# Assets/prefabs/spine/ui/characters/m20042.prefab.meta
# Assets/prefabs/spine/ui/characters/m20043.prefab
# Assets/prefabs/spine/ui/characters/m20043.prefab.meta
|
2023-07-19 20:18:20 +08:00 |
|
xiekaidong
|
ed0e82f254
|
上传资源
|
2023-07-19 20:17:00 +08:00 |
|
|
|
da12cfaa9e
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
|
2023-07-19 18:28:48 +08:00 |
|
|
|
a670b8ccc0
|
20042hit帧
|
2023-07-19 18:28:40 +08:00 |
|
chenxi
|
0b3f5e1fe4
|
Merge branch 'dev_20230725' of git.juzugame.com:b6-client/b6-unity into dev_20230725
|
2023-07-19 17:35:42 +08:00 |
|
chenxi
|
877fe3f3aa
|
ironsrouce sdk
|
2023-07-19 17:35:33 +08:00 |
|
