luyao
							
						 | 
						
							
							
							
							
								
							
								845e1d33e5
								
							
								
							
						 | 
						
							
							
								
								修改 千战逐胜台 右侧按钮大小尺寸
							
							
							
							
							
						 | 
						
							2022-04-28 18:42:52 +08:00 | 
						
					
				
					
						
							
							
								 
								luyao
							
						 | 
						
							
							
							
							
								
							
								5188ade977
								
							
								
							
						 | 
						
							
							
								
								修改 千战逐胜台 的【挑战】按钮背景图片,更换了【今日免费挑战次数】的文字描述及位置
							
							
							
							
							
						 | 
						
							2022-04-28 18:03:25 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								cdd6baeb5f
								
							
								
							
						 | 
						
							
							
								
								巅峰赛星星修改提交
							
							
							
							
							
						 | 
						
							2021-11-05 13:35:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ac23ef4dbd
								
							
								
							
						 | 
						
							
							
								
								【界面优化】竞技场主界面、轩辕宝镜、抽到灵兽界面
							
							
							
							
							
						 | 
						
							2021-10-27 10:37:29 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								61c16f60f2
								
							
								
							
						 | 
						
							
							
								
								【优化】将竞技场赛季倒计时提示文字改为能看清的文字
							
							
							
							
							
						 | 
						
							2021-09-02 13:44:42 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								1006de499c
								
							
								
							
						 | 
						
							
							
								
								【巅峰赛】添加未解锁状态显示
							
							
							
							
							
						 | 
						
							2021-07-31 15:59:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								beea770b78
								
							
								
							
						 | 
						
							
							
								
								【竞技场】适配调整
							
							
							
							
							
						 | 
						
							2021-07-26 11:09:07 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								16596f733d
								
							
								
							
						 | 
						
							
							
								
								【竞技场】免费次数提示添加
							
							
							
							
							
						 | 
						
							2021-05-20 14:59:40 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ab7d045495
								
							
								
							
						 | 
						
							
							
								
								【适配】法宝 竞技场
							
							
							
							
							
						 | 
						
							2021-03-31 17:29:51 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								2bfccba248
								
							
								
							
						 | 
						
							
							
								
								【适配】魂印分解...
							
							
							
							
							
						 | 
						
							2021-03-31 14:03:18 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-98AVA47\Administrator
							
						 | 
						
							
							
							
							
								
							
								6cb88c4142
								
							
								
							
						 | 
						
							
							
								
								【本地化】
							
							
							
							
							
						 | 
						
							2020-09-24 16:44:30 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d62263859c
								
							
								
							
						 | 
						
							
							
								
								【本地化】竞技场界面时间修改
							
							
							
							
							
						 | 
						
							2021-03-07 16:28:45 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								ea3ad6d934
								
							
								
							
						 | 
						
							
							
								
								【本地化】
							
							
							
							
							
						 | 
						
							2021-03-05 16:26:39 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								1364517cfb
								
							
								
							
						 | 
						
							
							
								
								修改
							
							
							
							
							
						 | 
						
							2021-03-05 11:27:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f7a06a5783
								
							
								
							
						 | 
						
							
							
								
								竞技守卫修改
							
							
							
							
							
						 | 
						
							2021-03-02 18:05:06 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								54cfbac8fa
								
							
								
							
						 | 
						
							
							
								
								【本地化】巅峰赛白片
							
							
							
							
							
						 | 
						
							2021-03-02 10:57:07 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								aef41d8157
								
							
								
							
						 | 
						
							
							
								
								【本地化】
							
							
							
							
							
						 | 
						
							2021-03-01 16:18:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								df38aea68e
								
							
								
							
						 | 
						
							
							
								
								巅峰赛修改
							
							
							
							
							
						 | 
						
							2021-02-25 14:20:29 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								47e7f645eb
								
							
								
							
						 | 
						
							
							
								
								【本地化】竞技场显示优化
							
							
							
							
							
						 | 
						
							2021-01-29 14:27:33 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								9559607b51
								
							
								
							
						 | 
						
							
							
								
								【本地化】部分扫光特效处理,充值界面妖精文字改图标
							
							
							
							
							
						 | 
						
							2021-01-28 15:37:44 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								12356f5ed7
								
							
								
							
						 | 
						
							
							
								
								【本地化】预设提交
							
							
							
							
							
						 | 
						
							2021-01-26 17:48:24 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								9f9b2920e3
								
							
								
							
						 | 
						
							
							
								
								【战斗回放】
							
							
							
							
							
						 | 
						
							2021-01-08 19:19:01 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								694320d99c
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/1月6_版本优化' into master_develop
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/Effect_ls_08_jinwu_attack_02.controller.meta
#	Assets/ManagedResources/Atlas/DyAct_ShengXingYouLi/ArtFont.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_banner.png.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon1.png.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_zi.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon1.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi.meta
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_beijin.jpg.meta
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhezhao.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhuangbeidi.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_banner.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_icon1.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_icon2.png.meta
#	Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan.meta
#	Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Animation.meta
#	Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Animation/GameObject 7.controller.meta
#	Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture.meta
#	Assets/ManagedResources/EffectResSkill/Effect_ls_08_jinwu/Animation/Effect_ls_08_jinwu_attack_02_ctrl.controller
#	Assets/ManagedResources/EffectResSkill/Effect_ls_08_jinwu/Animation/Effect_ls_08_jinwu_attack_02_ctrl.controller.meta
#	Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab
#	Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua
#	Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	FontArt/ArtFont_zh/s_shengxingyouli_anniu_01_zh.png
#	FontArt/ArtFont_zh/s_shengxingyouli_anniu_02_zh.png
#	FontArt/中英文不一致资源/zh/s_shengxingyouli_banner_zh.png 
							
						 | 
						
							2020-12-31 14:53:17 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								383fa08e90
								
							
								
							
						 | 
						
							
							
								
								【竞技场】赢了我加分对方减分,输了无变化
							
							
							
							
							
							
							
							(cherry picked from commit 8f7cf8ca39dd8395a5b2b46eadb8d4f575289ce5) 
							
						 | 
						
							2021-01-14 21:14:04 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								80538ec42f
								
							
								
							
						 | 
						
							
							
								
								【竞技场】增加产出
							
							
							
							
							
						 | 
						
							2020-11-25 18:24:23 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d938acc273
								
							
								
							
						 | 
						
							
							
								
								【竞技场】增加输赢奖励掉落
							
							
							
							
							
						 | 
						
							2020-11-23 09:58:22 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								de32379f8e
								
							
								
							
						 | 
						
							
							
								
								【竞技场】竞技场增加输赢奖励
							
							
							
							
							
						 | 
						
							2020-11-07 18:52:04 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								56f5856a71
								
							
								
							
						 | 
						
							
							
								
								宝箱个数减负
							
							
							
							
							
						 | 
						
							2020-10-19 20:10:53 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4c5065ccf7
								
							
								
							
						 | 
						
							
							
								
								竞技场界面修改
							
							
							
							
							
						 | 
						
							2020-10-19 18:52:36 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								bae7d6550e
								
							
								
							
						 | 
						
							
							
								
								竞技场界面修改
							
							
							
							
							
						 | 
						
							2020-10-16 19:36:21 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								fbb558b44c
								
							
								
							
						 | 
						
							
							
								
								巅峰赛战斗结束界面适配
							
							
							
							
							
						 | 
						
							2020-09-07 15:40:19 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								21e7bf2e80
								
							
								
							
						 | 
						
							
							
								
								shi pei
							
							
							
							
							
						 | 
						
							2020-09-05 16:28:52 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								c35058767b
								
							
								
							
						 | 
						
							
							
								
								shi pei
							
							
							
							
							
						 | 
						
							2020-09-05 15:20:30 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								e5dd48c072
								
							
								
							
						 | 
						
							
							
								
								shipei
							
							
							
							
							
						 | 
						
							2020-09-01 19:53:59 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								064b819f4a
								
							
								
							
						 | 
						
							
							
								
								修改星星提交
							
							
							
							
							
						 | 
						
							2020-07-24 20:03:06 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								94684153c3
								
							
								
							
						 | 
						
							
							
								
								回放三局两胜显示
							
							
							
							
							
						 | 
						
							2020-07-23 18:06:55 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								99f885ac22
								
							
								
							
						 | 
						
							
							
								
								竞技场宝箱奖励位置可配
							
							
							
							
							
						 | 
						
							2020-07-20 16:01:16 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								c471a9ccd5
								
							
								
							
						 | 
						
							
							
								
								竞技场替换宝箱效果图替换
							
							
							
							
							
						 | 
						
							2020-07-20 11:28:19 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								70bbb3cee2
								
							
								
							
						 | 
						
							
							
								
								竞技场修改
							
							
							
							
							
						 | 
						
							2020-07-07 13:29:40 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								d87ab3767e
								
							
								
							
						 | 
						
							
							
								
								内网 0.15.20
							
							
							
							
							
						 | 
						
							2020-06-23 18:36:24 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								4c8d2cf8de
								
							
								
							
						 | 
						
							
							
								
								提交
							
							
							
							
							
						 | 
						
							2020-05-09 13:31:21 +08:00 |