陈希
|
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 |
|
|
|
b3686cb290
|
BOSS：39-43
|
2023-07-19 17:26:15 +08:00 |
|
xiekaidong
|
0f6ae346b8
|
武器副本的一些界面
|
2023-07-19 16:52:39 +08:00 |
|
chenxi
|
3dacdc24c3
|
广告sdk库
|
2023-07-19 16:13:55 +08:00 |
|
chenxi
|
7314b1c0cf
|
AF
|
2023-07-19 15:45:52 +08:00 |
|
chenxi
|
376f41996a
|
广告sdk版本
|
2023-07-19 14:35:00 +08:00 |
|
chenxi
|
417dfd5243
|
新增mintegraladapter渠道广告sdk
|
2023-07-19 14:26:09 +08:00 |
|
chenxi
|
78033e031f
|
AF
|
2023-07-19 11:29:22 +08:00 |
|
xiekaidong
|
24ca5afc0b
|
通用扫荡弹窗
|
2023-07-19 10:39:28 +08:00 |
|
chenxi
|
045ecb7df3
|
ironsource广告价值上报
|
2023-07-19 09:46:18 +08:00 |
|
chenxi
|
e6133fbefb
|
xlua
|
2023-07-19 09:39:49 +08:00 |
|
chenxi
|
4b0fc83484
|
ironsrouce广告回传
|
2023-07-18 22:29:07 +08:00 |
|
xiekaidong
|
e979f97f20
|
一些界面
|
2023-07-18 20:59:57 +08:00 |
|
xiekaidong
|
27eb22d51a
|
修改一下命名
v1.0.7_android
v1.1.7_ios
|
2023-07-18 17:04:38 +08:00 |
|
xiekaidong
|
ce485ee2d0
|
更新pb
|
2023-07-18 17:01:43 +08:00 |
|
xiekaidong
|
519e6bdbbb
|
上报
|
2023-07-18 16:36:54 +08:00 |
|
xiekaidong
|
0c47811ea5
|
上传一波资源
|
2023-07-18 16:35:35 +08:00 |
|
chenxi
|
2f604c9a86
|
热更版本
|
2023-07-18 15:10:24 +08:00 |
|
xiekaidong
|
15d0002471
|
firebase、af、fb日志上报
|
2023-07-18 15:07:08 +08:00 |
|
Fang
|
0d5df08e09
|
满级英雄收集点数显示fix
|
2023-07-18 14:30:49 +08:00 |
|
xiekaidong
|
0d18dac853
|
编译lua
|
2023-07-18 09:35:11 +08:00 |
|
xiekaidong
|
32704fc6cc
|
Merge branch 'master' into dev_20230725
# Conflicts:
# Assets/lua/app/ui/hero/hero_comp.lua.bytes
|
2023-07-18 09:34:10 +08:00 |
|
chenxi
|
133f12e806
|
提升版本号
v1.0.6_android
v1.1.6_ios
|
2023-07-17 18:45:44 +08:00 |
|
xiekaidong
|
8978455495
|
战斗引导问题
|
2023-07-17 18:38:25 +08:00 |
|
xiekaidong
|
5e96f7ec2d
|
更新pb
|
2023-07-17 18:05:38 +08:00 |
|
chenxi
|
2d3a8b9085
|
提升版本号
|
2023-07-17 17:53:42 +08:00 |
|
xiekaidong
|
e343016c9f
|
更新日语多语言
|
2023-07-17 17:40:30 +08:00 |
|
xiekaidong
|
86cf2f3a20
|
功能开启异常飘字修复，引导异常修复
|
2023-07-17 17:33:21 +08:00 |
|
xiekaidong
|
e9a793401c
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
|
2023-07-17 17:21:24 +08:00 |
|
xiekaidong
|
b620281b43
|
更新配置和优化
|
2023-07-17 17:21:20 +08:00 |
|
Fang
|
798f924f25
|
更新协议
|
2023-07-17 17:08:11 +08:00 |
|
