Commit Graph

230 Commits (09fb9c651ab6186789b6db8c39b3bb9e173bccee)

Author SHA1 Message Date
PC-202302260912\Administrator d68f5ae673 修改行军镐 2025-01-03 14:39:36 +08:00
PC-202302260912\Administrator aa1e0294a6 修改图标 2025-01-03 14:34:50 +08:00
PC-202302260912\Administrator 4cbd2723d7 按钮特效 2024-12-12 15:33:01 +08:00
zhangjiannan 699c903e8d 删除多余资源 2024-11-13 10:29:52 +08:00
PC-202302260912\Administrator b26838cd38 微调两个活动页面 2024-11-12 18:15:10 +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
zhangjiannan c318a3f870 修改战斗场景,替换挂机表现 2024-10-10 16:52:39 +08:00
zhangjiannan 4df7b99e38 meta上传 2024-09-23 14:48:00 +08:00
PC-202302260912\Administrator 68b42820e9 大剑豪改为宇宙帝王 2024-09-14 15:37:52 +08:00
PC-202302260912\Administrator de62a75db1 修改空岛特效 2024-07-23 21:05:51 +08:00
PC-202302260912\Administrator 1fcc48b861 礼物相关 2024-02-05 17:00:34 +08:00
PC-202302260912\Administrator 31f5f99d6d 新增一个特效 2024-01-31 18:45:38 +08:00
DESKTOP-MMO982B\User 6c7e3b62f1 称号修改 2024-01-29 23:03:32 +08:00
wangzhenxing b3b63615d3 名望 小人显示修改 2024-01-13 15:59:22 +08:00
xiejun 9d5cc8371e 灵兽战斗修改 2024-01-09 18:30:51 +08:00
PC-202302260912\Administrator 3a06bcf05e 修正特效 2023-12-09 00:24:51 +08:00
PC-202302260912\Administrator f253209f62 特效相关 2023-12-06 18:16:26 +08:00
PC-202302260912\Administrator 88c670794e 修改称号相关 2023-12-06 17:07:51 +08:00
PC-202302260912\Administrator c2ea98bc54 称号图片 2023-12-06 15:42:35 +08:00
wangzhenxing 31a2b40777 灵兽技能名称修改提交 2023-12-04 16:06:46 +08:00
lihaiyang f595ebee5b 修改称号等美术图标 2023-06-02 13:18:06 +08:00
lihaiyang 0b4b59e542 称号=====永结同心 2023-02-13 16:40:15 +08:00
lihaiyang 0335635f9e 【称号】=========特效调整 2022-11-18 16:50:40 +08:00
lihaiyang a688cd5ffe 魂印冲榜称号 2022-10-31 16:51:37 +08:00
lihaiyang dcb2321134 【称号】=============开服冲榜称号上传 2022-10-21 17:04:15 +08:00
lihaiyang 876fb5ae56 【称号】====唯舞独尊称号特效隐藏一部分 2022-10-18 15:17:36 +08:00
lihaiyang 944f5279b1 【称号】==========位置修正 2022-09-22 15:40:53 +08:00
lihaiyang dbe58e993e [gm]=======称号提交 2022-09-22 11:45:28 +08:00
gaoxin 9291351094 【资源】名称变化 2022-02-10 17:56:34 +08:00
gaoxin 1548abda69 【资源】资源名重复修正 2022-01-24 11:16:52 +08:00
gaoxin 1c827a3a23 【关卡】有可挑战关卡时添加小手显示 2022-01-14 16:02:10 +08:00
ZhangBiao 8d82a962a6 【家园】特效提交 2022-01-11 18:18:41 +08:00
ZhangBiao 0d11371d87 【资源冲突】资源名修改提交 2021-12-06 16:15:24 +08:00
gaoxin d5d83a5c7e 【资源】资源名重复修改 2021-12-02 01:08:38 +08:00
ZhangBiao b33ee1b006 【灵脉秘境】特效提交 2021-11-26 15:15:10 +08:00
wangzhenxing 7949e8c21c 【战斗】========灵兽卡面翻转提交 2021-11-25 18:47:53 +08:00
jiaoyangna de31ad6dfe 资源替换 2021-11-19 17:41:40 +08:00
ZhangBiao a577d80d76 【神魂】增加特效 2021-11-08 13:02:00 +08:00
jiaoyangna 72ddfad3c1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 18:06:16 +08:00
jiaoyangna c8172c34a4 四灵试炼神魂修改提交 2021-11-05 18:06:01 +08:00
gaoxin 14f1d213e3 【神魂特效】资源名重复修改 2021-11-05 17:47:43 +08:00
jiaoyangna 5ac1f04718 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 10:18:28 +08:00
jiaoyangna 0d68d9229b 神魂提交 2021-11-05 10:18:10 +08:00
ZhangBiao 08e6f334a4 【装备界面】特效调整 2021-11-04 19:10:06 +08:00
ZhangBiao 1321b32caf 【装备界面】增加特效 2021-11-04 15:44:59 +08:00
gaoxin de71cd524b 【周卡】特效不能被裁切修改 2021-11-04 14:02:48 +08:00
gaoxin 0237d3f351 【神魂】修复特效在3.5版本不显示的问题 2021-11-15 00:18:34 +08:00
jiaoyangna 6f0d51ddb2 神魂提交 2021-11-03 18:11:08 +08:00
jiaoyangna 4eed456628 神魂图标修改 2021-11-03 13:25:08 +08:00
jiaoyangna a41765d10b 神魂提交 2021-11-02 10:20:17 +08:00