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 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								aa40bb1775
								
							
								
							
						 | 
						
							
							
								
								【资源提交】 立绘 c_gyps_00020_s1  +  技能特效 Effect_tiannv
							
							
							
							
							
						 | 
						
							2021-02-18 17:06:24 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								e0788a63ce
								
							
								
							
						 | 
						
							
							
								
								【本地化】资源同步
							
							
							
							
							
						 | 
						
							2021-01-27 13:49:15 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								9a50a111c7
								
							
								
							
						 | 
						
							
							
								
								【资源导入】 白骨精皮肤例会  观音例会替换
							
							
							
							
							
						 | 
						
							2021-01-19 14:31:01 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								716ae8cdb7
								
							
								
							
						 | 
						
							
							
								
								【观音】live2d提交
							
							
							
							
							
						 | 
						
							2021-01-13 10:28:38 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								bd6ba2fa29
								
							
								
							
						 | 
						
							
							
								
								【资源导入】 通天教主 live2d  and  攻击特效
							
							
							
							
							
						 | 
						
							2021-01-11 15:08:53 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6f87cf04a8
								
							
								
							
						 | 
						
							
							
								
								【资源导入】  灵兽 金乌 live2d  and 三个音效
							
							
							
							
							
						 | 
						
							2021-01-08 15:21:24 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8d245aab44
								
							
								
							
						 | 
						
							
							
								
								【降妖夺宝】开坑
							
							
							
							
							
						 | 
						
							2020-12-21 17:13:05 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								282e557425
								
							
								
							
						 | 
						
							
							
								
								【资源导入】 猪八戒新皮肤 live2d
							
							
							
							
							
						 | 
						
							2020-12-18 11:21:59 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								e5b9abe11a
								
							
								
							
						 | 
						
							
							
								
								【资源导入】 live2d  新将  + 新灵兽
							
							
							
							
							
						 | 
						
							2020-12-05 15:17:56 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2a9b4cb5ab
								
							
								
							
						 | 
						
							
							
								
								动态立绘修改
							
							
							
							
							
						 | 
						
							2020-11-19 11:49:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								79a5bcb74c
								
							
								
							
						 | 
						
							
							
								
								皮肤资源提交
							
							
							
							
							
						 | 
						
							2020-11-04 12:02:57 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								04ba352791
								
							
								
							
						 | 
						
							
							
								
								【资源】 修改资源路径
							
							
							
							
							
						 | 
						
							2020-11-02 19:54:12 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								3cdc100777
								
							
								
							
						 | 
						
							
							
								
								【社稷大典/灵兽】特效资源重新整理
							
							
							
							
							
						 | 
						
							2020-11-01 17:00:39 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3479bd153c
								
							
								
							
						 | 
						
							
							
								
								【灵兽系统】 合并 功能ok 但是战斗合完进不去
							
							
							
							
							
						 | 
						
							2020-10-31 17:01:46 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								b28309e14e
								
							
								
							
						 | 
						
							
							
								
								资源位置移动
							
							
							
							
							
						 | 
						
							2020-08-25 19:26:51 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ecd7717cf1
								
							
								
							
						 | 
						
							
							
								
								commit spine
							
							
							
							
							
						 | 
						
							2020-08-24 16:26:05 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4b59561b3d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/BG/UI/MainScene/xuanwo_002.png.meta 
							
						 | 
						
							2020-08-24 16:08:01 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6013365ad1
								
							
								
							
						 | 
						
							
							
								
								剑影仙踪特效更新
							
							
							
							
							
						 | 
						
							2020-08-24 16:07:08 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								2abfd842cf
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-08-24 15:01:26 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								dedeab993b
								
							
								
							
						 | 
						
							
							
								
								commit spine
							
							
							
							
							
						 | 
						
							2020-08-24 14:58:30 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3675b3e8a0
								
							
								
							
						 | 
						
							
							
								
								spine commit
							
							
							
							
							
						 | 
						
							2020-08-24 14:54:33 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								395c41ef79
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'temp' into master_develop
							
							
							
							
							
						 | 
						
							2020-08-24 14:36:54 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ada573a8d0
								
							
								
							
						 | 
						
							
							
								
								00042 commit
							
							
							
							
							
						 | 
						
							2020-08-24 11:29:13 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								78c3a0fcbd
								
							
								
							
						 | 
						
							
							
								
								spine commit
							
							
							
							
							
						 | 
						
							2020-08-24 11:23:52 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								4f8026425d
								
							
								
							
						 | 
						
							
							
								
								sdk添加上传新手数据的接口
							
							
							
							
							
						 | 
						
							2020-08-22 19:14:58 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e2b2517ad0
								
							
								
							
						 | 
						
							
							
								
								live2d commit
							
							
							
							
							
						 | 
						
							2020-08-18 15:42:21 +08:00 |