Commit Graph

65 Commits (994d2602845afe8d9202a1f7a758f0a3ed454527)

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
PC-202302260912\Administrator 10c6f5541c 修正颜色 2023-12-07 13:38:38 +08:00
xiejun dcb7770e8d 神兵UI修改 2023-12-06 15:49:03 +08:00
PC-202302260912\Administrator e7ef5dde40 奥义卡按钮位置修正 2023-12-05 14:27:20 +08:00
PC-202302260912\Administrator 25553d5476 修改名字 2023-11-29 14:04:01 +08:00
PC-202302260912\Administrator f9af32620d 身外化身 2023-11-29 13:59:51 +08:00
PC-202302260912\Administrator 2cc9806cbf 修改页面 2023-11-10 18:55:25 +08:00
wangzhenxing 8da4412a87 主城预设 修改提交 2023-11-08 13:55:38 +08:00
PC-202302260912\Administrator d437ad593f 变身卡升星页面修改 2023-11-07 20:23:52 +08:00
wangzhenxing 08fea279e1 化身卡修改提交 2023-11-01 15:11:41 +08:00
xiejun 100980e98b 删除老预制体 2023-10-23 17:51:23 +08:00
xiejun 44087689d4 灵兽 2023-10-08 16:53:34 +08:00
xiejun eb926fc087 灵兽 2023-09-28 17:05:40 +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
lihaiyang fd47661916 修正字体大小 2023-06-01 10:59:49 +08:00
wangzhenxing df07616ab3 变身卡修改提交 2023-05-31 17:21:13 +08:00
wangzhenxing 1f94c3d234 变身卡添加职业 2023-04-21 13:24:26 +08:00
lihaiyang 123ac3f9fe 身外化神界面 箭头拉大 2023-02-17 17:11:06 +08:00
wangzhenxing 870d163b8c 身外化身界面适配修改提交 2023-02-17 16:54: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
yuanshuai 0805e5054d 身外化身界面调整 2022-04-28 11:58:48 +08:00
yuanshuai d1111be7eb 化身卡升级升星红点提交 2022-04-27 18:08:55 +08:00
yuanshuai 4199ea504a 查看其他玩家信息,变身卡信息不对bug 2022-04-26 17:20:19 +08:00
yuanshuai 565d4007df 化身之力界面调整 2022-04-25 18:42:19 +08:00
yuanshuai e4e244d36b 化身界面修改 2022-04-25 18:03:37 +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 c3919b7e82 变身卡强化相关代码提交 2022-04-22 18:24:33 +08:00
jiaoyangna 41ae610a31 变身卡界面修改提交 2021-11-27 16:14:59 +08:00
jiaoyangna 80fb3c9108 添加tips 2021-11-26 18:20:03 +08:00
jiaoyangna 5542212cc1 天地烘炉提交 2021-11-26 17:04:54 +08:00
jiaoyangna b6bcd50dd3 身外化身修改提交 2021-11-26 14:11:23 +08:00
jiaoyangna 14b54c7d5e 变身卡名字颜色修改 2021-11-26 13:18:45 +08:00
jiaoyangna a15ca8407e 标题位置调整 2021-11-26 13:08:48 +08:00
jiaoyangna def89bf7e3 身外化身提交 2021-11-26 12:51:52 +08:00
jiaoyangna b78e2335fa 身外化身提交 2021-11-26 11:34:25 +08:00
jiaoyangna c0c8a6710c 身外化身提交 2021-11-26 11:08:48 +08:00
jiaoyangna a248330241 Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua
2021-11-25 16:10:14 +08:00
jiaoyangna 9e99347a2b 法宝聚灵提交 2021-11-19 11:37:26 +08:00
jiaoyangna efe7866916 身外化身添加属性显示 2021-11-18 15:39:00 +08:00