yuanshuai
|
b25468cd26
|
四象心法bug 修改
|
2021-09-13 17:18:32 +08:00 |
jiaoyangna
|
d55dd4c59d
|
共鸣宝物报错强化修改提交
|
2021-09-13 16:17:38 +08:00 |
yuanshuai
|
bee3fa5099
|
图片资源修改提交
|
2021-09-13 14:37:04 +08:00 |
wangzhenxing
|
b3eb686222
|
bug修改提交
|
2021-09-13 14:11:48 +08:00 |
jiaoyangna
|
7cff74a295
|
无尽秘宝激活错误修改提交
|
2021-09-13 14:11:02 +08:00 |
ZhangBiao
|
94ed6ad618
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2021-09-13 13:56:43 +08:00 |
ZhangBiao
|
c68496654f
|
【七界试炼】遗物
|
2021-09-13 13:54:58 +08:00 |
ZhangBiao
|
8c9f31f028
|
【七界试炼】遗物
|
2021-09-13 11:42:14 +08:00 |
wangzhenxing
|
441e5ba1cc
|
aaaaa
|
2021-09-13 10:06:50 +08:00 |
gaoxin
|
6a3d4b99f7
|
Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
|
2021-09-11 20:26:49 +08:00 |
gaoxin
|
8e55ed2fff
|
【玉虚】角色信息界面大小动态变化
|
2021-09-11 20:26:43 +08:00 |
wangzhenxing
|
aaa4b987eb
|
玉虚论道修改
|
2021-09-11 19:47:23 +08:00 |
wangzhenxing
|
683b48fb0c
|
玉虚论道提交
|
2021-09-11 18:53:58 +08:00 |
yuanshuai
|
8d6c58352b
|
【四象心法】bug修改
|
2021-09-11 18:05:55 +08:00 |
yuanshuai
|
0d6e6908b9
|
【四象心法】bug修改
|
2021-09-11 17:59:27 +08:00 |
yuanshuai
|
0d32db8623
|
【四象心法】bug修改
|
2021-09-11 17:50:21 +08:00 |
jiaoyangna
|
f37eec36e3
|
推送礼包文字描述修改提交
|
2021-09-11 17:27:15 +08:00 |
jiaoyangna
|
3ec8e9ee31
|
去掉空格
|
2021-09-11 17:21:38 +08:00 |
jiaoyangna
|
0a955034c7
|
【ID1018447】
【送神祠】阵营筛选的选中框资源错误
|
2021-09-11 17:19:37 +08:00 |
jiaoyangna
|
4e74731a43
|
【ID1018450】
【无尽副本】一键上阵会上阵空血神将
|
2021-09-11 17:11:39 +08:00 |
jiaoyangna
|
c98f2c1f02
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua
|
2021-09-11 17:06:01 +08:00 |
jiaoyangna
|
d41a0adeb1
|
推送礼包文案修改提交
|
2021-09-11 17:04:32 +08:00 |
gaoxin
|
7df51e8929
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/MapRoleInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
|
2021-09-11 16:52:33 +08:00 |
wangzhenxing
|
79778b6eec
|
【战斗】===========被动261 修改
|
2021-09-11 16:04:06 +08:00 |
wangzhenxing
|
d9214666c2
|
玉虚论道回放优化
|
2021-09-11 16:00:39 +08:00 |
ZhangBiao
|
41282c144c
|
【七界试炼】七界币增加加号
|
2021-09-11 15:47:19 +08:00 |
gaoxin
|
badf72a6f8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-11 15:22:55 +08:00 |
jiaoyangna
|
f49634a6fb
|
【ID1018456】
【新推送礼包】礼包文案需要修改
|
2021-09-11 15:18:47 +08:00 |
gaoxin
|
1c6599c17a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-11 15:13:02 +08:00 |
wangzhenxing
|
4b5c55a1ab
|
qqq
|
2021-09-11 15:05:37 +08:00 |
jiaoyangna
|
14559c4d6a
|
【ID1018450】
【无尽副本】一键上阵会上阵空血神将
|
2021-09-11 14:38:12 +08:00 |
yuanshuai
|
38947760c1
|
【四象心法】bug修改
|
2021-09-11 13:37:26 +08:00 |
wangzhenxing
|
cbb088a491
|
他人队伍灵兽修改
|
2021-09-10 22:13:48 +08:00 |
wangzhenxing
|
489f6f7e37
|
编对拖动英雄保存队伍修改
|
2021-09-10 21:34:45 +08:00 |
gaoxin
|
ad182335d9
|
【推送礼包】名称修改
|
2021-09-10 19:52:14 +08:00 |
gaoxin
|
81421a2e49
|
【推送礼包】文字错误修改
|
2021-09-10 19:52:08 +08:00 |
ZhangBiao
|
4eb8e566fe
|
【七界试炼】战斗结束提交
|
2021-09-10 18:36:39 +08:00 |
gaoxin
|
10783ed104
|
【推送礼包】配置错误
|
2021-09-10 18:27:39 +08:00 |
wangzhenxing
|
16289857a5
|
aaaa
|
2021-09-10 18:21:04 +08:00 |
gaoxin
|
eaf36b56ca
|
Revert "【礼包拍脸】修复报错"
This reverts commit 7bfa26d144 .
|
2021-09-10 17:56:53 +08:00 |
gaoxin
|
5af9e9f0ed
|
【编队】修复报错
|
2021-09-10 17:30:26 +08:00 |
gaoxin
|
7bfa26d144
|
【礼包拍脸】修复报错
|
2021-09-10 16:44:17 +08:00 |
ZhangBiao
|
d6725f3320
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
|
2021-09-10 16:39:43 +08:00 |
gaoxin
|
7bce643c71
|
【尝试修复IOS不明原因报错】
|
2021-09-10 16:31:29 +08:00 |
gaoxin
|
8a275f0c8e
|
【跨服界面】玉虚显示优化提交
|
2021-09-10 16:28:29 +08:00 |
gaoxin
|
f7d1601c79
|
Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
|
2021-09-10 16:26:34 +08:00 |
gaoxin
|
16633b37a8
|
【编队优化】
|
2021-09-10 16:25:38 +08:00 |
wangzhenxing
|
e2f7284507
|
qqqq
|
2021-09-10 15:50:24 +08:00 |
yuanshuai
|
e91140175f
|
四象心法添加通用等级限制
|
2021-09-10 15:44:32 +08:00 |
ZhangBiao
|
42df2f4af5
|
【七界试炼】提交
|
2021-09-10 15:23:15 +08:00 |