luyao
							
						 | 
						
							
							
							
							
								
							
								5200a8746b
								
							
								
							
						 | 
						
							
							
								
								气冲斗牛 技能名称 音效优化
							
							
							
							
							
						 | 
						
							2021-12-07 13:20:01 +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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								530374e00b
								
							
								
							
						 | 
						
							
							
								
								【资源】循环引用资源优化
							
							
							
							
							
						 | 
						
							2021-06-10 22:53:11 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								44303e89d3
								
							
								
							
						 | 
						
							
							
								
								【音频】替换
							
							
							
							
							
						 | 
						
							2021-06-03 17:23:40 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5265470298
								
							
								
							
						 | 
						
							
							
								
								【音效】新增人物音效
							
							
							
							
							
						 | 
						
							2021-06-02 21:18:19 +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 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								abd4028923
								
							
								
							
						 | 
						
							
							
								
								【meta】打包后meta文件上传
							
							
							
							
							
						 | 
						
							2021-03-09 16:04:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								150d00e064
								
							
								
							
						 | 
						
							
							
								
								【资源】法宝资源添加,meta文件提交
							
							
							
							
							
						 | 
						
							2021-01-30 13:23:06 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								805d8a7672
								
							
								
							
						 | 
						
							
							
								
								【音效】观音菩萨音效添加
							
							
							
							
							
						 | 
						
							2021-01-28 14:02:45 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f043773668
								
							
								
							
						 | 
						
							
							
								
								【资源】遗漏资源补齐
							
							
							
							
							
						 | 
						
							2020-12-26 19:56:59 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3292605ff6
								
							
								
							
						 | 
						
							
							
								
								【资源导入】 音效替换 2 个
							
							
							
							
							
						 | 
						
							2020-12-05 15:18:13 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								07cbb5f14f
								
							
								
							
						 | 
						
							
							
								
								【资源导入】 音效 三个
							
							
							
							
							
						 | 
						
							2020-12-05 15:18:06 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b8c6bf7a62
								
							
								
							
						 | 
						
							
							
								
								【白泽】音效修改
							
							
							
							
							
						 | 
						
							2020-11-10 15:46:26 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								0d56c34220
								
							
								
							
						 | 
						
							
							
								
								白泽灵兽语音修改
							
							
							
							
							
						 | 
						
							2020-11-10 15:28:25 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								53e538ea0d
								
							
								
							
						 | 
						
							
							
								
								【音效】 替换
							
							
							
							
							
						 | 
						
							2020-11-10 11:32:30 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5b0ac7cd0b
								
							
								
							
						 | 
						
							
							
								
								【音效】灵兽音效资源同步
							
							
							
							
							
						 | 
						
							2020-11-06 17:45:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								30697705be
								
							
								
							
						 | 
						
							
							
								
								每次销毁界面时清理一次不用的资源,界面打开音效配置添加
							
							
							
							
							
						 | 
						
							2020-09-04 10:03:35 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								492a1edc94
								
							
								
							
						 | 
						
							
							
								
								木吒语音替换 音频混音调整
							
							
							
							
							
						 | 
						
							2020-08-31 10:11:39 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								8445b33d18
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-08-27 18:32:07 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								c8280b455c
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-08-27 18:02:15 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								cd340bb0fc
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-08-27 17:49:31 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								b28309e14e
								
							
								
							
						 | 
						
							
							
								
								资源位置移动
							
							
							
							
							
						 | 
						
							2020-08-25 19:26:51 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								af6dcc4410
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-08-18 16:23:57 +08:00 | 
						
					
				
					
						
							
							
								 
								jl_ios
							
						 | 
						
							
							
							
							
								
							
								02b7e07d20
								
							
								
							
						 | 
						
							
							
								
								删除无用的sdk资源,bugly添加缺少的文件
							
							
							
							
							
						 | 
						
							2020-08-11 14:04:05 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								6c4dab9fbb
								
							
								
							
						 | 
						
							
							
								
								音頻跟新
							
							
							
							
							
						 | 
						
							2020-08-05 18:15:19 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								0c1250f88c
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-08-05 11:43:13 +08:00 |