|  wangzhenxing | 1361867887 | 【坐骑】=======四不像提交 | 2021-11-16 13:31:28 +08:00 | 
				
					
						|  gaoxin | 3131ffca2f | 【资源和谐】后台控制完成 | 2021-11-09 10:49:37 +08:00 | 
				
					
						|  gaoxin | 67da83d8b3 | 【资源】新和谐资源上传 | 2021-11-09 10:28:18 +08:00 | 
				
					
						|  gaoxin | 0ad86bba92 | 【坐骑】牛哥资源优化 | 2021-11-01 17:18:32 +08:00 | 
				
					
						|  gaoxin | 8a7b7c0ca3 | 【立绘】修复九尾狐动画闪烁的问题 | 2021-11-01 14:10:31 +08:00 | 
				
					
						|  gaoxin | 4e68982a6a | 【坐骑】新增九尾狐坐骑资源 | 2021-11-01 11:59:31 +08:00 | 
				
					
						|  gaoxin | 5a2d7abbfa | 【立绘】牛哥立绘压缩格式修改 | 2021-10-29 18:45:36 +08:00 | 
				
					
						|  jiaoyangna | 53e664c775 | 敖丙立绘提交 | 2021-10-29 17:47:58 +08:00 | 
				
					
						|  jiaoyangna | dafa14ffb0 | 坐骑资源修改提交 | 2021-10-15 13:44:49 +08:00 | 
				
					
						|  jiaoyangna | b886c7024c | 坐骑资源提交 | 2021-10-14 18:15:07 +08:00 | 
				
					
						|  jiaoyangna | 8b4f447466 | 坐骑立绘提交 | 2021-10-14 12:15:20 +08:00 | 
				
					
						|  gaoxin | 00db8bf660 | 【资源】女儿国王皮肤资源上传 | 2021-09-24 14:52:58 +08:00 | 
				
					
						|  gaoxin | 8fd74e7e99 | 【资源】坐骑麒麟live2d上传 | 2021-09-24 12:40:35 +08:00 | 
				
					
						|  gaoxin | 2fa2fe0a28 | 【织女】live2d资源没有透明通道 | 2021-09-07 18:26:43 +08:00 | 
				
					
						|  gaoxin | dec3a4d338 | 【资源】织女新立绘添加 | 2021-08-31 18:34:16 +08:00 | 
				
					
						|  gaoxin | eed381315d | 【提审】添加石矶提审服资源 | 2021-08-28 15:04:13 +08:00 | 
				
					
						|  gaoxin | a3f9967651 | 【提审服】精卫穿秋裤,慈航穿棉袄 | 2021-08-27 15:23:03 +08:00 | 
				
					
						|  jiaoyangna | f50caf3ff5 | 清理空文件夹 | 2021-07-29 11:28:30 +08:00 | 
				
					
						|  jiaoyangna | dd076dfb6a | 立绘删除 | 2021-07-29 11:25:36 +08:00 | 
				
					
						|  gaoxin | f2d8eec607 | 【资源】玉皇大帝皮肤资源优化 | 2021-06-21 16:27:15 +08:00 | 
				
					
						|  gaoxin | 01e033ad00 | 【资源】玉皇大帝皮肤资源 | 2021-06-21 15:14:02 +08:00 | 
				
					
						|  gaoxin | a61cd973b6 | 【立绘】优化 | 2021-06-02 21:40:22 +08:00 | 
				
					
						|  gaoxin | 23fb18745f | 【立绘】资源优化 | 2021-06-02 21:14:24 +08:00 | 
				
					
						|  gaoxin | 1856d1003b | 【立绘】精卫立绘修改 | 2021-06-02 20:52:54 +08:00 | 
				
					
						|  gaoxin | 5a849e7b17 | 【资源】立绘0043修改 | 2021-06-02 19:46:46 +08:00 | 
				
					
						|  gaoxin | c398659223 | 【立绘】精卫重做,地藏,迦楼罗,灵猫,罗刹,吕洞宾,木吒,改宽度,提交; | 2021-06-02 17:45:52 +08:00 | 
				
					
						|  gaoxin | 653d9bbd06 | 【meta】 | 2021-05-26 13:43:11 +08:00 | 
				
					
						|  gaoxin | f67e673401 | 【资源】立绘提交 | 2021-05-20 10:19:09 +08:00 | 
				
					
						|  gaoxin | c32e9a1007 | 【资源】新增立绘 资源 | 2021-05-18 17:47:47 +08:00 | 
				
					
						|  gaoxin | 913e10a309 | 【资源】修复小人乘坐骑时显示错误的问题 | 2021-05-11 16:20:32 +08:00 | 
				
					
						|  gaoxin | a4b0ad41b7 | 【资源】玉帝动作替换 | 2021-04-29 16:17:10 +08:00 | 
				
					
						|  gaoxin | 859d88822e | 【资源】立绘修改 | 2021-04-28 02:08:57 +08:00 | 
				
					
						|  gaoxin | e5d72d3b6b | 【资源】玉皇大帝资源导入 | 2021-04-27 23:28:21 +08:00 | 
				
					
						|  jiaoyangna | fb90162ae8 | 预设提交 (cherry picked from commit 941d3856a2) | 2021-04-27 22:28:49 +08:00 | 
				
					
						|  jiaoyangna | dd90a200c3 | 剧情提交 | 2021-04-27 20:45:03 +08:00 | 
				
					
						|  jiaoyangna | 059c9940cc | 资源提交 | 2021-04-27 16:16:41 +08:00 | 
				
					
						|  JieLing | 9cd895e8e9 | 【资源处理】meta文件提交,文件压缩优化 | 2021-04-12 15:00:57 +08:00 | 
				
					
						|  zhangqiang | 4b7bed573c | 【称号坐骑时装】小人立绘替换 | 2021-03-31 16:18:31 +08:00 | 
				
					
						|  zhangqiang | 9637337c39 | 【称号坐骑时装】 修改提交 | 2021-03-27 20:01:39 +08:00 | 
				
					
						|  zhangqiang | 095701c33f | 【称号时装坐骑】初提 | 2021-03-26 20:06:08 +08:00 | 
				
					
						|  zhangqiang | 4939c4da92 | 【称号坐骑时装】部分资源提交 | 2021-03-24 16:31:14 +08:00 | 
				
					
						|  gaoxin | 838a3c16b1 | 【spine】妲己资源替换 | 2021-03-18 15:00:09 +08:00 | 
				
					
						|  ZhangBiao | 86fdb9395b | Merge branch '0功能/本周版本优化内容' into china/dev # Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua | 2021-03-15 10:51:17 +08:00 | 
				
					
						|  JieLing | abd4028923 | 【meta】打包后meta文件上传 | 2021-03-09 16:04:18 +08:00 | 
				
					
						|  zhangqiang | c54e899684 | 【live2d导入】0025 | 2021-03-04 19:20:08 +08:00 | 
				
					
						|  zhangqiang | 4fadb8e763 | 【新live2d导入】缺0025 | 2021-03-04 15:56:29 +08:00 | 
				
					
						|  zhangqiang | 6bbb1c7671 | Revert "【新live2】导入 缺25" This reverts commit 7d8145a3b9. | 2021-03-04 15:16:46 +08:00 | 
				
					
						|  zhangqiang | 7d8145a3b9 | 【新live2】导入 缺25 | 2021-03-04 11:44:19 +08:00 | 
				
					
						|  jiaoyangna | a05694855c | Merge branch 'local_to_xmadev' into xma/dev # Conflicts:
#	Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/CompoundSelectListPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonActivatePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonUpGradePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/DiffMonsterBuy.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightMopUpEndPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua
#	Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua
#	Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightBuyExtraPopup.lua
#	Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchDataManager.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/ElementPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
#	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/BuffChoosePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/BuffOptionPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapOptionPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
#	Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildSkillReset.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonChipCompound.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua
#	Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCoinPurchasePart.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopExchangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/RewardSoulPrintSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPopUpV2.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyScorePageV2.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorOnePanel.lua
#	Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShowTechnologPanel.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua
#	Assets/ManagedResources/~Lua/View/JumpView.lua
#	Assets/ManagedResources/~Lua/View/ShopView.lua | 2021-02-20 17:55:52 +08:00 | 
				
					
						|  zhangqiang | 2b25d19602 | 【资源导入】 | 2021-02-18 17:59:43 +08:00 |