Commit Graph

215 Commits (e337559c30506ce5abca96dacd45bcc0a23b8137)

Author SHA1 Message Date
yuanshuai b4a626d9e2 挑战副本脚本修改提交 2022-04-18 18:48:06 +08:00
wangzhenxing 2ed317bc2c 摘星阁修改,备战阵营图标显示修改 2022-04-07 15:09:04 +08:00
wangzhenxing 0a52e4a549 [bug]=====神系英雄修改提交 2022-04-02 16:03:18 +08:00
wangzhenxing a3e166a05e 【bug】=====英雄列表排序修改 2022-03-31 18:11:08 +08:00
wangzhenxing a13dd2939a [功能]================神系英雄添加提叫 2022-03-28 18:18:19 +08:00
jiaoyangna 5348a49256 Revert "冲突提交"
This reverts commit b5a29c9152.
2022-03-22 11:06:54 +08:00
jiaoyangna c93b9e3f04 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-03-21 18:29:21 +08:00
jiaoyangna b5a29c9152 冲突提交 2022-03-21 18:29:03 +08:00
wangzhenxing 4562629709 [功能]==============修行技能添加战斗力提交 2022-03-21 17:46:30 +08:00
wangzhenxing b18db8765d [飞升]=====飞升特效修改提交 2022-01-21 17:09:14 +08:00
wangzhenxing 7de5fdac9e [飞升]=====特效问题修改 2022-01-20 17:58:57 +08:00
wangzhenxing 6ef00a4498 [飞升]=====细节调整 2022-01-19 16:57:17 +08:00
wangzhenxing 4034a90a33 [飞升]======优化修改提交 2022-01-19 15:29:47 +08:00
wangzhenxing 1de7293630 [飞升]======卡牌飞升预设修改 2022-01-17 16:53:26 +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 ff7b7ba5ed [飞升]=====bug修改提交 2022-01-12 16:41:51 +08:00
wangzhenxing 1b39fbdbe9 【飞升】===========神魂后星级显示修改 2022-01-10 15:11:30 +08:00
gaoxin 34e90db4fd 【编队删选】添加职业筛选效果,高亮效果颜色修改 2022-01-07 16:40:31 +08:00
wangzhenxing e5c176cd9f [飞升]============特效显示修改提交 2022-01-07 10:08:55 +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
wangzhenxing 5b670023ed [飞升]=======飞升代码逻辑提交 2022-01-05 18:17:44 +08:00
gaoxin 9b2057bede 【山河筛选】添加职业呼吸效果 2022-01-03 02:17:03 +08:00
jiaoyangna dac88a6dbf 探索提交 2021-12-29 10:02:22 +08:00
jiaoyangna 9dafa85858 探索提交 2021-12-28 13:30:27 +08:00
jiaoyangna 130a75c8dd 探索提交 2021-12-24 00:14:32 +08:00
jiaoyangna 5d37c0d4d9 探索提交 2021-12-23 17:23:02 +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 6012b533ca 【灵脉秘境】提交 2021-11-16 17:34:37 +08:00
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