zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a9d251494c
								
							
								
							
						 | 
						
							
							
								
								【本地化】
							
							
							
							
							
						 | 
						
							2021-03-05 17:59:38 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								e9bd743af5
								
							
								
							
						 | 
						
							
							
								
								【本地化】
							
							
							
							
							
						 | 
						
							2021-03-05 17:18:07 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								91f1fefe1a
								
							
								
							
						 | 
						
							
							
								
								本地化提交
							
							
							
							
							
						 | 
						
							2021-03-05 16:06:51 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d1f18c39b3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
							
							
							
							
							
						 | 
						
							2021-03-05 14:01:03 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7c5fd4408e
								
							
								
							
						 | 
						
							
							
								
								本地化提交
							
							
							
							
							
						 | 
						
							2021-03-05 14:00:45 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								fec790a1e0
								
							
								
							
						 | 
						
							
							
								
								【宝物强化】
							
							
							
							
							
						 | 
						
							2021-03-05 13:54:08 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								29f1ae90e0
								
							
								
							
						 | 
						
							
							
								
								预设提交
							
							
							
							
							
						 | 
						
							2021-03-04 21:33:19 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ba7a5fbb18
								
							
								
							
						 | 
						
							
							
								
								本地化提交
							
							
							
							
							
						 | 
						
							2021-03-04 19:04:33 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								052767a836
								
							
								
							
						 | 
						
							
							
								
								【本地化】鸿蒙阵修改
							
							
							
							
							
						 | 
						
							2021-03-04 11:05:19 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								37dcb0d6ad
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
							
							
							
							
							
						 | 
						
							2021-03-03 18:07:38 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c7ab8fcb8b
								
							
								
							
						 | 
						
							
							
								
								【本地化】
							
							
							
							
							
						 | 
						
							2021-03-03 18:07:29 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								1e1c325229
								
							
								
							
						 | 
						
							
							
								
								【神将】
							
							
							
							
							
						 | 
						
							2021-03-03 17:45:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ea6e1f242c
								
							
								
							
						 | 
						
							
							
								
								灵兽界面修改提交
							
							
							
							
							
						 | 
						
							2021-03-02 21:06:42 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								bca617284b
								
							
								
							
						 | 
						
							
							
								
								【本地化】重置选择神将界面文字超框显示修改
							
							
							
							
							
						 | 
						
							2021-02-27 15:52:11 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d575bd1313
								
							
								
							
						 | 
						
							
							
								
								【本地化】升级,最大星级白片修改
							
							
							
							
							
						 | 
						
							2021-02-27 14:51:14 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								8a00efca60
								
							
								
							
						 | 
						
							
							
								
								共鸣  英雄界面 提交
							
							
							
							
							
						 | 
						
							2021-02-26 17:26:17 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								69a2253d12
								
							
								
							
						 | 
						
							
							
								
								装备提交
							
							
							
							
							
						 | 
						
							2021-02-25 18:36:50 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								58d0b7874f
								
							
								
							
						 | 
						
							
							
								
								【本地化】
							
							
							
							
							
						 | 
						
							2021-02-24 20:57:28 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								64e2464cf9
								
							
								
							
						 | 
						
							
							
								
								【本地化】预设位置调整
							
							
							
							
							
						 | 
						
							2021-02-23 17:04:52 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3674cdd886
								
							
								
							
						 | 
						
							
							
								
								【本地化】神将装备界面调整
							
							
							
							
							
						 | 
						
							2021-02-23 14:57:04 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								bec4de4ae2
								
							
								
							
						 | 
						
							
							
								
								【本地化】英雄界面下方页签调整
							
							
							
							
							
						 | 
						
							2021-02-23 14:20:39 +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 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								bb6e7c47a2
								
							
								
							
						 | 
						
							
							
								
								皮肤界面修改提交
							
							
							
							
							
						 | 
						
							2021-02-20 15:35:31 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								12356f5ed7
								
							
								
							
						 | 
						
							
							
								
								【本地化】预设提交
							
							
							
							
							
						 | 
						
							2021-01-26 17:48:24 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								7aac4cbd32
								
							
								
							
						 | 
						
							
							
								
								【1/11鸿蒙阵bug修改】
							
							
							
							
							
						 | 
						
							2021-01-11 21:04:12 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								f28818d4aa
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵修改】
							
							
							
							
							
						 | 
						
							2021-01-07 21:45:22 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								6c191263bd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' into 0功能/鸿蒙门阵
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/CommonProto.proto
#	Assets/ManagedResources/~Lua/Message/Expedition.proto
#	Assets/ManagedResources/~Lua/Message/Family.proto
#	Assets/ManagedResources/~Lua/Message/FightInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MapInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto.proto
#	Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua 
							
						 | 
						
							2021-01-06 20:05:35 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1cf3f17888
								
							
								
							
						 | 
						
							
							
								
								【优化】神将解锁锁定状态基本看不出来,让其更加明显
							
							
							
							
							
						 | 
						
							2020-12-29 14:23:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d85bd9c3aa
								
							
								
							
						 | 
						
							
							
								
								【优化】背包分类优化
							
							
							
							
							
						 | 
						
							2020-12-28 16:25:38 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								96f31b63ad
								
							
								
							
						 | 
						
							
							
								
								[优化]魂宝灵宝加号点击区域扩大
							
							
							
							
							
						 | 
						
							2020-12-26 19:45:44 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								e4596beb99
								
							
								
							
						 | 
						
							
							
								
								【宝物】==========宝物添加加号提示
							
							
							
							
							
						 | 
						
							2020-12-26 19:44:48 +09:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4b49661f24
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵】修改
							
							
							
							
							
						 | 
						
							2020-12-18 18:25:38 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								f84e97f531
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵选人界面】
							
							
							
							
							
						 | 
						
							2020-12-18 17:41:33 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								2a1546b7a4
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/鸿蒙门阵' of http://60.1.1.230/gaoxin/JL_Client into 0功能/鸿蒙门阵
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab 
							
						 | 
						
							2020-12-18 17:28:22 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								d7414a03bd
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵选人界面】
							
							
							
							
							
						 | 
						
							2020-12-18 17:24:03 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								00980feb57
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/鸿蒙门阵' of http://60.1.1.230/gaoxin/JL_Client into 0功能/鸿蒙门阵
							
							
							
							
							
						 | 
						
							2020-12-18 16:38:03 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								e09ed9fdfc
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵】 限制
							
							
							
							
							
						 | 
						
							2020-12-18 16:37:56 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								f744e609a1
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵剩余图片】
							
							
							
							
							
						 | 
						
							2020-12-18 16:31:28 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								21988be4e2
								
							
								
							
						 | 
						
							
							
								
								【觉醒】 觉醒成功替换资源
							
							
							
							
							
						 | 
						
							2020-11-13 11:18:46 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								cbf9f5cade
								
							
								
							
						 | 
						
							
							
								
								【觉醒】问题修改
							
							
							
							
							
						 | 
						
							2020-11-12 13:55:46 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								48e6d33b7b
								
							
								
							
						 | 
						
							
							
								
								【神将觉醒】 效果图 资源 提交
							
							
							
							
							
						 | 
						
							2020-11-10 17:29:38 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								92d85c4200
								
							
								
							
						 | 
						
							
							
								
								【神将升级】 升星未卡住 and  神将合成报错
							
							
							
							
							
						 | 
						
							2020-11-10 10:16:01 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6a1693939c
								
							
								
							
						 | 
						
							
							
								
								【觉醒】 觉醒添加图鉴
							
							
							
							
							
						 | 
						
							2020-11-09 20:05:51 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f94c84f1cd
								
							
								
							
						 | 
						
							
							
								
								【觉醒】 增加觉醒页签
							
							
							
							
							
						 | 
						
							2020-11-09 15:04:48 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								de677bee2f
								
							
								
							
						 | 
						
							
							
								
								【觉醒】增加脚本
							
							
							
							
							
						 | 
						
							2020-11-09 11:13:53 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								5c73587f89
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' into 0功能/神将觉醒
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua 
							
						 | 
						
							2020-11-09 10:16:16 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								68979d577e
								
							
								
							
						 | 
						
							
							
								
								【神将觉醒】 觉醒成功界面
							
							
							
							
							
						 | 
						
							2020-11-07 15:15:49 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3a481d6d5f
								
							
								
							
						 | 
						
							
							
								
								[皮肤]修改提交
							
							
							
							
							
						 | 
						
							2020-11-06 21:05:39 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								1a4349d93b
								
							
								
							
						 | 
						
							
							
								
								【觉醒】 界面提交
							
							
							
							
							
						 | 
						
							2020-11-06 16:23:02 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ccf02fb171
								
							
								
							
						 | 
						
							
							
								
								【皮肤】添加倒计时
							
							
							
							
							
						 | 
						
							2020-11-05 18:26:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6930561350
								
							
								
							
						 | 
						
							
							
								
								[皮肤]神将界面修改提交
							
							
							
							
							
						 | 
						
							2020-11-04 14:24:35 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4cb31d8f38
								
							
								
							
						 | 
						
							
							
								
								[皮肤]提交
							
							
							
							
							
						 | 
						
							2020-11-04 10:59:04 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e92e63444b
								
							
								
							
						 | 
						
							
							
								
								皮肤提交
							
							
							
							
							
						 | 
						
							2020-11-03 17:27:32 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								68c9726917
								
							
								
							
						 | 
						
							
							
								
								屏幕适配修改
							
							
							
							
							
						 | 
						
							2020-09-05 16:39:10 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								96e795c7c5
								
							
								
							
						 | 
						
							
							
								
								全屏界面  背景图片适配脚本  自行挂载
							
							
							
							
							
						 | 
						
							2020-09-05 14:22:53 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								bbd5d3bda2
								
							
								
							
						 | 
						
							
							
								
								成长基金
							
							
							
							
							
						 | 
						
							2020-09-04 17:50:50 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f6a3178926
								
							
								
							
						 | 
						
							
							
								
								xiugai
							
							
							
							
							
						 | 
						
							2020-09-04 17:34:59 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								56092d5572
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-04 17:21:51 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								d1e44c360d
								
							
								
							
						 | 
						
							
							
								
								xiugai
							
							
							
							
							
						 | 
						
							2020-09-04 17:21:16 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b3b001c0df
								
							
								
							
						 | 
						
							
							
								
								装备魂印黑边
							
							
							
							
							
						 | 
						
							2020-09-04 15:05:14 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								352f338abe
								
							
								
							
						 | 
						
							
							
								
								界面战力不一致
							
							
							
							
							
						 | 
						
							2020-09-03 16:03:14 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								b6c47a3762
								
							
								
							
						 | 
						
							
							
								
								当车迟抢夺编队为空时前端直接弹结果
							
							
							
							
							
						 | 
						
							2020-09-03 15:58:00 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								6e400a4db1
								
							
								
							
						 | 
						
							
							
								
								屏幕适配提交
							
							
							
							
							
						 | 
						
							2020-09-02 22:29:33 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7342bc3bd9
								
							
								
							
						 | 
						
							
							
								
								commit
							
							
							
							
							
						 | 
						
							2020-09-02 17:59:39 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b97569c645
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-02 17:22:22 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d2e94cfdea
								
							
								
							
						 | 
						
							
							
								
								hero compound and replace
							
							
							
							
							
						 | 
						
							2020-09-02 17:21:54 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								e415076e53
								
							
								
							
						 | 
						
							
							
								
								主界面适配资源替换
							
							
							
							
							
						 | 
						
							2020-09-02 17:04:44 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								e845bc5fe1
								
							
								
							
						 | 
						
							
							
								
								车迟  十绝阵 英雄详情 适配
							
							
							
							
							
						 | 
						
							2020-09-02 09:49:17 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								e5dd48c072
								
							
								
							
						 | 
						
							
							
								
								shipei
							
							
							
							
							
						 | 
						
							2020-09-01 19:53:59 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								97eaf77009
								
							
								
							
						 | 
						
							
							
								
								主界面底部界面经验条显示调整
							
							
							
							
							
						 | 
						
							2020-09-01 17:12:00 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								eeecbca77a
								
							
								
							
						 | 
						
							
							
								
								部分界面适配调整
							
							
							
							
							
						 | 
						
							2020-09-01 16:56:45 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								70a17dc502
								
							
								
							
						 | 
						
							
							
								
								法宝添加红点提示
							
							
							
							
							
						 | 
						
							2020-08-31 19:47:57 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6dec0b0307
								
							
								
							
						 | 
						
							
							
								
								修改公会技能升级 更新英雄战力
							
							
							
							
							
						 | 
						
							2020-08-26 20:56:28 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a5c401bd34
								
							
								
							
						 | 
						
							
							
								
								提交
							
							
							
							
							
						 | 
						
							2020-08-24 20:55:03 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6df142b067
								
							
								
							
						 | 
						
							
							
								
								修改bug  分解吞宝器  宝器穿的不显示属性   婚姻副本跳转   宝器合成背景隐藏
							
							
							
							
							
						 | 
						
							2020-08-17 11:39:41 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								783583404e
								
							
								
							
						 | 
						
							
							
								
								神将合成修改提交
							
							
							
							
							
						 | 
						
							2020-08-12 20:59:20 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								7b73f4ae77
								
							
								
							
						 | 
						
							
							
								
								升星成功界面加天赋解锁显示
							
							
							
							
							
						 | 
						
							2020-08-04 17:24:15 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								99f9e7169e
								
							
								
							
						 | 
						
							
							
								
								添加特效
							
							
							
							
							
						 | 
						
							2020-07-28 15:06:47 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1b9f8478cc
								
							
								
							
						 | 
						
							
							
								
								role gps star update
							
							
							
							
							
						 | 
						
							2020-07-27 16:49:13 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a688050060
								
							
								
							
						 | 
						
							
							
								
								修改星星提交
							
							
							
							
							
						 | 
						
							2020-07-25 14:21:33 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								064b819f4a
								
							
								
							
						 | 
						
							
							
								
								修改星星提交
							
							
							
							
							
						 | 
						
							2020-07-24 20:03:06 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								b0bee3f1d7
								
							
								
							
						 | 
						
							
							
								
								神将界面“全部”按钮
							
							
							
							
							
						 | 
						
							2020-07-06 18:37:29 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								9c698254a7
								
							
								
							
						 | 
						
							
							
								
								删除 英雄、战斗界面的特权显示
							
							
							
							
							
						 | 
						
							2020-07-06 17:10:49 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								abfbfc423b
								
							
								
							
						 | 
						
							
							
								
								心魔文字修改、成长基金开启条件修改、文字:传说修改、四元阵卡池显示修改、自选宝箱提示修改
							
							
							
							
							
						 | 
						
							2020-07-03 11:27:25 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								461c64b04a
								
							
								
							
						 | 
						
							
							
								
								svn逻辑同步
							
							
							
							
							
						 | 
						
							2020-07-02 14:53:44 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								d08552ca2f
								
							
								
							
						 | 
						
							
							
								
								外网0.16.13 内网0.15.24
							
							
							
							
							
						 | 
						
							2020-06-30 18:59:44 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								8c61581548
								
							
								
							
						 | 
						
							
							
								
								外网 0.16.10  内网 0.15.23
							
							
							
							
							
						 | 
						
							2020-06-28 17:48:49 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								d87ab3767e
								
							
								
							
						 | 
						
							
							
								
								内网 0.15.20
							
							
							
							
							
						 | 
						
							2020-06-23 18:36:24 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								cf5f3e9952
								
							
								
							
						 | 
						
							
							
								
								内网测试 0.15.12
							
							
							
							
							
						 | 
						
							2020-06-13 11:47:13 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								b499b77bbe
								
							
								
							
						 | 
						
							
							
								
								外网0.16.4版本热更
							
							
							
							
							
						 | 
						
							2020-06-08 13:57:30 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								59db757cf9
								
							
								
							
						 | 
						
							
							
								
								六月三号开发提交
							
							
							
							
							
						 | 
						
							2020-06-03 19:09:01 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								063868ce73
								
							
								
							
						 | 
						
							
							
								
								外网包 0.16.1
							
							
							
							
							
						 | 
						
							2020-05-25 19:16:23 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								266b9065d8
								
							
								
							
						 | 
						
							
							
								
								测试版本 带热更 0.15.1
							
							
							
							
							
						 | 
						
							2020-05-15 16:52:35 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								4c8d2cf8de
								
							
								
							
						 | 
						
							
							
								
								提交
							
							
							
							
							
						 | 
						
							2020-05-09 13:31:21 +08:00 |