jiaoyangna
|
7713a65826
|
排行榜宝器修改
|
2021-08-31 11:08:12 +08:00 |
jiaoyangna
|
ba96d80208
|
四元阵特效修改提交
(cherry picked from commit 03b00d7762 )
|
2021-08-31 10:54:39 +08:00 |
jiaoyangna
|
209bd7ed0c
|
四元阵特效修改提交
(cherry picked from commit f355940615 )
|
2021-08-31 10:54:32 +08:00 |
jiaoyangna
|
03b00d7762
|
四元阵特效修改提交
|
2021-08-31 10:52:58 +08:00 |
jiaoyangna
|
f355940615
|
四元阵特效修改提交
|
2021-08-31 10:52:02 +08:00 |
jiaoyangna
|
0027722366
|
四灵修改提交
|
2021-08-30 20:07:20 +08:00 |
ZhangBiao
|
e68d6a2b23
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-30 18:45:31 +08:00 |
ZhangBiao
|
4e9ce855f2
|
【玩家神将信息界面】魂印本身战力不增加修改
|
2021-08-30 18:45:21 +08:00 |
gaoxin
|
9744f908a5
|
【数数】修复Android平台下IOS组件找不到的问题
|
2021-08-30 18:16:29 +08:00 |
gaoxin
|
a3f6147779
|
【Logo】删除SDKConfig
|
2021-08-30 18:16:23 +08:00 |
gaoxin
|
f0115a8e07
|
【数数】修复Android平台下IOS组件找不到的问题
|
2021-08-30 18:15:54 +08:00 |
ZhangBiao
|
6dca507aaf
|
【推荐工会】
|
2021-08-30 18:14:13 +08:00 |
ZhangBiao
|
911c1849b2
|
【工会推荐】搜索修改
|
2021-08-30 18:14:07 +08:00 |
ZhangBiao
|
ec638f7c7a
|
【公会推荐】重复打开工会界面名称会重复修改
|
2021-08-30 18:14:03 +08:00 |
jiaoyangna
|
4801852d88
|
神应修改提交
|
2021-08-30 18:09:06 +08:00 |
jiaoyangna
|
1ea100ed83
|
神将情报界面装备宝物修改提交
|
2021-08-30 16:44:26 +08:00 |
ZhangBiao
|
1f2a21a587
|
【推荐工会】
|
2021-08-30 16:24:30 +08:00 |
ZhangBiao
|
78f4dccc1e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-30 15:37:22 +08:00 |
ZhangBiao
|
f484e60f87
|
【工会推荐】搜索修改
|
2021-08-30 15:37:10 +08:00 |
gaoxin
|
2da3f4b8e5
|
【Logo】删除SDKConfig
|
2021-08-30 15:35:14 +08:00 |
ZhangBiao
|
ca59c47cce
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-30 15:29:35 +08:00 |
ZhangBiao
|
671f3cfb28
|
【公会推荐】重复打开工会界面名称会重复修改
|
2021-08-30 15:29:22 +08:00 |
gaoxin
|
790af4ec62
|
【修复数数SDK升级导致本地报错】
|
2021-08-30 14:59:58 +08:00 |
jiaoyangna
|
7756dd8292
|
数据资源提交
|
2021-08-30 14:22:15 +08:00 |
jiaoyangna
|
a76f27ecf0
|
四灵提交
|
2021-08-30 14:21:41 +08:00 |
wangzhenxing
|
172f800d2e
|
【战斗】=============杨戬新技能特效提交
|
2021-08-30 14:14:48 +08:00 |
gaoxin
|
3a8fac4f87
|
【修复数数SDK升级导致本地报错】
|
2021-08-30 12:29:13 +08:00 |
gaoxin
|
61bfa0d326
|
【尝试升级数数】
|
2021-08-28 20:32:19 +08:00 |
gaoxin
|
985a0b2b92
|
【尝试升级数数】
|
2021-08-28 20:21:42 +08:00 |
zhangshanxue
|
09fba90ce1
|
Merge commit 'dd9392871e43553845788df3666c8e264ada663d' into china/test
|
2021-08-28 19:10:42 +08:00 |
skuld
|
1cb0353b43
|
添加log
|
2021-08-28 17:21:36 +08:00 |
jiaoyangna
|
f11e33efc1
|
添加log
|
2021-08-28 17:12:10 +08:00 |
jiaoyangna
|
dd9392871e
|
十绝阵公会名字显示错误
|
2021-08-28 17:03:22 +08:00 |
zhangshanxue
|
2e786a967e
|
Merge branch 'china/dev' into china/test
|
2021-08-28 15:42:36 +08:00 |
gaoxin
|
37056e803a
|
【渲染平台】Android:Vulkan>OpGL3>OpGL2 IOS:Metal > OpGL2
|
2021-08-28 15:41:31 +08:00 |
gaoxin
|
c19cfb3d49
|
【提审】关闭太初密卷显示
|
2021-08-28 15:26:35 +08:00 |
zhangshanxue
|
fe15c46f87
|
Merge remote-tracking branch 'origin/china/dev' into china/test
|
2021-08-28 15:21:19 +08:00 |
gaoxin
|
ee4a465c41
|
【角色升星】修复角色达到最大星级依然可以跳转觉醒、进阶页签的问题
|
2021-08-28 15:20:44 +08:00 |
gaoxin
|
eed381315d
|
【提审】添加石矶提审服资源
|
2021-08-28 15:04:13 +08:00 |
gaoxin
|
908ca14632
|
【shader】添加对所有平台的支持
|
2021-08-28 13:40:15 +08:00 |
jiaoyangna
|
2fbe372c76
|
四灵修改提交
|
2021-08-27 18:39:45 +08:00 |
zhangshanxue
|
51d59cd8ef
|
Merge branch 'china/dev' into china/test
|
2021-08-27 18:24:42 +08:00 |
wangzhenxing
|
6ef1d6c643
|
【战斗】===========被动115 DOT类Buff 清除逻辑修改
|
2021-08-27 18:02:50 +08:00 |
zhangshanxue
|
0946e743ba
|
【覆盖安装包时清除缓存】
|
2021-08-27 16:46:26 +08:00 |
zhangshanxue
|
00a25c6bc1
|
【覆盖安装包时清除缓存】
|
2021-08-27 16:44:29 +08:00 |
zhangshanxue
|
ab15ece104
|
Merge branch 'china/dev' into china/test
# Conflicts:
# Assets/ManagedResources/Atlas/LoginAtlas/agetip.png.meta
# Assets/ManagedResources/Spine/c_0038_02.meta
# Assets/ManagedResources/Spine/c_0038_02/c_0038_02.atlas.txt.meta
# Assets/ManagedResources/Spine/c_0038_02/c_0038_02.png.meta
# Assets/ManagedResources/Spine/c_0038_02/c_0038_02.skel.bytes.meta
# Assets/ManagedResources/Spine/c_0038_02/c_0038_02_Material.mat
# Assets/ManagedResources/Spine/c_0043_02.meta
# Assets/ManagedResources/Spine/c_0043_02/c_0043_02.atlas.txt.meta
# Assets/ManagedResources/Spine/c_0043_02/c_0043_02.skel.bytes.meta
# Assets/ManagedResources/Spine/c_0043_02/c_0043_02_Material.mat
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-08-27 16:42:18 +08:00 |
ZhangBiao
|
7ca7e78761
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-27 15:59:38 +08:00 |
ZhangBiao
|
12c2fd7316
|
【推荐公会】增加分页请求
|
2021-08-27 15:59:22 +08:00 |
wangzhenxing
|
58f34e049b
|
【战斗】=============被动91,160 修改提交
|
2021-08-27 15:27:53 +08:00 |
gaoxin
|
a3f9967651
|
【提审服】精卫穿秋裤,慈航穿棉袄
|
2021-08-27 15:23:03 +08:00 |