gaoxin
|
c795995bf6
|
【心魔试炼】奖励按钮显示错误
|
2022-01-10 14:33:20 +08:00 |
gaoxin
|
0a4c24520c
|
【编队筛选】红叉资源替换
|
2022-01-08 15:03:06 +08:00 |
gaoxin
|
a4bd6fb441
|
【日常】修复动画导致成就显示异常
|
2022-01-08 14:23:44 +08:00 |
ZhangBiao
|
c157985e24
|
【建木神树】调整
|
2022-01-08 11:36:31 +08:00 |
ZhangBiao
|
e4a5f213e8
|
【建木神树】显示调整
|
2022-01-08 11:17:26 +08:00 |
ZhangBiao
|
94cf5e4aec
|
【建木神树】提交
|
2022-01-08 10:33:31 +08:00 |
ZhangBiao
|
334ba9bd19
|
【建木神树优化】界面中可预览当前神应属性和下级增加属性
|
2022-01-07 19:34:07 +08:00 |
gaoxin
|
963591b530
|
【动画】修复动画导致部分列表显示错误
|
2022-01-07 18:21:10 +08:00 |
gaoxin
|
34e90db4fd
|
【编队删选】添加职业筛选效果,高亮效果颜色修改
|
2022-01-07 16:40:31 +08:00 |
jiaoyangna
|
eea23a9dda
|
不显示收益修改提交
|
2022-01-07 13:58:20 +08:00 |
ZhangBiao
|
e16c47a8de
|
【家园】提交
|
2022-01-07 11:28:58 +08:00 |
ZhangBiao
|
6d5a716b10
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-06 18:42:30 +08:00 |
ZhangBiao
|
54b01f4d86
|
【家园+易经宝库】提交
|
2022-01-06 18:42:20 +08:00 |
jiaoyangna
|
59bdf19b9e
|
主城预设提交
|
2022-01-06 18:34:48 +08:00 |
ZhangBiao
|
6b1c28a920
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2022-01-06 16:40:24 +08:00 |
jiaoyangna
|
e484b2bac8
|
星力聚灵资源提交
|
2022-01-06 16:15:49 +08:00 |
jiaoyangna
|
757c436878
|
编队预设提交
|
2022-01-06 16:12:10 +08:00 |
jiaoyangna
|
b1be355601
|
Merge branch 'tansuo' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/ExploreAtlas.meta
# Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2022-01-06 16:07:59 +08:00 |
ZhangBiao
|
9c874f1789
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/Icon/Item/icon_laohu.png.meta
# Assets/ManagedResources/Icon/Item/r_Resource_laohu.png.meta
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
|
2022-01-06 15:38:48 +08:00 |
ZhangBiao
|
4133605f55
|
【家园】引导提交
|
2022-01-06 15:28:41 +08:00 |
jiaoyangna
|
f3349ca4d1
|
【ID1010966】
【优化】法宝聚灵调整
|
2022-01-06 15:18:30 +08:00 |
jiaoyangna
|
79364232f0
|
【ID1010966】
【优化】法宝聚灵调整
|
2022-01-06 14:52:02 +08:00 |
ZhangBiao
|
7058575f3a
|
【家园】提交
|
2022-01-06 14:23:41 +08:00 |
ZhangBiao
|
68ad9cf7e1
|
【家园】提交
|
2022-01-06 11:45:28 +08:00 |
ZhangBiao
|
893e33d920
|
【家园】提交
|
2022-01-06 10:33:08 +08:00 |
jiaoyangna
|
27a96fa139
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-05 18:18:06 +08:00 |
jiaoyangna
|
2a8b4bca8c
|
【ID1010994】
增加单笔充值活动
|
2022-01-05 18:17:36 +08:00 |
ZhangBiao
|
aa761fc4e9
|
【家园】提交
|
2022-01-05 18:04:57 +08:00 |
gaoxin
|
662ad26223
|
【优化】心魔/四灵试炼增加编队按钮
|
2022-01-05 17:25:39 +08:00 |
ZhangBiao
|
b45f74781c
|
【家园】提交
|
2022-01-05 17:06:34 +08:00 |
ZhangBiao
|
6f4942e87e
|
【家园】提交
|
2022-01-05 16:21:20 +08:00 |
jiaoyangna
|
6ca1e17d52
|
【ID1010994】
增加单笔充值活动
|
2022-01-05 15:38:02 +08:00 |
ZhangBiao
|
f0de43aad2
|
【家园】提交
|
2022-01-05 14:17:53 +08:00 |
ZhangBiao
|
c0d27feac2
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2022-01-05 10:16:25 +08:00 |
ZhangBiao
|
5e0c53e322
|
【家园】替换底图
|
2022-01-04 18:58:34 +08:00 |
jiaoyangna
|
7bfa7057ac
|
位置修改提交
|
2022-01-04 16:51:44 +08:00 |
jiaoyangna
|
7eade17002
|
提示位置修改提交
|
2022-01-04 16:47:24 +08:00 |
jiaoyangna
|
99014979b1
|
添加提示
|
2022-01-04 16:43:35 +08:00 |
jiaoyangna
|
fb8de57afa
|
累计收益提交
|
2022-01-04 16:30:50 +08:00 |
jiaoyangna
|
e079eff322
|
适配修改提交
|
2022-01-04 15:42:06 +08:00 |
ZhangBiao
|
a07fdc40ac
|
【家园】提交
|
2022-01-04 15:10:35 +08:00 |
jiaoyangna
|
ebc67f1602
|
战力修改提交
|
2022-01-04 14:21:54 +08:00 |
gaoxin
|
ad8653d679
|
Merge branch '0优化/山河社稷图筛选显示' into china/dev
|
2022-01-04 13:22:22 +08:00 |
ZhangBiao
|
fbe50eb413
|
【家园】提交
|
2022-01-04 10:51:59 +08:00 |
gaoxin
|
108252b8e4
|
【排行】修复显示异常
|
2022-01-04 10:20:37 +08:00 |
gaoxin
|
9b2057bede
|
【山河筛选】添加职业呼吸效果
|
2022-01-03 02:17:03 +08:00 |
ZhangBiao
|
39244f8ce5
|
【家园】特权完成,2021最后的提交!!
|
2021-12-31 18:58:04 +08:00 |
ZhangBiao
|
2b3afae7ea
|
【家园】特权
|
2021-12-31 18:13:10 +08:00 |
gaoxin
|
d1b84299c2
|
【修行优化】点击圆点弹出TIPS后,切换点击其他圆点应切换TIPS内容,而非关闭之前的TIPS
|
2022-01-03 02:43:00 +08:00 |
ZhangBiao
|
27ead6dcff
|
【家园】提交
|
2021-12-31 16:30:53 +08:00 |