diff --git a/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelTrialPanel.prefab b/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelTrialPanel.prefab index b7c01b9636..ac41b45ba1 100644 --- a/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelTrialPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelTrialPanel.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 5882509550733003597} - component: {fileID: 1338573791305830314} - component: {fileID: 3454583191700554060} - - component: {fileID: 7326837627768657368} m_Layer: 0 m_Name: num m_TagString: Untagged @@ -81,26 +80,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: 20 LanguageIndex: 0 ---- !u!114 &7326837627768657368 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 589025226811681702} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!1 &731759361293930974 GameObject: m_ObjectHideFlags: 0 @@ -524,9 +503,9 @@ RectTransform: m_Father: {fileID: 2732743975332295968} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 66.5, y: -2.1} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5963966442030474676 @@ -1110,9 +1089,9 @@ RectTransform: m_Father: {fileID: 2732743975332295968} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 143.9, y: -2.1} m_SizeDelta: {x: 54, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5286972798472470661 @@ -2150,9 +2129,9 @@ RectTransform: m_Father: {fileID: 2732743975332295968} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 198.2, y: 0} m_SizeDelta: {x: 72, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6028838922005613474 @@ -2562,7 +2541,6 @@ GameObject: - component: {fileID: 2732743975332295968} - component: {fileID: 3630629496191085909} - component: {fileID: 3993345382168488335} - - component: {fileID: 8987521599186261658} m_Layer: 0 m_Name: text m_TagString: Untagged @@ -2630,29 +2608,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!114 &8987521599186261658 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8385209400641795231} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 260 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 0 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 --- !u!1 &8455067267669732485 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index d8dfc57e42..c0cc9c69f2 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1188,7 +1188,6 @@ ActivityTypeDef = { FifteenDayGift = 64,--十五日登陆 YunYouShangRen = 65,--云游商人 TaSuiLingXiao = 66, --踏碎凌霄 - ShanHeShiLian = 99,--山河试炼 --主题活动 ShengXingYouLi=50,--升星有礼(指定猎妖师进阶) diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua index 449b13c4e5..365b47437f 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua @@ -318,8 +318,4 @@ function this.SetChapterBoxRewardData(_chapterId,_Id,_state) end end end - ---========================= 山河试炼专用 =============================== ---===================================================================== - return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua index e3471460c5..3ca4993a7e 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua @@ -1,32 +1,9 @@ require("Base/BasePanel") local FightLevelTrialPanel = Inherit(BasePanel) -local STATE = { - [0] = {Img = "s_slbz_1anniuhuise",text = Language[11948]}, - [1] = {Img = "s_slbz_1anniuongse",text = Language[11948]}, - [2] = {Img = "s_slbz_1anniuhuise",text = Language[10101]}, -} --初始化组件(用于子类重写) function FightLevelTrialPanel:InitComponent() - self.spLoader = SpriteLoader.New() - self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.transform) self.btnBack = Util.GetGameObject(self.gameObject,"BackBtn") - self.nextStar = Util.GetGameObject(self.gameObject,"bg/text/num"):GetComponent("Text") - self.curStar = Util.GetGameObject(self.gameObject,"goBtn/num"):GetComponent("Text") - self.Scroll = Util.GetGameObject(self.gameObject,"Scroll") - self.leftTime = Util.GetGameObject(self.gameObject,"LeftTime"):GetComponent("Text") - self.itemPre = Util.GetGameObject(self.gameObject,"itemPre") - self.goBtn = Util.GetGameObject(self.gameObject,"goBtn") - - self.helpBtn = Util.GetGameObject(self.gameObject, "helpBtn") - self.helpPosition = self.helpBtn:GetComponent("RectTransform").localPosition - - local rootHight = self.Scroll.transform.rect.height - local width = self.Scroll.transform.rect.width - self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.Scroll.transform, - self.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 0)) - self.ScrollView.moveTween.MomentumAmount = 1 - self.ScrollView.moveTween.Strength = 2 end --绑定事件(用于子类重写) @@ -34,14 +11,6 @@ function FightLevelTrialPanel:BindEvent() Util.AddClick(self.btnBack, function() self:ClosePanel() end) - - Util.AddClick(self.goBtn, function() - UIManager.OpenPanel(UIName.FightLevelChapterPanel) - end) - - Util.AddClick(self.helpBtn, function() - UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.Practice, self.helpPosition.x,self.helpPosition.y) - end) end @@ -63,7 +32,6 @@ function FightLevelTrialPanel:OnShow() end function FightLevelTrialPanel:Refresh() - self.actData = CommonActPageManager.GetData(ActivityTypeDef.ShanHeShiLian) end diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 746c42aed0..e590be7580 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -124,28 +124,6 @@ local TypeUpdateFunc = { local curData = dataList[ActivityTypeDef.DynamicAct] this.InitTaskData(curData,TaskTypeDef.DynamicActTask,ConfigName.ThemeActivityTaskConfig) end, - --山河试炼 - [ActivityTypeDef.ShanHeShiLian] = function ()--山河试炼 - local curData = dataList[ActivityTypeDef.ShanHeShiLian] - local configData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",curData.activityId) - for i = 1, #curData.rewards do - for j = 1, #configData do - if curData.rewards[i].missionId == configData[j].Id then - curData.rewards[i].otherData.Values = configData[j].Values - curData.rewards[i].otherData.Reward = configData[j].Reward - curData.rewards[i].otherData.Sort = configData[j].Sort - end - end - end - - table.sort(curData.rewards,function (a,b) - if a.state == b.state then - return a.missionId < b.missionId - else - return a.state < b.state - end - end) - end, } function this.InitTaskData(curData,taskType,configName) @@ -278,11 +256,7 @@ function this.GetExpertData(indexType,actType) else curData.rewards[i].otherData.state = 3 end - end - if PlayerManager.level >= curData.rewards[i].otherData.Values then - curData.rewards[i].otherData.info = string.format("%s/%s",curData.rewards[i].otherData.Values,curData.rewards[i].otherData.Values) - else - curData.rewards[i].otherData.info = string.format("%s/%s",PlayerManager.level,curData.rewards[i].otherData.Values) + curData.rewards[i].otherData.info = string.format("剩余:%s",curData.rewards[i].progress) end else --日累计充值 达人 if actType == ActivityTypeDef.AccumulativeRechargeExper or actType == ActivityTypeDef.DynamicAct_recharge then