jiaoyangna
|
13e0865cc2
|
四灵助战报错修改
|
2021-09-18 17:07:01 +08:00 |
ZhangBiao
|
634f78d3c5
|
【七界试炼】提交
|
2021-09-18 16:52:06 +08:00 |
gaoxin
|
e3f4808936
|
【易经宝库】选择奖励界面显示错误
|
2021-09-18 16:32:52 +08:00 |
ZhangBiao
|
20ed8d5928
|
【七界试炼】密保名称
|
2021-09-18 16:14:46 +08:00 |
gaoxin
|
a3ff527bc9
|
【易经宝库】选择奖励界面,选中奖励后的显示效果优化
|
2021-09-18 16:14:03 +08:00 |
gaoxin
|
50f2a73898
|
【寻宝迷踪】修复界面刷新不及时的问题
|
2021-09-18 15:53:13 +08:00 |
yuanshuai
|
055f77d1c0
|
.meta
|
2021-09-18 15:45:03 +08:00 |
yuanshuai
|
a48bf3027d
|
.meta
|
2021-09-18 15:44:29 +08:00 |
yuanshuai
|
0d31e6b0f8
|
,meta
|
2021-09-18 15:44:09 +08:00 |
yuanshuai
|
6b2eaf6cca
|
【四象心法】bug修改
|
2021-09-18 15:43:32 +08:00 |
gaoxin
|
7e954b997a
|
【易经宝库】修复查看剩余奖励报错
|
2021-09-18 15:15:22 +08:00 |
ZhangBiao
|
35e0c96748
|
【七界试炼】提交
|
2021-09-18 15:04:32 +08:00 |
gaoxin
|
39b7267239
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-18 14:19:31 +08:00 |
gaoxin
|
a80d16fbda
|
【易经宝库】修改选择奖励界面的排序规则
|
2021-09-18 14:19:26 +08:00 |
jiaoyangna
|
2bfe122214
|
易经宝库选择报错修改提交
(cherry picked from commit 8ae7a3174f )
(cherry picked from commit 20ccbed3c9 )
|
2021-09-18 13:43:36 +08:00 |
gaoxin
|
a3bc278624
|
【配置】获取配置前,拉取更新
|
2021-09-18 12:02:16 +08:00 |
wangzhenxing
|
a7f0c42cae
|
Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Data/UIData.lua
Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua
Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua
Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
Assets/ManagedResources/~Lua/View/UpView.lua
|
2021-09-18 11:52:01 +08:00 |
ZhangBiao
|
a15bd40b96
|
【寻宝迷踪】跳转惊喜礼盒
|
2021-09-18 11:33:46 +08:00 |
wangzhenxing
|
fb7a074e2a
|
yuxushangdian commit
|
2021-09-18 11:26:54 +08:00 |
ZhangBiao
|
b1265379f9
|
【七界试炼】排行榜和开启时间显示
|
2021-09-18 11:24:11 +08:00 |
ZhangBiao
|
49cb8272bc
|
Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-18 11:04:17 +08:00 |
ZhangBiao
|
74cdc4374f
|
【惊喜礼盒】礼包顺序调整
|
2021-09-18 11:03:54 +08:00 |
jiaoyangna
|
ac319513dc
|
【ID1018514】
【四灵试炼】线上号,打开战斗编队报错
|
2021-09-18 11:02:32 +08:00 |
gaoxin
|
0e86945c53
|
Revert "【优化】优化装备界面卡顿,一键卸下/装备卡顿的问题"
This reverts commit cb4c81b420 .
|
2021-09-18 10:56:55 +08:00 |
gaoxin
|
9da6a42947
|
【惊喜礼盒】修复活动结束,继续购买卡死
|
2021-09-18 10:56:35 +08:00 |
gaoxin
|
aa6bb5d606
|
【易经宝库】修复数据表BasicPoolId列无法读取,将数据格式改为字符串
|
2021-09-18 10:45:31 +08:00 |
ZhangBiao
|
45e24095f6
|
Revert "【寻宝迷踪】log增加"
This reverts commit e548fa6591 .
|
2021-09-18 10:40:54 +08:00 |
wangzhenxing
|
e71f3b5d39
|
玉虚商店修改
|
2021-09-18 10:38:57 +08:00 |
ZhangBiao
|
e548fa6591
|
【寻宝迷踪】log增加
|
2021-09-18 10:38:18 +08:00 |
ZhangBiao
|
1910d54272
|
【七界试炼】提交
|
2021-09-18 10:29:30 +08:00 |
gaoxin
|
7f988480b1
|
【打包配置】修复数据未清理的问题
|
2021-09-18 09:50:37 +08:00 |
gaoxin
|
abe720d43d
|
【限时召唤】修复奖励界面报错
|
2021-09-17 20:04:53 +08:00 |
ZhangBiao
|
8307fbe7e1
|
【七界试炼】完成!!!
|
2021-09-17 19:57:45 +08:00 |
ZhangBiao
|
949d159010
|
【七界试炼】提交
|
2021-09-17 19:29:58 +08:00 |
gaoxin
|
071e7db748
|
【配置】打包和同步校验服修改到配置文件工程中
|
2021-09-17 19:22:45 +08:00 |
ZhangBiao
|
488ad1caad
|
【七界试炼】七界秘宝提交
|
2021-09-17 17:42:18 +08:00 |
wangzhenxing
|
d5ce7b7f84
|
【战斗】=======被动37修改
|
2021-09-17 17:07:57 +08:00 |
gaoxin
|
cb4c81b420
|
【优化】优化装备界面卡顿,一键卸下/装备卡顿的问题
|
2021-09-17 17:01:14 +08:00 |
gaoxin
|
472409a1b3
|
【优化】优化装备界面卡顿,一键卸下/装备卡顿的问题
|
2021-09-17 17:00:59 +08:00 |
wangzhenxing
|
01e446fed3
|
[战斗]======免疫buff添加类型 5 免疫控制不免疫禁疗
|
2021-09-17 16:55:49 +08:00 |
ZhangBiao
|
163950a4a1
|
【七界试炼】提交
|
2021-09-17 16:29:21 +08:00 |
gaoxin
|
06db8bd21a
|
【专服配置】修改专服打包配置
|
2021-09-17 16:12:45 +08:00 |
gaoxin
|
c17ea51996
|
【先遣配置】修改打包和战斗校验服分支配置
|
2021-09-17 16:10:01 +08:00 |
gaoxin
|
7b11453894
|
【先遣配置】修改打包和战斗校验服分支配置
|
2021-09-17 16:09:39 +08:00 |
gaoxin
|
feae377b4f
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
|
2021-09-17 15:25:56 +08:00 |
gaoxin
|
e3f11c86ed
|
【战斗力】界面展示优化
|
2021-09-17 15:24:10 +08:00 |
wangzhenxing
|
df1409717d
|
【战斗】==============技能是否可以释放处 添加目标数量判断,如果没有目标则不能释放
|
2021-09-17 15:20:44 +08:00 |
yuanshuai
|
b0c69c81a8
|
【四象心法】技能加成bug修改
|
2021-09-17 15:18:50 +08:00 |
gaoxin
|
247d9a85d0
|
【战斗力】删除无用的属性计算
|
2021-09-17 15:10:06 +08:00 |
gaoxin
|
5f11f26c4d
|
【红点】报错优化
|
2021-09-17 15:09:10 +08:00 |