Commit Graph

238 Commits (cdb6218ccbcaa1b0352acc80f902e2ee062ea482)

Author SHA1 Message Date
DESKTOP-RH64908\Administrator 351f192b82 1 2024-11-22 20:12:01 +08:00
PC-202302260912\Administrator 00763e5749 修改战斗音效 2024-11-19 15:18:30 +08:00
PC-202302260912\Administrator 6487d7baa3 七龙珠背景音乐 2024-11-19 14:55:08 +08:00
zhangjiannan 699c903e8d 删除多余资源 2024-11-13 10:29:52 +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
PC-202302260912\Administrator 7e7b86d35e 阵营命修改 上传一部分杂乱的mat 2024-09-06 19:30:37 +08:00
DESKTOP-MMO982B\User d0327cf3fd 技能配音 2024-06-09 19:03:41 +08:00
wangzhenxing c60b00f05d 删除重复英雄音效 2024-07-05 15:16:22 +08:00
DESKTOP-MMO982B\User 5865640aee 技能配音 2024-06-09 13:59:15 +08:00
DESKTOP-MMO982B\User 80d0648001 语音 2024-06-08 19:12:49 +08:00
wangzhenxing b801e2d2b5 老引导语音修改 2024-01-25 15:01:50 +08:00
wangzhenxing 250313da2c 删除无用音效 2024-01-25 14:19:27 +08:00
wangzhenxing 4a9024e587 [音效]====================战中音效修改 战斗胜利音效屏蔽 2023-12-29 21:22:27 +08:00
wangzhenxing 270e359507 [玉虚论道]=====对战界面添加音效 2021-12-30 14:41:43 +08:00
jiaoyangna 9184852070 方寸寻宝添加音效 2021-12-07 14:41:09 +08:00
luyao 67a1f24a84 方寸转盘音效2个(1整体、1单音) 2021-12-07 14:18:18 +08:00
luyao 5200a8746b 气冲斗牛 技能名称 音效优化 2021-12-07 13:20:01 +08:00
luyao 9c1024d9f4 牛魔王皮肤 音效(攻击,受击)上传 2021-12-07 10:14:51 +08:00
luyao 0e4ff716e0 牛魔王皮肤技能名称 音质优化 2021-12-07 10:13:30 +08:00
luyao 6867a738d8 【气冲斗牛】技能名字音效,去除音频前段留白 2021-12-06 17:02:20 +08:00
luyao 44ba0b73b4 【音效】meta提交 2021-12-06 16:49:31 +08:00
luyao 91b80ebbf6 【牛魔王皮肤】技能名称音效 2021-12-06 16:46:42 +08:00
luyao 83044f0586 Merge branch 'china/dev' into china/dev_res 2021-12-06 15:43:40 +08:00
luyao c7edbfc191 【音效调整】揭开大圣符印部分音效声量调大 2021-12-03 14:54:08 +08:00
ZhangBiao 0b5575c6f2 Merge branch 'china/dev' into china/dev_res
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_lingshou_fanzhuan/Materials/fx_kapianfanmian_daoguangppp.mat.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Materials/blz_400_dagger_end 2.mat.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Model/fuwenlujing_ctrl.controller.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Prefab/c_dao_guocheng.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Prefab/c_ren_guocheng.prefab
#	Assets/ManagedResources/Spine/c_0054/c_0054_Atlas.asset.meta
#	Assets/ManagedResources/Spine/c_0054/c_0054_Material.mat.meta
#	Assets/ManagedResources/Spine/c_0054/c_0054_SkeletonData.asset.meta
#	Assets/ManagedResources/Spine/s_fuxi/s_fuxi_Atlas.asset.meta
#	Assets/ManagedResources/Spine/s_fuxi/s_fuxi_SkeletonData.asset.meta
2021-12-02 14:39:03 +08:00
luyao af560c2aed 【音效文件清理】删除过往无用音效 2021-11-30 14:23:18 +08:00
luyao cf3993fbfb 妖系 受击音效调整 2021-11-30 14:12:35 +08:00
luyao f4a440e1a3 【妖】普攻 受击音效再次调整 2021-11-30 12:35:45 +08:00
luyao 1dc75e4580 【妖】普攻 攻击,受击音效;
【道】受击音效修改
2021-11-30 12:15:37 +08:00
luyao 7a8c43ed57 添加 人(攻击,受击)、佛(攻击、受击) 普攻音效 2021-11-30 11:37:49 +08:00
luyao 03c313b6c9 【音效】妖道普通攻击音效 2021-11-27 15:00:31 +08:00
gaoxin 044137ed72 【音效】新普通攻击音效 2021-11-26 15:08:00 +08:00
gaoxin 08055eebde 【音效】新普通攻击音效 2021-11-26 15:07:37 +08:00
jiaoyangna 596c8477d3 Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-11-04 09:29:56 +08:00
gaoxin 947002e03a 【新增资源优化】 2021-10-29 17:44:46 +08:00
liujiaqi 0f63c7c12b 【资源】敖丙皮肤技能音效 2021-11-09 23:43:39 +08:00
jiaoyangna b50e5ee2bf Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_zn01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_02.mp3.meta
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-10-18 10:38:49 +08:00
jiaoyangna 097d5cf1cc 神魂初版提交 2021-10-18 10:36:32 +08:00
jiaoyangna 3f92309d78 好感度添加特效 2021-10-12 16:33:10 +08:00
liujiaqi 24c77a0d7e 【资源】杨戬音频 2021-10-09 16:39:45 +08:00
jiaoyangna ce39857111 杨戬新资源修改提交 2021-10-08 14:18:31 +08:00
gaoxin 2dca8dadf4 【资源】织女音效提交 2021-09-27 13:48:02 +08:00
liujiaqi f17f7cd6dc 【资源】织女技能字音效 2021-09-27 13:47:32 +08:00
liujiaqi cc33532a51 【资源】女儿国王皮肤音效 2021-10-01 18:06:48 +08:00
gaoxin f8cc4f5c73 【音效】治疗音效恢复 2021-08-19 21:02:34 +08:00
gaoxin 8f9f43adcb 【音效】缺失音效恢复 2021-08-19 20:29:43 +08:00
gaoxin 6bcc7cf775 【战斗】修复部分普攻音效缺失 2021-08-19 14:43:43 +08:00
jiaoyangna b75d869c8a 【资源优化】整理废弃的冗余资源,减少包体大小 2021-07-27 17:13:18 +08:00
jiaoyangna 9a4c92baa1 Revert "【ID1009762】"
This reverts commit c99394b54e.
2021-07-27 17:04:12 +08:00