Commit Graph

136 Commits (e086086730eddd453262b4224fd1ba87ac6c6384)

Author SHA1 Message Date
PC-202302260912\Administrator 39384833bc 修改图片 2024-10-30 20:17:34 +08:00
PC-202302260912\Administrator fa6020a07d 宝箱修改 2024-10-30 19:55:41 +08:00
PC-202302260912\Administrator b1e7d44ccc 修改图片 2024-10-30 19:46:41 +08:00
zhangjiannan 19484d6b62 Merge remote-tracking branch 'remotes/origin/onepiece_bt' into TCX_LongZhu
# Conflicts:
#	Assets/ManagedResources/Icon/Haizeiskill.meta
#	Assets/ManagedResources/Icons/luofu_huobi_1.png
#	Assets/ManagedResources/Icons/luofu_huobi_1.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_2.png
#	Assets/ManagedResources/Icons/luofu_huobi_2.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_3.png
#	Assets/ManagedResources/Icons/luofu_huobi_3.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_4.png
#	Assets/ManagedResources/Icons/luofu_huobi_4.png.meta
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/Prefabs/UI/GMPanel/GMShuaChongTeQuan.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab
#	Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Recruit/RecruitMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/UppperMonthCardView/UppperMonthCard.prefab
#	Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
2024-10-11 16:36:50 +08:00
PC-202302260912\Administrator 4c58c6be5a 页面优化 2024-09-24 21:10:04 +08:00
PC-202302260912\Administrator fcd50ce78a 更换图标 2024-09-23 19:53:47 +08:00
PC-202302260912\Administrator 10d5f2f710 神印图标上传 2024-09-23 19:49:06 +08:00
PC-202302260912\Administrator dfacd9001e 优化页面 2024-09-23 11:24:27 +08:00
PC-202302260912\Administrator 70de9defe1 藏宝图图标修改 2024-09-16 14:22:42 +08:00
PC-202302260912\Administrator 9cccc4c6a3 头像修改 2024-09-15 20:39:58 +08:00
PC-202302260912\Administrator 7081f17248 称号修改 2024-09-12 18:52:39 +08:00
PC-202302260912\Administrator 52926012d6 名刀变超级武器 2024-09-12 16:12:17 +08:00
PC-202302260912\Administrator eab2b58d92 修改神龙图片和预设 2024-09-11 22:10:01 +08:00
PC-202302260912\Administrator 2ee5cc0993 宇宙武道会 2024-09-11 21:43:07 +08:00
PC-202302260912\Administrator e3e3482c9c 修改图片和预设 2024-09-11 19:59:15 +08:00
PC-202302260912\Administrator e966685d78 新增四个罗浮相关货币 2024-06-14 17:17:27 +08:00
xiejun 3c0598cae9 礼物图标 2024-05-10 20:27:44 +08:00
PC-202302260912\Administrator 9fa3f2d972 礼物 2024-02-05 17:03:26 +08:00
PC-202302260912\Administrator 1fcc48b861 礼物相关 2024-02-05 17:00:34 +08:00
PC-202302260912\Administrator 3763057455 图片修改 2024-02-02 18:10:55 +08:00
PC-202302260912\Administrator f620fa65f0 同步图标 2024-02-02 15:20:18 +08:00
PC-202302260912\Administrator c8522accb7 添加图标 2024-02-01 18:23:52 +08:00
PC-202302260912\Administrator 6c26c32146 图腾图片修改 2024-01-31 18:44:52 +08:00
PC-202302260912\Administrator fe4e22af4a 霸气图片上传 2024-01-30 19:07:15 +08:00
PC-202302260912\Administrator 46c36bd841 修改技能图标 2024-01-25 19:26:18 +08:00
PC-202302260912\Administrator a4a5063235 陨铁图标修改为纸片 2024-01-20 14:32:15 +08:00
PC-202302260912\Administrator ca5975f1e9 道具图标 2024-01-19 19:08:06 +08:00
PC-202302260912\Administrator 9674bb163e 修改道具图标 2024-01-19 18:51:51 +08:00
PC-202302260912\Administrator cc92084f18 主角经验修改 2024-01-19 18:02:30 +08:00
PC-202302260912\Administrator 4100d4bc9c 挑战券 2024-01-19 14:41:52 +08:00
DESKTOP-MMO982B\User f80d4141e9 英雄碎片图标 2024-01-18 14:51:36 +08:00
PC-202302260912\Administrator 14f1ffd0ca 修改图片 2024-01-17 13:54:30 +08:00
PC-202302260912\Administrator 243991a9cc 图标更换 2024-01-15 13:55:25 +08:00
PC-202302260912\Administrator 9166aaba61 图标修改 2024-01-05 19:06:16 +08:00
PC-202302260912\Administrator 192b4a24ca 经验药剂图标 2023-12-29 18:33:17 +08:00
PC-202302260912\Administrator a82b95a99b 修改图标 2023-12-29 18:24:08 +08:00
PC-202302260912\Administrator 5e95ad3a7f 装备图标相关 2023-12-27 15:38:22 +08:00
PC-202302260912\Administrator 61ddc28e5d 魂宝灵宝图标 2023-12-27 15:27:25 +08:00
PC-202302260912\Administrator 12d10e78d0 神兵图片 2023-12-11 14:13:53 +08:00
xiejun 891eaf2e1c 男女主头像 2023-12-05 20:04:25 +08:00
wangzhenxing bb18772265 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2023-09-21 18:43:54 +08:00
PC-202302260912\Administrator 2ffaa9e7d5 银锭旋转 2023-09-20 17:17:36 +08:00
PC-202302260912\Administrator 24933b853c 修改头像 2023-08-31 21:51:08 +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
xiejun fd8329bf90 海贼UI 2023-07-27 18:37:04 +08:00
xiejun fd59086676 主界面UI替换 2023-06-30 00:13:43 +08:00
PC-202302260912\Administrator 4f70ed6a2a 添加货币图片 2023-07-04 14:23:55 +08:00
lihaiyang 1b6edf1cee 新神兵 2023-06-02 15:43:36 +08:00
lihaiyang effa8b9dce 新增图标 2023-06-01 11:45:09 +08:00
lihaiyang 63fc1c6ee2 【天蓬】图标 2023-05-16 11:49:23 +08:00