Commit Graph

26 Commits (e374db3a5a1a416d5469b83be8feed3d2929112f)

Author SHA1 Message Date
wangzhenxing 693774b012 玉虚论道修改 2023-01-13 14:00:37 +08:00
wangzhenxing 59b4801c07 玉虚论道星级修改 2023-01-13 13:44:12 +08:00
wangzhenxing 051b6ae456 [玉虚]===他人阵容英雄背景框修改 2022-09-02 14:10:01 +08:00
wangzhenxing bdc2cd7ef9 [玉虚论道]=====玉虚论道修改 2022-09-01 18:15:08 +08:00
wangzhenxing e3b1b3a967 [玉虚论道]=====星级,等级显示修改 2022-09-01 17:05:24 +08:00
wangzhenxing a13dd2939a [功能]================神系英雄添加提叫 2022-03-28 18:18:19 +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 1b39fbdbe9 【飞升】===========神魂后星级显示修改 2022-01-10 15:11:30 +08:00
wangzhenxing 5b670023ed [飞升]=======飞升代码逻辑提交 2022-01-05 18:17:44 +08:00
ZhangBiao 8de1e4e596 【家园】资源提交 2021-12-30 19:02:52 +08:00
jiaoyangna afcfc1b393 神魂星星修改提交 2021-11-05 17:38:10 +08:00
jiaoyangna d0d93e02ea 代码星星层级设置修改 2021-11-05 13:18:55 +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
wangzhenxing e1e2f1f663 [玉虚论道]=======结算期战斗添加屏蔽 2021-11-01 10:53:11 +08:00
jiaoyangna 5e8ad7dd08 神魂提交 2021-10-26 16:00:31 +08:00
wangzhenxing 474549ea24 bug修改 2021-10-14 21:36:29 +08:00
wangzhenxing 89216b64a5 玉虚队伍战斗显示不一致修改 2021-10-12 16:13:19 +08:00
wangzhenxing 36d542ba9d 玉虚论道优化提交 2021-09-30 15:12:02 +08:00
wangzhenxing d056a2dd70 玉虚论道提交 2021-09-14 10:10:57 +08:00
gaoxin 8e55ed2fff 【玉虚】角色信息界面大小动态变化 2021-09-11 20:26:43 +08:00
wangzhenxing cbb088a491 他人队伍灵兽修改 2021-09-10 22:13:48 +08:00
wangzhenxing 3257b89e70 eeeeeeee 2021-09-09 23:01:23 +08:00
wangzhenxing a58b5f2d88 玉虚论道提交 2021-09-09 11:48:09 +08:00
ZhangBiao f13f1937c7 【玉虚论道】其他人信息界面 2021-08-26 18:14:46 +08:00
ZhangBiao dc943be130 【玉虚论道】其他人信息界面提价 2021-08-26 17:36:03 +08:00
ZhangBiao c0ea5e1b7f 【玉虚论道】其他人编队信息界面 2021-08-26 17:14:13 +08:00