gaoxin
|
3835273079
|
【关卡】条件新增
|
2021-12-10 17:37:07 +08:00 |
wangzhenxing
|
6b742c0788
|
[立绘朝向]======皮肤立绘朝向修改
|
2021-11-30 20:43:56 +08:00 |
wangzhenxing
|
0ce834e220
|
【立绘朝向】=====备战界面修改,战斗记录界面灵兽显示主角修改
|
2021-11-27 16:25:21 +08:00 |
wangzhenxing
|
3c22a1ef6c
|
[立绘朝向]======静态立绘朝向改回原样
|
2021-11-27 13:17:36 +08:00 |
wangzhenxing
|
69e30d908c
|
[立绘朝向]===============我方立绘展示朝向修改
|
2021-11-26 16:55:13 +08:00 |
ZhangBiao
|
cb80384f02
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 12:11:41 +08:00 |
ZhangBiao
|
421f82b882
|
【灵脉秘境】战斗报错修改
|
2021-11-22 12:11:28 +08:00 |
wangzhenxing
|
f10d6ee2a1
|
[玉虚论道]======保存队伍时添加相同英雄检测
|
2021-11-22 10:18:39 +08:00 |
ZhangBiao
|
9f356783e1
|
【灵脉秘境】提交
|
2021-11-19 17:01:10 +08:00 |
ZhangBiao
|
5e09e0b9a3
|
【灵脉秘境】切磋
|
2021-11-19 16:16:45 +08:00 |
ZhangBiao
|
7f0720554f
|
【灵脉秘境】提交
|
2021-11-18 14:31:57 +08:00 |
ZhangBiao
|
79d2113bc2
|
【灵脉秘境】提交
|
2021-11-18 14:10:57 +08:00 |
ZhangBiao
|
e174e24bc1
|
【灵脉秘境】提交
|
2021-11-18 10:26:14 +08:00 |
ZhangBiao
|
790fe1c88f
|
【灵脉秘境】提交
|
2021-11-17 18:28:59 +08:00 |
ZhangBiao
|
2b2a77a129
|
【灵脉秘境】提交
|
2021-11-17 16:14:47 +08:00 |
ZhangBiao
|
d8dd88b2e2
|
【灵脉秘境】提交
|
2021-11-16 18:30:08 +08:00 |
ZhangBiao
|
6012b533ca
|
【灵脉秘境】提交
|
2021-11-16 17:34:37 +08:00 |
ZhangBiao
|
c37386fada
|
【优化】轩辕宝境界面优化
|
2021-11-11 14:59:15 +08:00 |
gaoxin
|
0595ecbb46
|
【七界试炼】添加战斗结果校验
|
2021-11-08 17:04:22 +08:00 |
jiaoyangna
|
e457260b42
|
神将排序界面修改提交
|
2021-11-08 15:04:53 +08:00 |
jiaoyangna
|
2985079325
|
编队星星修改提交
|
2021-11-05 13:37:29 +08:00 |
jiaoyangna
|
d0d93e02ea
|
代码星星层级设置修改
|
2021-11-05 13:18:55 +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
|
5ac1f04718
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 10:18:28 +08:00 |
jiaoyangna
|
0d68d9229b
|
神魂提交
|
2021-11-05 10:18:10 +08:00 |
gaoxin
|
c232f35436
|
【轩辕宝镜 】修复还是可能会上阵重复神将的问题
|
2021-11-05 10:01:46 +08:00 |
gaoxin
|
e39bbe2dc1
|
【轩辕宝镜】修复如果玩家有两个相同的战力较高的神将,会导致少上阵一个位置的问题
|
2021-11-04 18:53:11 +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
|
68f92b5bd0
|
【山河社稷图】提交
|
2021-11-02 18:56:45 +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
|
edcdd0e81e
|
Merge branch 'china/dev' into 0功能/神魂
|
2021-10-26 16:01:24 +08:00 |
jiaoyangna
|
5e8ad7dd08
|
神魂提交
|
2021-10-26 16:00:31 +08:00 |
ZhangBiao
|
cce7591927
|
【山河社稷图】小关卡单独上阵报错修改
|
2021-10-26 10:13:28 +08:00 |
gaoxin
|
04a1196586
|
【战斗力】一旦战斗力改变就让后端重新计算战斗力
|
2021-10-25 16:13:48 +08:00 |
ZhangBiao
|
1f5f4f15c3
|
【弹窗优化】提交
|
2021-10-22 14:22:12 +08:00 |
gaoxin
|
da665cc148
|
【编队】取消公会战相关编队判断,获取编队信息时不再检测公会战防守编队信息
|
2021-10-21 10:22:00 +08:00 |
ZhangBiao
|
47791f3711
|
【连点】车迟斗法,十绝阵一类的玩法,快速点击进入战斗,会直接扣两个次数(尝试修复)
|
2021-10-19 09:38:05 +08:00 |
wangzhenxing
|
5b41289cd0
|
玉虚论道阵容界面修改
|
2021-10-13 15:26:12 +08:00 |
wangzhenxing
|
2237084155
|
Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-10-12 20:08:46 +08:00 |
wangzhenxing
|
c4d7edc289
|
玉虚bug修改
|
2021-10-12 15:33:39 +08:00 |
wangzhenxing
|
2f31f6c588
|
上阵界面排序修改
|
2021-10-12 10:03:20 +08:00 |
wangzhenxing
|
d8a0a0e8c1
|
玉虚提交
|
2021-10-11 16:30:33 +08:00 |
jiaoyangna
|
5f15c8549e
|
【ID1010432】
【四灵试炼】编队界面的神将排序改为与心魔试炼相同
|
2021-10-11 11:33:55 +08:00 |
jiaoyangna
|
f4997e7a57
|
【ID1018706】
【巅峰赛】准备阶段一键上阵可以换人
|
2021-10-09 15:22:42 +08:00 |
wangzhenxing
|
36d542ba9d
|
玉虚论道优化提交
|
2021-09-30 15:12:02 +08:00 |
gaoxin
|
971a457224
|
【战斗力】修复计算在编队上的人物临时数据时未计算编队相关属性的问题
|
2021-09-29 17:34:20 +08:00 |
gaoxin
|
07a96a88e4
|
【轩辕宝镜】修复只上阵了满足条件的神将,没有补位的问题
|
2021-09-27 17:13:48 +08:00 |
gaoxin
|
c8c003abb7
|
【无尽副本】修复编队无法保存的问题
|
2021-09-27 16:58:08 +08:00 |
gaoxin
|
6c50cdfd09
|
【无尽副本】修复无尽副本编队没有人得问题
|
2021-09-27 14:57:27 +08:00 |
gaoxin
|
6a71a972e9
|
【战斗力】关闭一些log
|
2021-09-26 11:18:38 +08:00 |
gaoxin
|
8c76d476a2
|
【编队】修复保存编队接口名修改导致的报错
|
2021-09-24 17:49:32 +08:00 |
gaoxin
|
c3820f13ae
|
【编队】修复无法复制编队的问题
|
2021-09-23 19:42:45 +08:00 |
gaoxin
|
0d76922c85
|
【编队】刷新编队时,保存编队的方法错误
|
2021-09-23 17:54:29 +08:00 |
gaoxin
|
0f534367c5
|
【战斗力】不再计算编队老战斗力
|
2021-09-23 16:16:57 +08:00 |
gaoxin
|
ac88b50cae
|
【编队】修复打开四灵试炼编队报错
|
2021-09-23 16:05:18 +08:00 |
ZhangBiao
|
32585cec01
|
【七界试炼】增加怪物详情界面
|
2021-09-22 19:38:16 +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 |
jiaoyangna
|
ac319513dc
|
【ID1018514】
【四灵试炼】线上号,打开战斗编队报错
|
2021-09-18 11:02:32 +08:00 |
gaoxin
|
66efc9d4e3
|
【战斗力】新战斗力计算系统完成
|
2021-09-16 13:35:33 +08:00 |
ZhangBiao
|
45de3d5c99
|
【七界试炼】提交
|
2021-09-15 18:09:21 +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 |
wangzhenxing
|
aaa4b987eb
|
玉虚论道修改
|
2021-09-11 19:47:23 +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
|
4eb8e566fe
|
【七界试炼】战斗结束提交
|
2021-09-10 18:36:39 +08:00 |
gaoxin
|
5af9e9f0ed
|
【编队】修复报错
|
2021-09-10 17:30:26 +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 |
gaoxin
|
3e3d0d9416
|
Merge remote-tracking branch 'origin/china/xq' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
# Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-09-09 11:22:47 +08:00 |
gaoxin
|
c4bced89f7
|
【战斗校验】山河社稷图,跨服战斗,地图战斗添加战斗校验
|
2021-09-08 18:27:20 +08:00 |
wangzhenxing
|
c531b3776b
|
玉虚论道提交
|
2021-09-07 18:27:23 +08:00 |
wangzhenxing
|
5f0bfe53bd
|
玉虚论道提交
|
2021-09-07 17:05:46 +08:00 |
jiaoyangna
|
13909e60aa
|
编队id修改
|
2021-09-02 17:29:44 +08:00 |