jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9184852070
								
							
								
							
						 | 
						
							
							
								
								方寸寻宝添加音效
							
							
							
							
							
						 | 
						
							2021-12-07 14:41:09 +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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5fc9cc77a2
								
							
								
							
						 | 
						
							
							
								
								Revert "【ID1009762】"
							
							
							
							
							
							
							
							This reverts commit 99d668ae30. 
							
						 | 
						
							2021-07-27 17:03:52 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								99d668ae30
								
							
								
							
						 | 
						
							
							
								
								【ID1009762】
							
							
							
							
							
							
							
							【资源优化】整理废弃的冗余资源,减少包体大小 
							
						 | 
						
							2021-07-27 16:19:11 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c99394b54e
								
							
								
							
						 | 
						
							
							
								
								【ID1009762】
							
							
							
							
							
							
							
							【资源优化】整理废弃的冗余资源,减少包体大小 
							
						 | 
						
							2021-07-27 15:24:11 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								29825dbfc3
								
							
								
							
						 | 
						
							
							
								
								【音效】玉皇大帝技能音效添加
							
							
							
							
							
						 | 
						
							2021-06-25 10:47:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b0857d0c22
								
							
								
							
						 | 
						
							
							
								
								【音效】金吒技能音效上传
							
							
							
							
							
						 | 
						
							2021-06-23 17:26:06 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								530374e00b
								
							
								
							
						 | 
						
							
							
								
								【资源】循环引用资源优化
							
							
							
							
							
						 | 
						
							2021-06-10 22:53:11 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								43ae66d0d1
								
							
								
							
						 | 
						
							
							
								
								【音效】新增孙悟空,玉皇大帝,哪吒普攻特效,崇黑虎、蚩尤技能音效
							
							
							
							
							
						 | 
						
							2021-06-10 15:17:35 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								44303e89d3
								
							
								
							
						 | 
						
							
							
								
								【音频】替换
							
							
							
							
							
						 | 
						
							2021-06-03 17:23:40 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5265470298
								
							
								
							
						 | 
						
							
							
								
								【音效】新增人物音效
							
							
							
							
							
						 | 
						
							2021-06-02 21:18:19 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								653d9bbd06
								
							
								
							
						 | 
						
							
							
								
								【meta】
							
							
							
							
							
						 | 
						
							2021-05-26 13:43:11 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								9a8ee6cda4
								
							
								
							
						 | 
						
							
							
								
								【资源】玉皇大帝音效资源提交
							
							
							
							
							
						 | 
						
							2021-04-30 16:34:34 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								9cd895e8e9
								
							
								
							
						 | 
						
							
							
								
								【资源处理】meta文件提交,文件压缩优化
							
							
							
							
							
						 | 
						
							2021-04-12 15:00:57 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8291a48e73
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china_dev_merge' into xma_dev_b_merge
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta
#	Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta
#	Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta
#	Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont.meta
#	Assets/ManagedResources/Icon/ChengHao.meta
#	Assets/ManagedResources/Icon/ZuoQi.meta
#	Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
#	Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
#	Assets/ManagedResources/~Lua/View/FetterItem.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua 
							
						 | 
						
							2021-04-09 12:24:01 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c48ec346f8
								
							
								
							
						 | 
						
							
							
								
								音频 提交
							
							
							
							
							
						 | 
						
							2021-04-08 14:07:48 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								1a4c96e88d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/gx/china/dev_tr' into xma/dev-b
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png.meta
#	Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Framework/Framework.lua
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/WeekCard.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
#	Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua
#	Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerSkin.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
#	data_execl/Language_data/LanguageLua.csv
#	data_execl/Language_data/LanguageText.csv 
							
						 | 
						
							2021-04-02 11:34:27 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								4cfda03826
								
							
								
							
						 | 
						
							
							
								
								【音频】音效更新
							
							
							
							
							
						 | 
						
							2021-04-01 15:26:36 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ce91bc1ee8
								
							
								
							
						 | 
						
							
							
								
								【音频】新增音频资源导入
							
							
							
							
							
						 | 
						
							2021-03-31 14:09:52 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								284dae6de6
								
							
								
							
						 | 
						
							
							
								
								【音频】巨鲲音频资源更新
							
							
							
							
							
						 | 
						
							2021-03-27 17:30:29 +08:00 |