张彪
|
62d9d6da20
|
【易经宝库】最终大奖显示特效
|
2022-03-02 16:10:06 +08:00 |
张彪
|
ee77648eb1
|
【寻仙招募】奖励预览报错
|
2022-03-02 13:39:40 +08:00 |
jiaoyangna
|
8d196f6759
|
天地洪炉心愿修改提交
|
2022-02-08 17:50:09 +08:00 |
张彪
|
e257033ea6
|
【天地洪炉】增加白金品质宝物碎片
|
2022-02-08 14:06:25 +08:00 |
ZhangBiao
|
6e10183d80
|
【命格】命石合成显示调整
|
2022-01-22 10:13:43 +08:00 |
wangzhenxing
|
b18db8765d
|
[飞升]=====飞升特效修改提交
|
2022-01-21 17:09:14 +08:00 |
wangzhenxing
|
b64234bcb8
|
[飞升]=====特效修改提交
|
2022-01-20 18:18:40 +08:00 |
wangzhenxing
|
7de5fdac9e
|
[飞升]=====特效问题修改
|
2022-01-20 17:58:57 +08:00 |
wangzhenxing
|
9831008684
|
[飞升]======飞升特效适配
|
2022-01-19 18:34:35 +08:00 |
wangzhenxing
|
a6e05ae8e8
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/~Lua/Data/UIData.lua
|
2022-01-18 09:53:04 +08:00 |
ZhangBiao
|
369f7aa1ef
|
【点将台】选择心愿神将,列表动画不正常
|
2022-01-17 14:26:17 +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 |
wangzhenxing
|
853fde91b2
|
[飞升]============飞升修改提交
|
2022-01-15 12:26:12 +08:00 |
jiaoyangna
|
3369bcc73c
|
心愿修改提交
|
2022-01-14 18:40:00 +08:00 |
ZhangBiao
|
cbea9006b3
|
【家园】资源替换
|
2022-01-14 17:38:46 +08:00 |
jiaoyangna
|
c11db3056f
|
神将修改
|
2022-01-14 17:13:36 +08:00 |
jiaoyangna
|
d6521af965
|
许愿神将边框修改
|
2022-01-14 15:52:16 +08:00 |
ZhangBiao
|
898f88a0b9
|
【寻仙招募】修改奖励显示内容
|
2022-01-13 16:03:20 +08:00 |
ZhangBiao
|
2599afd6de
|
【寻仙招募】心愿选飞升石,查看奖励报错
|
2022-01-13 15:28:09 +08:00 |
jiaoyangna
|
0e8e6e1874
|
探索修改提交
|
2022-01-13 13:59:15 +08:00 |
jiaoyangna
|
8b4533aac9
|
一键探索调整编队后探索地图修改提交
|
2022-01-13 11:17:18 +08:00 |
wangzhenxing
|
ff7b7ba5ed
|
[飞升]=====bug修改提交
|
2022-01-12 16:41:51 +08:00 |
jiaoyangna
|
05e078dadc
|
探索引导修改提交
|
2022-01-12 15:27:35 +08:00 |
ZhangBiao
|
60c31c1d5b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-11 18:20:19 +08:00 |
ZhangBiao
|
617a557071
|
【家园】修改按钮
|
2022-01-11 18:20:12 +08:00 |
ZhangBiao
|
9826244e7e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-11 18:19:02 +08:00 |
ZhangBiao
|
8d82a962a6
|
【家园】特效提交
|
2022-01-11 18:18:41 +08:00 |
ZhangBiao
|
e3c1c348e7
|
【家园】特权剩余时间修改
|
2022-01-11 13:29:58 +08:00 |
ZhangBiao
|
c40be4411d
|
【家园】特权时间显示跳帧
|
2022-01-10 18:22:20 +08:00 |
ZhangBiao
|
567f5c1aa0
|
【家园】升级倒计时显示错误修改
|
2022-01-10 17:38:02 +08:00 |
ZhangBiao
|
2455410a0c
|
【命格】镶嵌按钮显示穿戴
|
2022-01-10 15:29:37 +08:00 |
wangzhenxing
|
1b39fbdbe9
|
【飞升】===========神魂后星级显示修改
|
2022-01-10 15:11:30 +08:00 |
gaoxin
|
6ddd4c543f
|
【修为】修为点击问号,弹出鬼畜动画,当前是元婴期
|
2022-01-10 15:06:16 +08:00 |
ZhangBiao
|
c157985e24
|
【建木神树】调整
|
2022-01-08 11:36:31 +08:00 |
ZhangBiao
|
54b01f4d86
|
【家园+易经宝库】提交
|
2022-01-06 18:42:20 +08:00 |
ZhangBiao
|
e0c228bf3f
|
【易经宝库】提交
|
2022-01-06 18:27:09 +08:00 |
ZhangBiao
|
956826c46a
|
【家园】摘星阁提交
|
2022-01-06 17:53:53 +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
|
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 |
jiaoyangna
|
79364232f0
|
【ID1010966】
【优化】法宝聚灵调整
|
2022-01-06 14:52:02 +08:00 |
ZhangBiao
|
893e33d920
|
【家园】提交
|
2022-01-06 10:33:08 +08:00 |
ZhangBiao
|
2f03bf5ab7
|
【家园】提交
|
2022-01-05 19:12:54 +08:00 |
wangzhenxing
|
5b670023ed
|
[飞升]=======飞升代码逻辑提交
|
2022-01-05 18:17:44 +08:00 |
ZhangBiao
|
aa761fc4e9
|
【家园】提交
|
2022-01-05 18:04:57 +08:00 |
ZhangBiao
|
b45f74781c
|
【家园】提交
|
2022-01-05 17:06:34 +08:00 |
ZhangBiao
|
6f4942e87e
|
【家园】提交
|
2022-01-05 16:21:20 +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
|
19c27ae7bb
|
【家园】提交
|
2022-01-05 10:12:23 +08:00 |