ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								afa857f134
								
							
								
							
						 | 
						
							
							
								
								【灵兽优化】灵兽升星需求数字移动至ICON下方
							
							
							
							
							
						 | 
						
							2021-09-13 19:53:05 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								20451e4282
								
							
								
							
						 | 
						
							
							
								
								【灵兽山升级】战力上升和属性提升对不上,斜着显示
							
							
							
							
							
						 | 
						
							2021-08-20 12:01:17 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ddb9197a3e
								
							
								
							
						 | 
						
							
							
								
								【适配】灵兽信息界面
							
							
							
							
							
						 | 
						
							2021-08-04 16:38:54 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4e2463723a
								
							
								
							
						 | 
						
							
							
								
								【灵兽】特效添加
							
							
							
							
							
						 | 
						
							2021-06-26 14:50:52 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								097cf4055f
								
							
								
							
						 | 
						
							
							
								
								【灵兽界面优化】优化界面效果
							
							
							
							
							
						 | 
						
							2021-06-24 14:47:54 +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 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ae17483a8e
								
							
								
							
						 | 
						
							
							
								
								灵兽 修改提交
							
							
							
							
							
						 | 
						
							2021-04-01 14:56:47 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								d131bdbadd
								
							
								
							
						 | 
						
							
							
								
								【适配】
							
							
							
							
							
						 | 
						
							2021-03-31 18:28:46 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8aa411244e
								
							
								
							
						 | 
						
							
							
								
								灵兽秘卷修改提交
							
							
							
							
							
						 | 
						
							2021-03-25 16:21:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								776353406d
								
							
								
							
						 | 
						
							
							
								
								灵兽提交
							
							
							
							
							
						 | 
						
							2021-03-25 14:05:58 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								cdc8d468cb
								
							
								
							
						 | 
						
							
							
								
								【灵兽界面】文字问题
							
							
							
							
							
						 | 
						
							2021-03-09 15:34:29 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								141e60d493
								
							
								
							
						 | 
						
							
							
								
								【本地化】修复灵兽装备按钮默认显示英文的问题
							
							
							
							
							
						 | 
						
							2021-03-09 15:00:59 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								99dcf2ed40
								
							
								
							
						 | 
						
							
							
								
								灵兽等级显示错误修改
							
							
							
							
							
						 | 
						
							2021-03-07 15:16:40 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								21e0998228
								
							
								
							
						 | 
						
							
							
								
								图片提交
							
							
							
							
							
						 | 
						
							2021-03-04 20:17:22 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ba7a5fbb18
								
							
								
							
						 | 
						
							
							
								
								本地化提交
							
							
							
							
							
						 | 
						
							2021-03-04 19:04:33 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								1ffe352007
								
							
								
							
						 | 
						
							
							
								
								【灵兽】
							
							
							
							
							
						 | 
						
							2021-03-03 16:59:52 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ea6e1f242c
								
							
								
							
						 | 
						
							
							
								
								灵兽界面修改提交
							
							
							
							
							
						 | 
						
							2021-03-02 21:06:42 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								eee28b7a6c
								
							
								
							
						 | 
						
							
							
								
								【本地化】
							
							
							
							
							
						 | 
						
							2021-03-02 17:45:04 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f07c4c3952
								
							
								
							
						 | 
						
							
							
								
								字体修改提交
							
							
							
							
							
						 | 
						
							2021-03-01 17:06:03 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e953005b6e
								
							
								
							
						 | 
						
							
							
								
								活动排行  灵兽抽卡  修改
							
							
							
							
							
						 | 
						
							2021-02-25 10:41:07 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ee8a721624
								
							
								
							
						 | 
						
							
							
								
								灵兽抽卡修改
							
							
							
							
							
						 | 
						
							2021-02-24 18:00:19 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								16a4fa4dde
								
							
								
							
						 | 
						
							
							
								
								【本地化】灵兽界面 福利界面
							
							
							
							
							
						 | 
						
							2021-02-24 17:36:24 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								74185b0d1b
								
							
								
							
						 | 
						
							
							
								
								【本地化】
							
							
							
							
							
						 | 
						
							2021-02-24 11:23:53 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								29aa15c12f
								
							
								
							
						 | 
						
							
							
								
								【本地化】灵兽界面调整
							
							
							
							
							
						 | 
						
							2021-02-24 10:04:28 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								12356f5ed7
								
							
								
							
						 | 
						
							
							
								
								【本地化】预设提交
							
							
							
							
							
						 | 
						
							2021-01-26 17:48:24 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								0918acadd4
								
							
								
							
						 | 
						
							
							
								
								【灵兽系统】 羁绊预设微调
							
							
							
							
							
						 | 
						
							2020-11-03 16:10:45 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								5d6db87650
								
							
								
							
						 | 
						
							
							
								
								【灵兽系统】召唤界面 按钮位置有问题
							
							
							
							
							
						 | 
						
							2020-11-03 14:51:58 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f8b4befd3c
								
							
								
							
						 | 
						
							
							
								
								【灵兽系统】 按钮位置调整
							
							
							
							
							
						 | 
						
							2020-11-03 14:17:33 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								5eaa5a725d
								
							
								
							
						 | 
						
							
							
								
								[灵兽抽卡]灵兽抽卡显示修改
							
							
							
							
							
						 | 
						
							2020-11-02 17:19:06 +09:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								65b5cff36d
								
							
								
							
						 | 
						
							
							
								
								【灵兽系统】 修改bug
							
							
							
							
							
						 | 
						
							2020-11-02 16:17:33 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								52fbe638f6
								
							
								
							
						 | 
						
							
							
								
								[灵兽]灵兽聚灵结果界面再来一次添加妖晶抽卡限制次数
							
							
							
							
							
						 | 
						
							2020-11-02 13:59:55 +09:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4cb30990e1
								
							
								
							
						 | 
						
							
							
								
								【灵兽系统】 bug 需同步
							
							
							
							
							
						 | 
						
							2020-11-02 11:52:00 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								1cb323a700
								
							
								
							
						 | 
						
							
							
								
								【灵兽系统】 预设修改
							
							
							
							
							
						 | 
						
							2020-11-02 10:16:36 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3479bd153c
								
							
								
							
						 | 
						
							
							
								
								【灵兽系统】 合并 功能ok 但是战斗合完进不去
							
							
							
							
							
						 | 
						
							2020-10-31 17:01:46 +08:00 |