Commit Graph

80 Commits (cd858da64f56c9dd1947583ea567b50459fddae8)

Author SHA1 Message Date
xiejun aca20158a8 奥义卡UI修改(差一张虚位以待) 2024-01-16 14:10:04 +08:00
wangzhenxing d0232e9a98 变身卡描述修改 2024-01-15 15:26:42 +08:00
wangzhenxing c648b51f78 变身卡提交 2024-01-12 19:17:15 +08:00
wangzhenxing dff1352995 奥义卡选择界面修改提交 2024-01-12 18:48:43 +08:00
wangzhenxing be5fa5dded 变身卡不能实时上阵修改 2023-12-15 10:52:13 +08:00
xiejun 55cc7bef89 修改奥义卡加成颜色 2023-12-07 14:51:28 +08:00
wangzhenxing d5a8f71739 身外化身展示立绘修改 2023-11-13 14:49:17 +08:00
wangzhenxing 9ee7c9793f 灵兽界面修改 2023-11-11 15:42:30 +08:00
wangzhenxing 08fea279e1 化身卡修改提交 2023-11-01 15:11:41 +08:00
xiejun 6ced2b0507 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-08-29 17:58:24 +08:00
wangzhenxing df07616ab3 变身卡修改提交 2023-05-31 17:21:13 +08:00
wangzhenxing 1f94c3d234 变身卡添加职业 2023-04-21 13:24:26 +08:00
wangzhenxing bee3a99dbc 变身卡左移按钮显示修改提交 2023-02-24 15:26:41 +08:00
wangzhenxing d6ada9958a gm购买提示修改 2022-11-10 13:45:03 +08:00
wangzhenxing 64dfcd3fcf 变身卡解锁提示修改 2022-11-02 17:26:22 +08:00
wangzhenxing fa54c65598 变身卡加成预览提交 2022-11-02 17:20:28 +08:00
wangzhenxing d2af9edc0f [gm]======变身卡修改提交 2022-11-02 11:48:41 +08:00
wangzhenxing 7ec1580c3e [变身卡]======开启添加等级限制 2022-08-18 17:02:35 +08:00
wangzhenxing 054c31caee [周卡]=====红点提交 2022-06-01 13:23:34 +08:00
yuanshuai 0805e5054d 身外化身界面调整 2022-04-28 11:58:48 +08:00
yuanshuai a53c0446b8 化身之力bug修改 2022-04-28 10:45:25 +08:00
yuanshuai d1111be7eb 化身卡升级升星红点提交 2022-04-27 18:08:55 +08:00
yuanshuai c8196dedd7 化身之力红点bug修改 2022-04-27 15:46:08 +08:00
yuanshuai b5246024d0 化身卡详情界面修改 2022-04-27 10:33:49 +08:00
yuanshuai 81a671e0f1 化身升级bug修改 2022-04-26 18:28:37 +08:00
yuanshuai 4199ea504a 查看其他玩家信息,变身卡信息不对bug 2022-04-26 17:20:19 +08:00
yuanshuai 2b5830b76a 物品弹窗bug修改 2022-04-26 15:36:43 +08:00
yuanshuai 750b243bb9 化身之力红点bug修改 2022-04-26 14:47:04 +08:00
yuanshuai f187acdf52 化身属性显示不对bug修改 2022-04-26 14:21:24 +08:00
yuanshuai f65ddb2eda 化身卡升星bug修改 2022-04-26 13:44:19 +08:00
yuanshuai 0c3dec451f 化身bug修改 2022-04-26 13:33:41 +08:00
yuanshuai 92e56472de 天宫商店点击报错 bug修改 2022-04-26 10:14:52 +08:00
yuanshuai 626a2a98ef 化身bug修改 2022-04-25 18:48:27 +08:00
yuanshuai 565d4007df 化身之力界面调整 2022-04-25 18:42:19 +08:00
yuanshuai 21342783bd 化身卡界面修改 2022-04-25 16:23:41 +08:00
yuanshuai 7c543952e5 身外化身界面修改 2022-04-25 15:52:46 +08:00
yuanshuai 4e5ccff820 身外化身界面调整 2022-04-25 14:42:17 +08:00
yuanshuai dcf1e29c3a 界面优化 2022-04-25 11:52:09 +08:00
yuanshuai 160d974cbc 变身卡界面调整提交 2022-04-24 22:13:28 +08:00
yuanshuai 9ec3724c5d 身外化身界面调整 2022-04-24 20:27:05 +08:00
yuanshuai 882f77e164 界面修改 2022-04-24 19:46:59 +08:00
yuanshuai 26970aee68 身外化身功能提交 2022-04-24 16:50:24 +08:00
yuanshuai 1114c62c97 添加一键放入 2022-04-22 19:29:10 +08:00
yuanshuai 765134f4b3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua
2022-04-22 18:33:04 +08:00
yuanshuai c3919b7e82 变身卡强化相关代码提交 2022-04-22 18:24:33 +08:00
wangzhenxing e025824de6 添加报错处理 2022-04-22 13:17:58 +08:00
wangzhenxing 61a52f4239 [变身卡]=======处理变身卡报错 2022-04-21 17:23:57 +08:00
ZhangBiao f131da8558 【方寸寻宝】点击自选箱显示详细信息 2022-01-12 15:38:31 +08:00
jiaoyangna 9184852070 方寸寻宝添加音效 2021-12-07 14:41:09 +08:00
jiaoyangna 84a33a2a3e 十连抽停留位置修改 2021-12-06 17:26:03 +08:00