Commit Graph

123 Commits (06ba097de492fed22f972aa502c3a00a5987a575)

Author SHA1 Message Date
wangzhenxing 06ba097de4 [背包]=========装备碎片提交 2022-08-11 11:19:05 +08:00
wangzhenxing 5120ccdf8c [法宝背包显示修改]======== 2022-08-10 13:46:01 +08:00
wangzhenxing 847a90f43f [物品显示]======法宝显示修改 2022-08-08 17:58:24 +08:00
wangzhenxing 5d41ecc114 【装备】======添加蓝白装备 2022-06-14 15:58:18 +08:00
wangzhenxing d97c84a543 [英雄详情修改i] 2022-05-19 20:43:41 +08:00
wangzhenxing 6606b6bc64 56级宝物显示在背包 2022-04-28 13:46:14 +08:00
yuanshuai 4199ea504a 查看其他玩家信息,变身卡信息不对bug 2022-04-26 17:20:19 +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
wangzhenxing d5fd95373f [抽卡奖池]======抽卡奖池预览修改 2022-01-17 15:56:27 +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 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
wangzhenxing a16b592892 [飞升]=========飞升优化修改 2022-01-13 10:01:22 +08:00
ZhangBiao 48901f3817 【寻仙招募】心愿单中添加飞升石道具 2022-01-12 18:27:16 +08:00
wangzhenxing cd1b81c03e [飞升]======飞升修改提交 2022-01-12 17:29:52 +08:00
ZhangBiao f131da8558 【方寸寻宝】点击自选箱显示详细信息 2022-01-12 15:38:31 +08:00
wangzhenxing 1b39fbdbe9 【飞升】===========神魂后星级显示修改 2022-01-10 15:11:30 +08:00
gaoxin ee60ae6c9a 【限时升星】显示优化,红点添加,条件屏蔽添加 2022-01-10 11:44:39 +08:00
wangzhenxing e5c176cd9f [飞升]============特效显示修改提交 2022-01-07 10:08:55 +08:00
wangzhenxing d2b10ebb38 [飞升]=============飞升特效修改提交 2022-01-05 18:25:59 +08:00
ZhangBiao cf9cbc5ac9 【家园】摘星阁装备属性加持+战斗力 2021-12-31 13:44:11 +08:00
ZhangBiao 8de1e4e596 【家园】资源提交 2021-12-30 19:02:52 +08:00
ZhangBiao 926e0a4fbd 【命石】一键合成修改 2021-12-23 16:17:35 +08:00
ZhangBiao a197f16837 Merge branch 'china/dev' into 0功能/命格
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-12-17 15:46:53 +08:00
ZhangBiao d939e6b32b 【新人商城】提交 2021-12-17 14:00:07 +08:00
gaoxin acf5e8e31a 【挂机物品】导致其他物品显示错误 2021-12-26 17:29:06 +08:00
gaoxin cb8f8fe0aa 【挂机物品】添加时间标签 2021-12-26 17:13:30 +08:00
ZhangBiao ae3a2fa3e4 【命格】提交 2021-12-08 15:40:43 +08:00
jiaoyangna 0c6ff17ddd 修改提交 2021-11-27 14:30:51 +08:00
jiaoyangna f6c94a3cfe 变身卡详情提交 2021-11-26 19:36:20 +08:00
gaoxin 290911903c 【法宝聚灵】修复开启宝箱获取时不显示数字 2021-11-22 13:37:12 +08:00
gaoxin b10dad4285 【法宝聚灵】背包和掉落界面不显示碎片框 2021-11-22 12:01:16 +08:00
jiaoyangna 04ff9d99e4 碎片自选箱修改提交 2021-11-22 11:16:18 +08:00
jiaoyangna 1b11728534 道具点击报错修改提交 2021-11-19 18:39:04 +08:00
jiaoyangna bc62311af9 法宝之魂第二个界面提交 2021-11-19 16:52:15 +08:00
ZhangBiao 12e46be512 【装备界面】提交 2021-11-09 10:22:16 +08:00
jiaoyangna 2aea503619 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 17:14:08 +08:00
jiaoyangna bd8cd97bf3 神魂星星修改提交 2021-11-05 17:13:49 +08:00
ZhangBiao 142956ca6a 【活动】活动修改提交 2021-11-05 16:43:09 +08:00
jiaoyangna 1269b5b114 【ID1010436】
【优化】好感度增加通用礼物 及界面优化
2021-10-11 11:31:03 +08:00
jiaoyangna 7737449829 【ID1018681】
【好感度】逍遥游游历成功界面的礼物图标点不开
2021-10-09 12:14:34 +08:00
jiaoyangna c778c334e5 添加道具属性显示 2021-09-27 16:49:25 +08:00
jiaoyangna 644d8e3790 长按短按效果添加 2021-09-27 16:43:01 +08:00
jiaoyangna a12c9330c7 四灵第二次修改提交 2021-09-01 10:08:25 +08:00
jiaoyangna f712786650 排行榜宝物数据修改 2021-08-31 17:50:58 +08:00
jiaoyangna ac22bd000b 装备宝物界面修改提交 2021-08-31 17:02:22 +08:00
jiaoyangna 4801852d88 神应修改提交 2021-08-30 18:09:06 +08:00
jiaoyangna 1ea100ed83 神将情报界面装备宝物修改提交 2021-08-30 16:44:26 +08:00
jiaoyangna 2fbe372c76 四灵修改提交 2021-08-27 18:39:45 +08:00
jiaoyangna cd594275e0 四灵试炼修改提交 2021-08-26 17:25:02 +08:00