wangzhenxing
|
a7ad2ee1f6
|
Merge branch 'china/dev' into china/飞升
|
2022-01-17 10:50:14 +08:00 |
ZhangBiao
|
98f89d8a9b
|
【摘星阁+修为】装备属性展示+修为红点检测
|
2022-01-17 10:44:43 +08:00 |
ZhangBiao
|
91f9589043
|
【摘星阁】装备属性
|
2022-01-17 10:33:42 +08:00 |
ZhangBiao
|
e93b2816b4
|
【摘星阁】装备摘星阁属性拆分
|
2022-01-17 10:24:27 +08:00 |
jiaoyangna
|
fbd1c9aa43
|
许愿神将修改提交
|
2022-01-17 09:41:00 +08:00 |
ZhangBiao
|
10070d14ca
|
【跳转】提交
|
2022-01-15 18:29:18 +08:00 |
ZhangBiao
|
a556bf7761
|
【玩家信息】提交
|
2022-01-15 18:17:46 +08:00 |
wangzhenxing
|
0b3007a9c7
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/~Lua/Data/UIData.lua
|
2022-01-15 18:16:56 +08:00 |
ZhangBiao
|
2b8cb81ff3
|
【充值】跳转修改
|
2022-01-15 18:07:43 +08:00 |
ZhangBiao
|
3ad8b6b6c3
|
【玩家信息】提交
|
2022-01-15 15:44:08 +08:00 |
ZhangBiao
|
c373f8d014
|
【修改】提交
|
2022-01-15 15:05:26 +08:00 |
ZhangBiao
|
bca67f4fd6
|
【玩家信息】报错修改
|
2022-01-15 13:26:22 +08:00 |
ZhangBiao
|
28d4b2a8be
|
【玩家信息】提交
|
2022-01-15 13:07:28 +08:00 |
ZhangBiao
|
7feefd2078
|
Merge branch 'china/dev' into 0优化/玩家信息界面拓展
|
2022-01-15 13:01:44 +08:00 |
ZhangBiao
|
fa1c832170
|
【坐骑】增加详细信息
|
2022-01-15 13:00:45 +08:00 |
wangzhenxing
|
ef0a0ff436
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Data/UIData.lua
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2022-01-15 12:47:22 +08:00 |
ZhangBiao
|
ed48c7ce00
|
【寻仙招募】修改,提交
|
2022-01-15 10:27:48 +08:00 |
ZhangBiao
|
232491eb95
|
Merge branch 'china/dev' into 0优化/玩家信息界面拓展
|
2022-01-15 09:14:10 +08:00 |
jiaoyangna
|
98f23e56ea
|
神将修改提交
|
2022-01-14 19:13:46 +08:00 |
ZhangBiao
|
5d2fdc5773
|
【仙缘汇聚箱】报错修改
|
2022-01-14 18:47:41 +08:00 |
ZhangBiao
|
d7bd3a07d8
|
【心愿抽奖】报错修改
|
2022-01-14 18:28:36 +08:00 |
ZhangBiao
|
8f554eca59
|
Merge branch 'china/dev' into 0优化/玩家信息界面拓展
|
2022-01-14 16:02:59 +08:00 |
jiaoyangna
|
d6521af965
|
许愿神将边框修改
|
2022-01-14 15:52:16 +08:00 |
ZhangBiao
|
28d3f421bc
|
【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息提交
|
2022-01-14 15:44:45 +08:00 |
jiaoyangna
|
053de388f2
|
神将修改提交
|
2022-01-14 14:52:56 +08:00 |
ZhangBiao
|
771c445488
|
Merge branch 'china/dev' into 0优化/玩家信息界面拓展
|
2022-01-14 14:16:47 +08:00 |
jiaoyangna
|
981aba2417
|
神将情报修改提交
|
2022-01-14 11:26:13 +08:00 |
ZhangBiao
|
5b36346da3
|
【玩家信息】提交
|
2022-01-13 18:29:12 +08:00 |
ZhangBiao
|
36b475ee15
|
【玩家信息】增加额外属性
|
2022-01-13 15:23:59 +08:00 |
ZhangBiao
|
48901f3817
|
【寻仙招募】心愿单中添加飞升石道具
|
2022-01-12 18:27:16 +08:00 |
wangzhenxing
|
ff7b7ba5ed
|
[飞升]=====bug修改提交
|
2022-01-12 16:41:51 +08:00 |
ZhangBiao
|
9f8ee231ac
|
【装备界面】排行榜数据错误修改
|
2022-01-11 17:51:56 +08:00 |
gaoxin
|
0ee930c550
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-14 14:01:01 +08:00 |
gaoxin
|
5d2838554d
|
Merge branch '0活动/新大圣升星' into china/dev
|
2022-01-14 14:00:20 +08:00 |
gaoxin
|
dbbfc9dfe3
|
【限时升星】选择神将界面标题错误
|
2022-01-14 11:50:16 +08:00 |
jiaoyangna
|
6bb00a785c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-11 11:28:58 +08:00 |
jiaoyangna
|
40e37473dc
|
【ID1011029】
【优化】 神将界面优化
|
2022-01-11 11:09:44 +08:00 |
ZhangBiao
|
cc3791e0d5
|
【家园】修改到达上线提示文字、红点修改
|
2022-01-10 17:24:39 +08:00 |
ZhangBiao
|
6b2860c5f4
|
【命格】获得命石后,有可穿戴入口没红点
|
2022-01-10 15:38:20 +08:00 |
wangzhenxing
|
1b39fbdbe9
|
【飞升】===========神魂后星级显示修改
|
2022-01-10 15:11:30 +08:00 |
ZhangBiao
|
3e11f70576
|
【云游商人】选择升级的装备,显示可以选择全部
|
2022-01-10 14:56:50 +08:00 |
ZhangBiao
|
244c8050e0
|
【装备】装备界面套装属性显示不正确修改
|
2022-01-08 17:49:04 +08:00 |
gaoxin
|
ecaa9f1dbc
|
【英雄选择】英雄选择界面通用化
|
2022-01-08 17:47:34 +08:00 |
ZhangBiao
|
94cf5e4aec
|
【建木神树】提交
|
2022-01-08 10:33:31 +08:00 |
ZhangBiao
|
956826c46a
|
【家园】摘星阁提交
|
2022-01-06 17:53:53 +08:00 |
ZhangBiao
|
0bed9188dc
|
【家园】摘星阁提交
|
2022-01-06 17:04:13 +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 |
ZhangBiao
|
6f2b684ecd
|
【家园】提交
|
2022-01-06 16:25:20 +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
|
cb9fc77b15
|
【家园】摘星阁文字提示提交
|
2022-01-06 15:52:51 +08:00 |