ZhangBiao
|
c37386fada
|
【优化】轩辕宝境界面优化
|
2021-11-11 14:59:15 +08:00 |
jiaoyangna
|
e457260b42
|
神将排序界面修改提交
|
2021-11-08 15:04:53 +08:00 |
jiaoyangna
|
2985079325
|
编队星星修改提交
|
2021-11-05 13:37:29 +08:00 |
ZhangBiao
|
7f258a4aa2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 10:24:44 +08:00 |
ZhangBiao
|
005ac1e5df
|
【光效穿透】编队界面上阵觉醒神将,长按神将打开神将情报,觉醒光效穿透
|
2021-11-05 10:24:32 +08:00 |
jiaoyangna
|
0d68d9229b
|
神魂提交
|
2021-11-05 10:18:10 +08:00 |
jiaoyangna
|
596c8477d3
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-11-04 09:29:56 +08:00 |
jiaoyangna
|
4941110a7b
|
神魂提交
|
2021-11-03 18:38:13 +08:00 |
jiaoyangna
|
6f0d51ddb2
|
神魂提交
|
2021-11-03 18:11:08 +08:00 |
jiaoyangna
|
125e37fe6d
|
神魂提交
|
2021-11-03 10:13:44 +08:00 |
ZhangBiao
|
f12a83ec53
|
【山河社稷图优化】关卡编队界面显示三星条件(主关卡)和特殊要求(副关卡)
|
2021-11-02 16:24:01 +08:00 |
jiaoyangna
|
766710dc6b
|
Merge branch 'china/dev' into 0功能/神魂
|
2021-10-29 13:25:35 +08:00 |
jiaoyangna
|
4d4d2bfd99
|
删除log
|
2021-10-28 18:56:59 +08:00 |
jiaoyangna
|
6f8fa46ccd
|
添加log
|
2021-10-28 18:43:11 +08:00 |
jiaoyangna
|
d05fe62424
|
添加log
|
2021-10-28 18:39:10 +08:00 |
jiaoyangna
|
30b3adbee6
|
【ID1018746】
【连点】车迟斗法,十绝阵一类的玩法,快速点击进入战斗,会直接扣两个次数
|
2021-10-28 18:32:21 +08:00 |
jiaoyangna
|
58044a3e91
|
神魂界面星星修改提交
|
2021-10-28 11:07:50 +08:00 |
jiaoyangna
|
d4d9b88fe7
|
神魂修改提交
|
2021-10-27 15:24:46 +08:00 |
jiaoyangna
|
d398c21668
|
神魂提交
|
2021-10-27 12:50:15 +08:00 |
jiaoyangna
|
5e8ad7dd08
|
神魂提交
|
2021-10-26 16:00:31 +08:00 |
ZhangBiao
|
47791f3711
|
【连点】车迟斗法,十绝阵一类的玩法,快速点击进入战斗,会直接扣两个次数(尝试修复)
|
2021-10-19 09:38:05 +08:00 |
wangzhenxing
|
5b41289cd0
|
玉虚论道阵容界面修改
|
2021-10-13 15:26:12 +08:00 |
gaoxin
|
971a457224
|
【战斗力】修复计算在编队上的人物临时数据时未计算编队相关属性的问题
|
2021-09-29 17:34:20 +08:00 |
gaoxin
|
0f534367c5
|
【战斗力】不再计算编队老战斗力
|
2021-09-23 16:16:57 +08:00 |
gaoxin
|
ac88b50cae
|
【编队】修复打开四灵试炼编队报错
|
2021-09-23 16:05:18 +08:00 |
gaoxin
|
34f3f42a04
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua
|
2021-09-22 15:36:10 +08:00 |
ZhangBiao
|
1c191a78b9
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua
|
2021-09-22 11:46:24 +08:00 |
gaoxin
|
bc659b68f8
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
# Assets/Editor/AutoPack.cs
# Assets/Scripts/Editor/ExcelTool/DataConfig/DataConfigWindow.cs
|
2021-09-22 10:54:15 +08:00 |
gaoxin
|
e5af89fac9
|
Merge branch 'china/dev' into 0功能/玉虚论道
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
|
2021-09-22 10:37:42 +08:00 |
jiaoyangna
|
488753ab83
|
四灵编队修改提交
(cherry picked from commit 191603b77f )
|
2021-09-18 19:19:30 +08:00 |
jiaoyangna
|
4e5ef30243
|
在线四灵编队修改提交
|
2021-09-18 18:55:07 +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 |
gaoxin
|
66efc9d4e3
|
【战斗力】新战斗力计算系统完成
|
2021-09-16 13:35:33 +08:00 |
ZhangBiao
|
ad9bcaa2fa
|
【七界试炼】提交
|
2021-09-15 14:02:39 +08:00 |
ZhangBiao
|
599fe0dcee
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
|
2021-09-14 17:54:18 +08:00 |
wangzhenxing
|
d056a2dd70
|
玉虚论道提交
|
2021-09-14 10:10:57 +08:00 |
ZhangBiao
|
20dc2526d6
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
|
2021-09-13 18:09:27 +08:00 |
wangzhenxing
|
b3eb686222
|
bug修改提交
|
2021-09-13 14:11:48 +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 |
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
|
489f6f7e37
|
编对拖动英雄保存队伍修改
|
2021-09-10 21:34:45 +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
|
16633b37a8
|
【编队优化】
|
2021-09-10 16:25:38 +08:00 |
ZhangBiao
|
42df2f4af5
|
【七界试炼】提交
|
2021-09-10 15:23:15 +08:00 |
ZhangBiao
|
2d003aaafd
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-09-10 10:33:44 +08:00 |
ZhangBiao
|
cef2b42bcc
|
【七界试炼】提交
|
2021-09-10 10:30:50 +08:00 |
wangzhenxing
|
a58b5f2d88
|
玉虚论道提交
|
2021-09-09 11:48:09 +08:00 |
wangzhenxing
|
c531b3776b
|
玉虚论道提交
|
2021-09-07 18:27:23 +08:00 |
wangzhenxing
|
5f0bfe53bd
|
玉虚论道提交
|
2021-09-07 17:05:46 +08:00 |
jiaoyangna
|
f516731201
|
一键上阵修改提交
|
2021-09-01 17:12:25 +08:00 |