From 615caa5bd14927cef3a1806f160bf4b05190f3b9 Mon Sep 17 00:00:00 2001 From: vurtne14 Date: Fri, 20 Mar 2026 10:26:32 +0800 Subject: [PATCH 1/2] 1 --- .../ManagedResources/~Lua/Data/ConfigData.lua | 1 + .../Modules/NewShenZun/ActivityChongRank.lua | 122 ++++++++++++- .../NiuQiChongTian/NiuQiChongTianManager.lua | 70 ++++---- .../NiuQiChongTian/NiuQiChongTianPanel.lua | 127 +++++++------- .../~Lua/Modules/Ranking/RankingManager.lua | 162 +++++++++++++----- 5 files changed, 338 insertions(+), 144 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Data/ConfigData.lua b/Assets/ManagedResources/~Lua/Data/ConfigData.lua index e538faa74d..7962bb4c53 100644 --- a/Assets/ManagedResources/~Lua/Data/ConfigData.lua +++ b/Assets/ManagedResources/~Lua/Data/ConfigData.lua @@ -269,6 +269,7 @@ ConfigName = { GMInfo="GMInfo", GMMaster="GMMaster", ChongRank="ChongRank", + ChongRankReward="ChongRankReward", ChongRankInfo="ChongRankInfo", ChongRankInformation ="ChongRankInformation", ChangingCardStar = "ChangingCardStar", diff --git a/Assets/ManagedResources/~Lua/Modules/NewShenZun/ActivityChongRank.lua b/Assets/ManagedResources/~Lua/Modules/NewShenZun/ActivityChongRank.lua index a98660378b..94c4d4ebff 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewShenZun/ActivityChongRank.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewShenZun/ActivityChongRank.lua @@ -12,22 +12,31 @@ local rankType = 0 local ownRank = 0 local isFirst = false local _TabData = { - [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[11924] }, - [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[11925] } + [1] = { default = "sz_weixuanzhong", select = "sz_xuanzhong", name = Language[11924] }, + [2] = { default = "sz_weixuanzhong", select = "sz_xuanzhong", name = Language[11925] }, + [3] = { default = "sz_weixuanzhong", select = "sz_xuanzhong", name = Language[11925] } +} +local BtnState = { + [0] = { ImgName = "s_slbz_1anniuhuangse", Text = Language[10505] }, + [1] = { ImgName = "s_slbz_1anniuongse", Text = Language[10024] }, + [2] = { ImgName = "s_slbz_1anniuhuise", Text = Language[10025] }, } - function this:InitComponent() this.spLoader = SpriteLoader.New() + this.itemsGrid = {} --item重复利用 this.backBtn = Util.GetGameObject(self.gameObject, "bg/btn_close") this.titleImg = Util.GetGameObject(self.gameObject, "bg/name"):GetComponent("Image") this.leftTimeTxt = Util.GetGameObject(self.gameObject, "bg/Image/timebg"):GetComponent("Text") this.grid = Util.GetGameObject(self.gameObject, "bg/tabScroll/grid") this.btnItem = Util.GetGameObject(self.gameObject, "bg/tabBtnPre") this.rewardItem = Util.GetGameObject(self.gameObject, "bg/Rank") + this.rankRewardItem = Util.GetGameObject(self.gameObject, "bg/rewardPre") this.rankItem = Util.GetGameObject(self.gameObject, "bg/Rank2") this.selectObj = Util.GetGameObject(self.gameObject, "bg/tabSelectBtn") this.infoTxt = Util.GetGameObject(self.gameObject, "bg/title/infoTxt"):GetComponent("Text") + this.rankTxt = Util.GetGameObject(self.gameObject, "bg/title/Text") this.rewardGrid = Util.GetGameObject(self.gameObject, "bg/rewardGrid") + this.rankRewardGrid = Util.GetGameObject(self.gameObject, "bg/rankRewardGrid") this.rankGrid = Util.GetGameObject(self.gameObject, "bg/rankGrid") this.selectTxt = Util.GetGameObject(self.gameObject, "bg/tabSelectBtn/Text"):GetComponent("Text") this.tabBox = Util.GetGameObject(self.gameObject, "bg/TabBox") @@ -40,6 +49,14 @@ function this:InitComponent() this.ScrollView.moveTween.MomentumAmount = 1 this.ScrollView.moveTween.Strength = 2 this.ScrollView.elastic = false + + this.RankRwardScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.rankRewardGrid.transform, + this.rankRewardItem, nil, + Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 0)) + this.RankRwardScrollView.moveTween.MomentumAmount = 1 + this.RankRwardScrollView.moveTween.Strength = 2 + this.RankRwardScrollView.elastic = false + --local rootHight2 = this.rankGrid.transform.rect.height --local width2 = this.rankGrid.transform.rect.width this.rankScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.rankGrid.transform, this.rankItem, nil, @@ -147,11 +164,13 @@ function this.TabBtnOnClick(config, btn) --this:OnClose() state = 3 this.ChangeWindow(config) + --this.TabCtrl:ChangeTab(1) end end, 1, -1, true) this.timer:Start() end - this.ChangeWindow(config) + --this.ChangeWindow(config) + this.TabCtrl:ChangeTab(1) end function this.ChangeWindow(config) @@ -179,8 +198,10 @@ function this.ChangeWindow(config) LogError("ranks len=======" .. #ranks) --this.SetRoleRank(ranks,myRank,true,true) if type == 1 then + this.rankTxt:SetActive(true) this.rewardGrid:SetActive(false) this.rankGrid:SetActive(true) + this.rankRewardGrid:SetActive(false) this.infoTxt.text = Language[11928] -- RankingManager.InitData(config.RankType,function() -- rankType=config.RankType @@ -192,8 +213,10 @@ function this.ChangeWindow(config) -- end,0,1) elseif type == 2 then local list = {} + this.rankTxt:SetActive(true) this.rewardGrid:SetActive(true) this.rankGrid:SetActive(false) + this.rankRewardGrid:SetActive(false) this.infoTxt.text = Language[10073] for _, configInfo in ConfigPairs(rankConfig) do if configInfo.ChongRankInfoID == config.Id then @@ -204,6 +227,17 @@ function this.ChangeWindow(config) this.ScrollView:SetData(list, function(index, go) this.UpdateRewardInfo(go, list[index]) end, false) + elseif type == 3 then + local list = RankingManager.GetNeedRewardData(config.Id) + --local list = RankingManager.GetNeedRewardData(4) + this.rankTxt:SetActive(false) + this.rewardGrid:SetActive(false) + this.rankGrid:SetActive(false) + this.rankRewardGrid:SetActive(true) + this.infoTxt.text = Language[10073] + this.RankRwardScrollView:SetData(list, function(index, go) + this.UpdateRankReward(go, list[index]) + end, false) end end, 0, 1) end @@ -228,7 +262,11 @@ function this.TabAdapter(tab, index, status) local tabLab = Util.GetGameObject(tab, "Text") Util.GetGameObject(tab, "Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite(_TabData[index][status]) tabLab:GetComponent("Text").text = _TabData[index].name - --tabLab:GetComponent("Text").color = _TabFontColor[status] + if index == 3 then + local list = RankingManager.GetNeedRewardData(curConfig.Id) + --local list = RankingManager.GetNeedRewardData(4) + tab.gameObject:SetActive(#list > 0) + end end --切换视图 @@ -240,6 +278,7 @@ function this.SwitchView(index) return end if isFirst then + isFirst = false this.TabBtnOnClick(curConfig, this.btnList[curConfig.Id]) return end @@ -290,6 +329,73 @@ function this.UpdateRewardInfo(go, data) end end +function this.UpdateRankReward(go, data) + local title = Util.GetGameObject(go, "title/titleText"):GetComponent("Text") + local btn = Util.GetGameObject(go, "btn"):GetComponent("Button") + local btnImg = Util.GetGameObject(go, "btn"):GetComponent("Image") + local btnText = Util.GetGameObject(go, "btn/Text"):GetComponent("Text") + local redPoint = Util.GetGameObject(go, "btn/redPoint") + local rewardList = Util.GetGameObject(go, "rewardList") + local grid = Util.GetGameObject(go, "rewardList") + local shadow = Util.GetGameObject(go, "shadow") + local progress = Util.GetGameObject(go, "progress"):GetComponent("Text") + + local shows = data.Reward + title.text = GetLanguageStrById(data.Text) + redPoint:SetActive(data.state == 1) + btn.interactable = data.state ~= 2 + btnImg.sprite = this.spLoader:LoadSprite(BtnState[data.state].ImgName) + btnText.text = BtnState[data.state].Text + if data.state == 0 then + progress.gameObject:SetActive(true) + progress.text = string.format("%s/%s", data.progress, data.value) + else + progress.gameObject:SetActive(false) + end + --滚动条复用重设itemview + if this.itemsGrid[go] then + for i = 1, 4 do + this.itemsGrid[go][i].gameObject:SetActive(false) + end + for i = 1, #shows do + if this.itemsGrid[go][i] then + this.itemsGrid[go][i]:OnOpen(false, { shows[i][1], shows[i][2] }, 0.9, false, false, false, sortingOrder) + this.itemsGrid[go][i].gameObject:SetActive(true) + end + end + else + this.itemsGrid[go] = {} + for i = 1, 4 do + this.itemsGrid[go][i] = SubUIManager.Open(SubUIConfig.ItemView, grid.transform) + this.itemsGrid[go][i].gameObject:SetActive(false) + local obj = newObjToParent(shadow, this.itemsGrid[go][i].transform) + obj.transform:SetAsFirstSibling() + obj.transform:DOAnchorPos(Vector3(0, -3, 0), 0) + obj:GetComponent("RectTransform").transform.localScale = Vector3.one * 1.1 + obj.gameObject:SetActive(true) + obj.transform:SetSiblingIndex(0) + end + for i = 1, #shows do + this.itemsGrid[go][i]:OnOpen(false, { shows[i][1], shows[i][2] }, 0.9, false, false, false, sortingOrder) + this.itemsGrid[go][i].gameObject:SetActive(true) + end + end + + Util.AddOnceClick(btn.gameObject, function() + if data.state == 0 then + JumpManager.GoJump(data.jumpId) + elseif data.state == 1 then + NetManager.TakeMissionRewardRequest(TaskTypeDef.NiuQiChongTian, data.id, function(msg) + UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1, function() + CheckRedPointStatus(RedPointType.NiuQiChongTian + self.curPage) + CheckRedPointStatus(RedPointType.NiuQiChongTian_4) + self:SwitchView(self.curPage, true) + end) + end) + end + end) +end + -- 设置玩家排行 function this.SetRoleRank(ranks, myRankInfo, isTop, isAnim) --if #ranks == 0 or not ranks then Log("木有排行信息") return end @@ -435,9 +541,15 @@ function this:OnDestroy() self.timer:Stop() self.timer = nil end + for k, v in pairs(self.itemsGrid) do + for i = 1, #v do + SubUIManager.Close(v[i]) + end + end curConfig = nil SubUIManager.Close(this.ScrollView) SubUIManager.Close(this.rankScrollView) + SubUIManager.Close(this.RankRwardScrollView) end return this diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua index 91773a8197..27d38193f3 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua @@ -7,7 +7,7 @@ local itemId = 0 function this.Initialize() this.InitAllRewardData() - Game.GlobalEvent:AddEvent(GameEvent.Mission.NiuQiChongTianTask,this.UpdateStatus) + Game.GlobalEvent:AddEvent(GameEvent.Mission.NiuQiChongTianTask, this.UpdateStatus) -- this.IsNewActivity = false end @@ -21,7 +21,8 @@ function this.GetScore() local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.NiuQi) if not (ActData and ActData.activityId) then return end if #this.configData == 0 then - local config = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",ActData.activityId) + local config = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig, "ActivityId", + ActData.activityId) for i = 1, #config do local data = {} itemId = config[i].Values[1][1] @@ -30,7 +31,7 @@ function this.GetScore() data.value = config[i].Values data.activityId = ActData.activityId data.state = 0 - table.insert(this.configData,data) + table.insert(this.configData, data) end end curScore = BagManager.GetTotalItemNum(itemId) @@ -39,14 +40,14 @@ function this.GetScore() for key, value in pairs(ActData.mission) do if value.missionId and value.missionId == this.configData[i].missionId then if value.state == 0 then - this.configData[i].state = 1--可领的 + this.configData[i].state = 1 --可领的 else - this.configData[i].state = 2--领完的 + this.configData[i].state = 2 --领完的 end end end else - this.configData[i].state = 0--不可领的 + this.configData[i].state = 0 --不可领的 end end return curScore @@ -55,22 +56,22 @@ end --所有的任务信息数据 function this.InitAllRewardData() local ArroGantFly = ConfigManager.GetConfig(ConfigName.ArroGantFly) - for k,v in ConfigPairs(ArroGantFly) do - table.insert(this.rewardData,this.CreatSingleData(v)) + for k, v in ConfigPairs(ArroGantFly) do + table.insert(this.rewardData, this.CreatSingleData(v)) end end function this.GetRewardDataById(id) - for k,v in ipairs(this.rewardData) do + for k, v in ipairs(this.rewardData) do if v.id == id then - return v + return v end end end function this.UpdateStatus() local temp = TaskManager.GetTypeTaskList(TaskTypeDef.NiuQiChongTian) - for k,v in ipairs(temp) do + for k, v in ipairs(temp) do local data = this.GetRewardDataById(v.missionId) if data then data.state = v.state @@ -97,7 +98,6 @@ function this.CreatSingleData(sData) return data end - --需要显示的任务数据 function this.GetNeedRewardData(sort) local needData = {} @@ -138,7 +138,7 @@ function this.GetNeedRewardData(sort) -- end -- end -- end - + -- for j = 1,#tempdata do -- table.insert(needData,tempdata[j]) -- end @@ -147,23 +147,23 @@ function this.GetNeedRewardData(sort) -- return a.id < b.id -- end) -- else--新的牛气冲天 - for k, v in pairs(this.rewardData) do - if v.Sort == sort then - table.insert(needData,v) - end + for k, v in pairs(this.rewardData) do + if v.Sort == sort then + table.insert(needData, v) end - local STATE = { - [0] = 2, - [1] = 3, - [2] = 1, - } - table.sort(needData,function (a,b) - if a.state == b.state then - return a.id < b.id - else - return STATE[a.state] > STATE[b.state] - end - end) + end + local STATE = { + [0] = 2, + [1] = 3, + [2] = 1, + } + table.sort(needData, function(a, b) + if a.state == b.state then + return a.id < b.id + else + return STATE[a.state] > STATE[b.state] + end + end) -- end return needData end @@ -173,12 +173,12 @@ function this.CheckNiuQiChongTianRedPoint(index) if not id or id < 1 then return false end - for k = #this.rewardData, 1 , -1 do + for k = #this.rewardData, 1, -1 do if this.rewardData[k].actId ~= id then - table.remove( this.rewardData,k) + table.remove(this.rewardData, k) end end - local isShow = false + local isShow = false if index == RedPointType.NiuQiChongTian_4 then isShow = this.NiuQiCheckRedPoint4() else @@ -196,7 +196,7 @@ function this.CheckNiuQiChongTianRedPoint(index) end function this.NiuQiCheckRedPoint1(index) - for k,v in pairs(this.rewardData) do + for k, v in pairs(this.rewardData) do if v.state == 1 and (not index or v.Sort == index) then return true end @@ -217,10 +217,10 @@ end --检查是否为新的牛气冲天 function this.CheckIsNewActivity() local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.NiuQi) - local data = ConfigManager.GetConfigData(ConfigName.GlobalActivity,id) + local data = ConfigManager.GetConfigData(ConfigName.GlobalActivity, id) -- if data.ShowArt == 2 then -- this.IsNewActivity = true -- end end -return this \ No newline at end of file +return this diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua index 714ca2cf9e..2d4fe4c2cb 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua @@ -10,17 +10,22 @@ function NiuQiChongTianPanel:New(gameObject) setmetatable(b, { __index = NiuQiChongTianPanel }) return b end -local TabBox = require("Modules/Common/TabBox") -local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[11944] , nameNew = Language[11944] ,rpType = RedPointType.NiuQiChongTian_1}, - [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[11942] , nameNew = Language[11942] ,rpType = RedPointType.NiuQiChongTian_2}, - [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[11940] , nameNew = Language[11940] ,rpType = RedPointType.NiuQiChongTian_3},} -local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), - select = Color.New(154 / 255, 78 / 255, 36 / 255, 1)} -local BtnState ={ - [0] = {ImgName = "s_slbz_1anniuhuangse",Text = Language[10505]}, - [1] = {ImgName = "s_slbz_1anniuongse",Text = Language[10024]}, - [2] = {ImgName = "s_slbz_1anniuhuise",Text = Language[10025]}, +local TabBox = require("Modules/Common/TabBox") +local _TabData = { + [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[11944], nameNew = Language[11944], rpType = RedPointType.NiuQiChongTian_1 }, + [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[11942], nameNew = Language[11942], rpType = RedPointType.NiuQiChongTian_2 }, + [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[11940], nameNew = Language[11940], rpType = RedPointType.NiuQiChongTian_3 }, +} +local _TabFontColor = { + default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), + select = Color.New(154 / 255, 78 / 255, 36 / 255, 1) +} + +local BtnState = { + [0] = { ImgName = "s_slbz_1anniuhuangse", Text = Language[10505] }, + [1] = { ImgName = "s_slbz_1anniuongse", Text = Language[10024] }, + [2] = { ImgName = "s_slbz_1anniuhuise", Text = Language[10025] }, } --初始化组件（用于子类重写） @@ -28,16 +33,16 @@ function NiuQiChongTianPanel:InitComponent() self.progressData = {} self.rewardData = {} self.curScore = 0 - self.itemsGrid = {}--item重复利用 + self.itemsGrid = {} --item重复利用 self.curPage = 1 self.curIndex = 1 self.redPointList = {} self.spLoader = SpriteLoader.New() - self.backBtn = Util.GetGameObject(self.gameObject,"backBtn") + self.backBtn = Util.GetGameObject(self.gameObject, "backBtn") self.tabBox = Util.GetGameObject(self.gameObject, "TabBox") --进度条 - self.progress = Util.GetGameObject(self.gameObject, "mid/progress/value"):GetComponent("Image")--fillAmount + self.progress = Util.GetGameObject(self.gameObject, "mid/progress/value"):GetComponent("Image") --fillAmount self.reward = Util.GetGameObject(self.gameObject, "mid/reward") self.time = Util.GetGameObject(self.gameObject, "tiao/Text"):GetComponent("Text") self.NiuQiValue = Util.GetGameObject(self.gameObject, "mid/progress/niu/Image/Text"):GetComponent("Text") @@ -46,7 +51,8 @@ function NiuQiChongTianPanel:InitComponent() self.scrollItem = Util.GetGameObject(self.gameObject, "mid/rewardArena") local rootHight = self.scrollItem.transform.rect.height local width = self.scrollItem.transform.rect.width - self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.scrollItem.transform,self.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0,0)) + self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.scrollItem.transform, self.itemPre, nil, + Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 0)) self.ScrollView.moveTween.MomentumAmount = 1 self.ScrollView.moveTween.Strength = 2 self.ScrollView.elastic = false @@ -55,9 +61,10 @@ function NiuQiChongTianPanel:InitComponent() Util.SetParticleSortLayer(self.effect5, 1) sortingOrder = 0 end + --绑定事件（用于子类重写） function NiuQiChongTianPanel:BindEvent() - Util.AddClick(self.backBtn,function () + Util.AddClick(self.backBtn, function() self:ClosePanel() end) end @@ -71,12 +78,12 @@ function NiuQiChongTianPanel:RemoveListener() end function NiuQiChongTianPanel:OnSortingOrderChange(_sortingOrder) - Util.SetParticleSortLayer(self.effect5,_sortingOrder + 1) + Util.SetParticleSortLayer(self.effect5, _sortingOrder + 1) self.sortingOrder = _sortingOrder end --界面打开时调用（用于子类重写） -function NiuQiChongTianPanel:OnOpen(_activityConfig,_index,parent) +function NiuQiChongTianPanel:OnOpen(_activityConfig, _index, parent) self.actConfig = _activityConfig NiuQiChongTianManager.CheckIsNewActivity() self.pageIndex = _index @@ -85,7 +92,7 @@ end -- 打开，重新打开时回调 function NiuQiChongTianPanel:OnShow(_sortingOrder) - self.gameObject:SetActive(true) + self.gameObject:SetActive(true) Util.AddParticleSortLayer(self.effect5, _sortingOrder - sortingOrder) sortingOrder = _sortingOrder self.activityId = self.actConfig.ActId @@ -95,13 +102,14 @@ function NiuQiChongTianPanel:OnShow(_sortingOrder) local id = ActivityGiftManager.IsActivityTypeOpen(self.actConfig.ActiveType) if id and id > 0 then self.activityId = id - local config = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType,"ActId",id) + local config = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups, "PageType", + self.actConfig.PageType, "ActiveType", self.actConfig.ActiveType, "ActId", id) if config then self.actConfig = config end end end - end + end local NiuQiChongTianPanelTabAdapter = function(tab, index, status) if status == "lock" then @@ -115,19 +123,19 @@ function NiuQiChongTianPanel:OnShow(_sortingOrder) if self.redPointList[_TabData[index].rpType] then ClearRedPointObject(_TabData[index].rpType, self.redPointList[_TabData[index].rpType]) end - BindRedPointObject(_TabData[index].rpType,redPoint) + BindRedPointObject(_TabData[index].rpType, redPoint) self.redPointList[_TabData[index].rpType] = redPoint end - Util.GetGameObject(tab,"Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(_TabData[index][status]) + Util.GetGameObject(tab, "Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(_TabData[index][status]) tabLab:GetComponent("Text").text = _TabData[index].nameNew tabLab:GetComponent("Text").color = _TabFontColor[status] end - local NiuQiChongTianPanelSwitchView = function(index,bool) + local NiuQiChongTianPanelSwitchView = function(index, bool) self.curPage = index DynamicActivityManager.NiuQiIndex = self.curPage self.rewardData = NiuQiChongTianManager.GetNeedRewardData(self.curPage) - + self:SetProgress() self:SetReward(bool) end @@ -152,13 +160,13 @@ function NiuQiChongTianPanel:OnShow(_sortingOrder) self:SetTime() end -function NiuQiChongTianPanel:SwitchView(index,bool) +function NiuQiChongTianPanel:SwitchView(index, bool) self.curPage = index DynamicActivityManager.NiuQiIndex = self.curPage - self.rewardData = NiuQiChongTianManager.GetNeedRewardData(self.curPage) - - self:SetProgress() - self:SetReward(bool) + self.rewardData = NiuQiChongTianManager.GetNeedRewardData(self.curPage) + + self:SetProgress() + self:SetReward(bool) end function NiuQiChongTianPanel:SetTime() @@ -169,10 +177,10 @@ function NiuQiChongTianPanel:SetTime() local info = ActivityGiftManager.GetActivityTypeInfo(self.actType) local tempTime = info.endTime - GetTimeStamp() if tempTime < 0 then - return + return end local updateTime = function() - self.time.text = Language[10026]..TimeToFelaxible(tempTime) + self.time.text = Language[10026] .. TimeToFelaxible(tempTime) if tempTime <= 0 then self.parent:ClosePanel() end @@ -181,7 +189,7 @@ function NiuQiChongTianPanel:SetTime() self.timer = Timer.New(function() tempTime = tempTime - 1 updateTime() - end,1,-1,false) + end, 1, -1, false) self.timer:Start() end @@ -189,18 +197,19 @@ function NiuQiChongTianPanel:SetProgress() self.curScore = NiuQiChongTianManager.GetScore() self.NiuQiValue.text = self.curScore self.progressData = NiuQiChongTianManager.configData - self.progress.fillAmount = self.curScore/self.progressData[#self.progressData].value[2][1] + self.progress.fillAmount = self.curScore / self.progressData[#self.progressData].value[2][1] for i = 1, self.reward.transform.childCount do - local item = self.reward.transform:GetChild(i-1) + local item = self.reward.transform:GetChild(i - 1) Util.GetGameObject(item, "num/Text"):GetComponent("Text").text = PrintWanNum2(self.progressData[i].reward[1][2]) Util.GetGameObject(item, "Text"):GetComponent("Text").text = self.progressData[i].value[2][1] - Util.GetGameObject(item, "icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(artConfig[itemConfig[self.progressData[i].reward[1][1]].ResourceID].Name) + Util.GetGameObject(item, "icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(artConfig + [itemConfig[self.progressData[i].reward[1][1]].ResourceID].Name) Util.GetGameObject(item, "red"):SetActive(self.progressData[i].state == 1) local btn = Util.GetGameObject(item, "icon") - Util.AddOnceClick(btn,function () + Util.AddOnceClick(btn, function() if self.progressData[i].state == 1 then - NetManager.GetActivityRewardRequest(self.progressData[i].missionId,self.activityId,function (drop) - UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1,function () + NetManager.GetActivityRewardRequest(self.progressData[i].missionId, self.activityId, function(drop) + UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1, function() self.progressData[i].state = 2 self:SetProgress() CheckRedPointStatus(RedPointType.NiuQiChongTian_4) @@ -208,11 +217,11 @@ function NiuQiChongTianPanel:SetProgress() end) elseif self.progressData[i].state == 0 then if itemConfig[self.progressData[i].reward[1][1]].ItemType == ItemType.SelfBox then - UIManager.OpenPanel(UIName.RewardBoxPanel,nil,self.progressData[i].reward[1][1]) + UIManager.OpenPanel(UIName.RewardBoxPanel, nil, self.progressData[i].reward[1][1]) elseif itemConfig[self.progressData[i].reward[1][1]].ItemType == ItemType.Ride then - UIManager.OpenPanel(UIName.RewardRideShowPopup,self.progressData[i].reward[1][1]) + UIManager.OpenPanel(UIName.RewardRideShowPopup, self.progressData[i].reward[1][1]) else - UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,self.progressData[i].reward[1][1],nil) + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, self.progressData[i].reward[1][1], nil) end else PopupTipPanel.ShowTip(Language[10503]) @@ -224,12 +233,12 @@ end function NiuQiChongTianPanel:SetReward(bool) local anim = bool or false local data = {} - self.ScrollView:SetData(self.rewardData, function (index, go) - self:SingleDataShow(go,index,self.rewardData[index]) - end,false,anim) + self.ScrollView:SetData(self.rewardData, function(index, go) + self:SingleDataShow(go, index, self.rewardData[index]) + end, false, anim) end -function NiuQiChongTianPanel:SingleDataShow(go, index,data) +function NiuQiChongTianPanel:SingleDataShow(go, index, data) local title = Util.GetGameObject(go, "title/titleText"):GetComponent("Text") local btn = Util.GetGameObject(go, "btn"):GetComponent("Button") local btnImg = Util.GetGameObject(go, "btn"):GetComponent("Image") @@ -248,7 +257,7 @@ function NiuQiChongTianPanel:SingleDataShow(go, index,data) btnText.text = BtnState[data.state].Text if data.state == 0 then progress.gameObject:SetActive(true) - progress.text = string.format( "%s/%s",data.progress,data.value[2][1]) + progress.text = string.format("%s/%s", data.progress, data.value[2][1]) else progress.gameObject:SetActive(false) end @@ -259,37 +268,37 @@ function NiuQiChongTianPanel:SingleDataShow(go, index,data) end for i = 1, #shows do if self.itemsGrid[go][i] then - self.itemsGrid[go][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,sortingOrder) + self.itemsGrid[go][i]:OnOpen(false, { shows[i][1], shows[i][2] }, 0.9, false, false, false, sortingOrder) self.itemsGrid[go][i].gameObject:SetActive(true) end end else - self.itemsGrid[go]={} + self.itemsGrid[go] = {} for i = 1, 4 do self.itemsGrid[go][i] = SubUIManager.Open(SubUIConfig.ItemView, grid.transform) self.itemsGrid[go][i].gameObject:SetActive(false) - local obj = newObjToParent(shadow,self.itemsGrid[go][i].transform) + local obj = newObjToParent(shadow, self.itemsGrid[go][i].transform) obj.transform:SetAsFirstSibling() - obj.transform:DOAnchorPos(Vector3(0,-3,0),0) - obj:GetComponent("RectTransform").transform.localScale = Vector3.one*1.1 + obj.transform:DOAnchorPos(Vector3(0, -3, 0), 0) + obj:GetComponent("RectTransform").transform.localScale = Vector3.one * 1.1 obj.gameObject:SetActive(true) obj.transform:SetSiblingIndex(0) end for i = 1, #shows do - self.itemsGrid[go][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,sortingOrder) + self.itemsGrid[go][i]:OnOpen(false, { shows[i][1], shows[i][2] }, 0.9, false, false, false, sortingOrder) self.itemsGrid[go][i].gameObject:SetActive(true) end end - Util.AddOnceClick(btn.gameObject,function () + Util.AddOnceClick(btn.gameObject, function() if data.state == 0 then JumpManager.GoJump(data.jumpId) elseif data.state == 1 then - NetManager.TakeMissionRewardRequest(TaskTypeDef.NiuQiChongTian,data.id,function (msg) - UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function () + NetManager.TakeMissionRewardRequest(TaskTypeDef.NiuQiChongTian, data.id, function(msg) + UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1, function() CheckRedPointStatus(RedPointType.NiuQiChongTian + self.curPage) CheckRedPointStatus(RedPointType.NiuQiChongTian_4) - self:SwitchView(self.curPage,true) + self:SwitchView(self.curPage, true) end) end) end @@ -311,8 +320,8 @@ end --界面销毁时调用（用于子类重写） function NiuQiChongTianPanel:OnDestroy() - for k,v in pairs(self.itemsGrid) do - for i = 1,#v do + for k, v in pairs(self.itemsGrid) do + for i = 1, #v do SubUIManager.Close(v[i]) end end @@ -321,4 +330,4 @@ function NiuQiChongTianPanel:OnDestroy() sortingOrder = 0 end -return NiuQiChongTianPanel \ No newline at end of file +return NiuQiChongTianPanel diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua index fb86737602..d7071467c9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua @@ -1,12 +1,14 @@ RankingManager = {} local this = RankingManager -this.CurPage=0 -this.curRankingData={}--战力排行滚动数据 -this.curRankingMyRankData={} --我的数据 -this.mainLevelConfig={} -this.isRequest=0--防止连续请求 - +this.CurPage = 0 +this.curRankingData = {} --战力排行滚动数据 +this.curRankingMyRankData = {} --我的数据 +this.mainLevelConfig = {} +this.isRequest = 0 --防止连续请求 +this.rewardData = {} function this.Initialize() + this.InitAllRewardData() + Game.GlobalEvent:AddEvent(GameEvent.Mission.NiuQiChongTianTask, this.UpdateStatus) end local cur_rankType = 0 @@ -14,9 +16,9 @@ local cur_activiteId = 0 local cur_rankIndex = 0 local cur_isMax = false --初始化排行数据（待优化） -function this.InitData(rankType,fun,id,rankIndex) +function this.InitData(rankType, fun, id, rankIndex) cur_rankType = rankType - local activiteId = (id ~= nil and id > 0) and id or nil--点金时需要 当为公会副本是为章节id + local activiteId = (id ~= nil and id > 0) and id or nil --点金时需要 当为公会副本是为章节id cur_activiteId = activiteId cur_rankIndex = 1 cur_isMax = false @@ -26,7 +28,7 @@ function this.InitData(rankType,fun,id,rankIndex) if rankKingList[i].isRankingMainPanelShow == 2 or rankKingList[i].isRankingMainPanelShow == 3 then isCross = 1 end - if rankKingList[i].isRankingMainPanelShow == 4 then--跨服十绝阵判断 + if rankKingList[i].isRankingMainPanelShow == 4 then --跨服十绝阵判断 if PlayerManager.isCross == 1 then isCross = 1 end @@ -34,9 +36,9 @@ function this.InitData(rankType,fun,id,rankIndex) end end --LogYellow("cur_rankType "..cur_rankType.." activiteId "..tostring(activiteId)) - NetManager.RequestRankInfo(rankType, function (msg)--请求数据 - this.ReceiveRankingData(msg,fun) - end,activiteId,cur_rankIndex,isCross) + NetManager.RequestRankInfo(rankType, function(msg) --请求数据 + this.ReceiveRankingData(msg, fun) + end, activiteId, cur_rankIndex, isCross) end --请求排行榜下面数据 @@ -59,97 +61,105 @@ function this.RequestNextWarPowerPageData(fun) end end end - NetManager.RequestRankInfo(cur_rankType, function (msg)--请求数据 - this.ReceiveNextRankingData(msg,fun) - end,cur_activiteId,cur_rankIndex,isCross) + NetManager.RequestRankInfo(cur_rankType, function(msg) --请求数据 + this.ReceiveNextRankingData(msg, fun) + end, cur_activiteId, cur_rankIndex, isCross) end + ---战力战力 --接收服务器战力数据 -function this.ReceiveRankingData(msg,fun) +function this.ReceiveRankingData(msg, fun) --自身数据 this.curRankingData = {} - LogError("msg.myRankInfo=="..msg.myRankInfo.rank) - this.curRankingMyRankData=msg.myRankInfo + LogError("msg.myRankInfo==" .. msg.myRankInfo.rank) + this.curRankingMyRankData = msg.myRankInfo --滚动数据 - local length=#this.curRankingData + local length = #this.curRankingData for i, rank in ipairs(msg.ranks) do - -- LogGreen("UserRank:"..rank.rankInfo.rank.." userName:"..rank.userName.." userGuide:"..rank.guildName.." rank.rankInfo.param1:"..rank.rankInfo.param1.." rank.rankInfo.param2:"..rank.rankInfo.param2.." practiceLevel:"..rank.practiceLevel) - rank.userName = PracticeManager.SetNameColor(rank.userName,rank.practiceLevel) + -- LogGreen("UserRank:"..rank.rankInfo.rank.." userName:"..rank.userName.." userGuide:"..rank.guildName.." rank.rankInfo.param1:"..rank.rankInfo.param1.." rank.rankInfo.param2:"..rank.rankInfo.param2.." practiceLevel:"..rank.practiceLevel) + rank.userName = PracticeManager.SetNameColor(rank.userName, rank.practiceLevel) --rank.crossScore=100 - this.curRankingData[length+i]=rank + this.curRankingData[length + i] = rank end - if #msg.ranks < 20 or #this.curRankingData >= 100 then + if #msg.ranks < 20 or #this.curRankingData >= 100 then cur_isMax = true end cur_rankIndex = cur_rankIndex + #msg.ranks if fun then fun() end -- Game.GlobalEvent:DispatchEvent(GameEvent.RankingList.AllRankingList) end + --接收服务器战力数据 -function this.ReceiveNextRankingData(msg,fun) +function this.ReceiveNextRankingData(msg, fun) --滚动数据 - local length=#this.curRankingData + local length = #this.curRankingData for i, rank in ipairs(msg.ranks) do -- LogGreen("UserRank "..rank.rankInfo.rank.." userName "..rank.userName.." rank.rankInfo.param1 "..rank.rankInfo.param1.." practiceLevel:"..rank.practiceLevel) -- LogError("rank.practiceLevel:"..tostring(rank.practiceLevel)) - rank.userName = PracticeManager.SetNameColor(rank.userName,rank.practiceLevel) - this.curRankingData[length+i]=rank + rank.userName = PracticeManager.SetNameColor(rank.userName, rank.practiceLevel) + this.curRankingData[length + i] = rank end - if #msg.ranks < 20 or #this.curRankingData >= 100 then + if #msg.ranks < 20 or #this.curRankingData >= 100 then cur_isMax = true end cur_rankIndex = cur_rankIndex + #msg.ranks if fun then fun() end end + --获取排行榜信息 function this.GetRankingInfo() return this.curRankingData, this.curRankingMyRankData end function this.GetGoldExperSortInfo() - return this.GoldExperData,this.GoldExperMyRankData + return this.GoldExperData, this.GoldExperMyRankData end + --膜拜信息 local RankProud = {} -local firstRankProud = {}--后端临时数据 -function this.SetAllRankProud(types,prouds) +local firstRankProud = {} --后端临时数据 +function this.SetAllRankProud(types, prouds) for i = 1, #types do RankProud[types[i]] = prouds[i] end end -function this.SetSingleRankProud(type,proud) + +function this.SetSingleRankProud(type, proud) RankProud[type] = proud end + function this.GetRankProud() - return RankProud + return RankProud end -function this.SetAllFirstRankProud(types,_firstRankProud) + +function this.SetAllFirstRankProud(types, _firstRankProud) for i = 1, #_firstRankProud do firstRankProud[types[i]] = _firstRankProud[i] end end + function this.GetAllFirstRankProud() return firstRankProud end --数据拆分 d数据 function this.CutDate(d) - local dt,db={},{} + local dt, db = {}, {} for i, v in ipairs(d) do - if i==1 then - table.insert(dt,v) + if i == 1 then + table.insert(dt, v) else - table.insert(db,v) + table.insert(db, v) end end - return dt,db + return dt, db end --膜拜红点 function this.RefreshRedPoint() - local redPoint = this.RefreshRedPoint1()--本服 + local redPoint = this.RefreshRedPoint1() --本服 if not redPoint then - redPoint = this.RefreshRedPoint2()--跨服 + redPoint = this.RefreshRedPoint2() --跨服 end return redPoint end @@ -163,7 +173,7 @@ function this.RefreshRedPoint1() --i 是编队类型 for i, v in pairs(proud) do if v == 0 and allFirstRankProud[i].uid > 0 and - (i == RANK_TYPE.IGHTLEVEL_STAR or i == RANK_TYPE.FORCE_CURR_RANK or i == RANK_TYPE.GUILD_FORCE_RANK or i == RANK_TYPE.MONSTER_RANK or i == RANK_TYPE.FIGHT_LEVEL_RANK) then--没有膜拜过 --i <= 4 前四个本服 + (i == RANK_TYPE.IGHTLEVEL_STAR or i == RANK_TYPE.FORCE_CURR_RANK or i == RANK_TYPE.GUILD_FORCE_RANK or i == RANK_TYPE.MONSTER_RANK or i == RANK_TYPE.FIGHT_LEVEL_RANK) then --没有膜拜过 --i <= 4 前四个本服 return true end end @@ -176,7 +186,7 @@ end --跨服膜拜红点 function this.RefreshRedPoint2() - if GetTimeStamp() - PlayerManager.GetServerOpenTime() < 7*24*60*60 or PlayerManager.isCross == 0 then + if GetTimeStamp() - PlayerManager.GetServerOpenTime() < 7 * 24 * 60 * 60 or PlayerManager.isCross == 0 then return false end if (ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.CROSS_RANK)) then @@ -186,7 +196,7 @@ function this.RefreshRedPoint2() --i 是编队类型 for i, v in pairs(proud) do if v == 0 and allFirstRankProud[i].uid > 0 and - (i == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK or i == RANK_TYPE.JUMPSERVER_MONSTER_RANK or i == RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR or i == RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK) then--没有膜拜过--i > 4 后四个跨服 + (i == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK or i == RANK_TYPE.JUMPSERVER_MONSTER_RANK or i == RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR or i == RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK) then --没有膜拜过--i > 4 后四个跨服 return true end end @@ -196,4 +206,66 @@ function this.RefreshRedPoint2() return false end end -return this \ No newline at end of file + +--所有的任务信息数据 +function this.InitAllRewardData() + local ArroGantFly = ConfigManager.GetConfig(ConfigName.ChongRankReward) + for k, v in ConfigPairs(ArroGantFly) do + table.insert(this.rewardData, this.CreatSingleData(v)) + end +end + +function this.CreatSingleData(sData) + local data = {} + data.id = sData.Id + data.Text = sData.RankName + data.Reward = sData.Score + data.Sort = sData.ChongRankInfoID + data.state = 0 + data.jumpId = sData.JumpID + data.value = sData.Condition + data.progress = 0 + return data +end + +--需要显示的任务数据 +function this.GetNeedRewardData(sort) + local needData = {} + for k, v in pairs(this.rewardData) do + if v.Sort == sort then + table.insert(needData, v) + end + end + local STATE = { + [0] = 2, + [1] = 3, + [2] = 1, + } + table.sort(needData, function(a, b) + if a.state == b.state then + return a.id < b.id + else + return STATE[a.state] > STATE[b.state] + end + end) + -- end + return needData +end +function this.UpdateStatus() + local temp = TaskManager.GetTypeTaskList(TaskTypeDef.NiuQiChongTian) + for k, v in ipairs(temp) do + local data = this.GetRewardDataById(v.missionId) + if data then + data.state = v.state + data.progress = v.progress + end + end +end +function this.GetRewardDataById(id) + for k, v in ipairs(this.rewardData) do + if v.id == id then + return v + end + end +end +return this From 7ac3a3b99519fe9730c326d89a339e39e63f7be9 Mon Sep 17 00:00:00 2001 From: vurtne14 Date: Fri, 20 Mar 2026 10:26:55 +0800 Subject: [PATCH 2/2] 1 --- .../UI/GMPanel/ActivityChongRank.prefab | 323 +++++++----------- 1 file changed, 132 insertions(+), 191 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GMPanel/ActivityChongRank.prefab b/Assets/ManagedResources/Prefabs/UI/GMPanel/ActivityChongRank.prefab index 6210cd971f..c2ceac8b16 100644 --- a/Assets/ManagedResources/Prefabs/UI/GMPanel/ActivityChongRank.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GMPanel/ActivityChongRank.prefab @@ -63,8 +63,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_FontSize: 30 @@ -110,7 +108,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1928608338} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -143,8 +141,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: c65229ed443ab0b4fa61b949bfdb1fef, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -217,8 +213,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: c3dd9610bb7d50b47bc158a0e12c6839, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -259,7 +253,7 @@ RectTransform: m_Children: - {fileID: 25751774} m_Father: {fileID: 1928608338} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -292,8 +286,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: c00ea520d4b14e042b92c24425376293, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -335,12 +327,12 @@ RectTransform: m_Children: - {fileID: 1551002074} m_Father: {fileID: 1928608338} - m_RootOrder: 15 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -7.62, y: -762.92} - m_SizeDelta: {x: 869.3, y: 100.36} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 66.19678} + m_SizeDelta: {x: 0, y: 132.39355} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &361206782 CanvasRenderer: @@ -380,8 +372,6 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &361206780 MonoBehaviour: m_ObjectHideFlags: 0 @@ -483,7 +473,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1928608338} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -516,8 +506,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 06cde883a6fea4944875a598240271bd, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -590,8 +578,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_FontSize: 40 @@ -674,8 +660,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: f69a5d4e1c4288743ac4d31fbb5732c2, type: 3} m_Type: 1 m_PreserveAspect: 1 @@ -748,8 +732,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_FontSize: 40 @@ -828,8 +810,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_FontSize: 62 @@ -902,28 +882,26 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_Color: {r: 0.9529412, g: 0.92156863, b: 0.7921569, a: 1} + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_FontSize: 50 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 - m_MaxSize: 40 + m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u7279\u67431" - LanguageIndex: 0 + m_LineSpacing: 0.8 + m_Text: "\u795E\u5C06\u7F6E\u6362" + LanguageIndex: 10337 --- !u!1 &642658348 GameObject: m_ObjectHideFlags: 0 @@ -955,7 +933,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1928608338} - m_RootOrder: 20 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -988,8 +966,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 2887ec8dbdcb57242a540f77f7cb5a72, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1039,8 +1015,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &694938421 GameObject: m_ObjectHideFlags: 0 @@ -1071,7 +1045,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1928608338} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1104,8 +1078,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 142af69a096aa2a48b16accf1d3790f5, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1179,8 +1151,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 3c01a305eb51c04478b39d3060aceefe, type: 3} m_Type: 1 m_PreserveAspect: 0 @@ -1222,7 +1192,7 @@ RectTransform: - {fileID: 477176415} - {fileID: 516407634} m_Father: {fileID: 1928608338} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1255,8 +1225,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 96124d118af45d84a8d19774993187a7, type: 3} m_Type: 1 m_PreserveAspect: 0 @@ -1330,8 +1298,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 775d9f695ff2e3740add4ff1fdec4f5f, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1404,8 +1370,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: f5ba695b044676047802f7b7fa302002, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1478,8 +1442,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: a3b7ee2a75a2bfc47bf4534293029e8e, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1680,28 +1642,26 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8627451, g: 0.627451, b: 0.45490196, a: 1} - m_RaycastTarget: 1 + m_Color: {r: 0.9529412, g: 0.92156863, b: 0.7921569, a: 1} + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 35 + m_FontSize: 50 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 - m_MaxSize: 40 + m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u7279\u67431" - LanguageIndex: 0 + m_LineSpacing: 0.8 + m_Text: "\u795E\u5C06\u7F6E\u6362" + LanguageIndex: 10337 --- !u!1 &1551002073 GameObject: m_ObjectHideFlags: 0 @@ -1737,7 +1697,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 434.65, y: -3} + m_AnchoredPosition: {x: 589.5, y: -3} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1551002076 @@ -1849,8 +1809,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: e3d74104c05f1f440bb6e8dc3261e66c, type: 3} m_Type: 1 m_PreserveAspect: 0 @@ -1896,7 +1854,6 @@ RectTransform: - {fileID: 5177171720925005877} - {fileID: 1653786985} - {fileID: 3469189154876754860} - - {fileID: 2866081251682980860} - {fileID: 929204261} - {fileID: 451325687} - {fileID: 694938422} @@ -1905,8 +1862,10 @@ RectTransform: - {fileID: 90028006} - {fileID: 1971689257} - {fileID: 361206779} + - {fileID: 2866081251682980860} - {fileID: 2047983616} - {fileID: 5012342742246479230} + - {fileID: 7469343369005860892} - {fileID: 1844134360920188862} - {fileID: 3756578059854988546} - {fileID: 642658349} @@ -1946,8 +1905,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: ff7dc4e7b62364b43ac6397ea6702bea, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1989,12 +1946,12 @@ RectTransform: m_Children: - {fileID: 1334398538} m_Father: {fileID: 1928608338} - m_RootOrder: 14 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -959, y: 363} - m_SizeDelta: {x: 210, y: 86} + m_AnchoredPosition: {x: -959, y: 505} + m_SizeDelta: {x: 230, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1971689260 CanvasRenderer: @@ -2022,10 +1979,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 0aa744fe66ba6834cae277fbd552d658, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: dcab34f84847d94448b245ab7e62e44e, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2073,8 +2028,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &1998071254 GameObject: m_ObjectHideFlags: 0 @@ -2105,7 +2058,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1928608338} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2138,8 +2091,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: d50fb3def30b31f458d7420a5f781807, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -2184,8 +2135,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -959, y: 331.3} - m_SizeDelta: {x: 210, y: 86} + m_AnchoredPosition: {x: -959, y: 505} + m_SizeDelta: {x: 230, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2047983618 CanvasRenderer: @@ -2213,10 +2164,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 5131fcca363db634e9fe7d2a65c199b6, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 0e97e3866623faa4fa4a58ebb054267c, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2287,8 +2236,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 0e991e88b403b29409e591653827134c, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -2362,8 +2309,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 3c01a305eb51c04478b39d3060aceefe, type: 3} m_Type: 1 m_PreserveAspect: 0 @@ -2436,8 +2381,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 6c1d4803459291b42a296ef4dac2668d, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -2510,8 +2453,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_FontSize: 36 @@ -2590,8 +2531,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_FontSize: 40 @@ -2669,8 +2608,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: f5ba695b044676047802f7b7fa302002, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -2744,8 +2681,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 0fdb11ebf0af8694cb08b9c264d3fa2a, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -2822,8 +2757,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: addacd5860691b74db509358d99a6dfb, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -2873,8 +2806,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!95 &693246098246870239 Animator: serializedVersion: 3 @@ -2894,6 +2825,78 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &1549298826355278015 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7469343369005860892} + - component: {fileID: 5994044027727461995} + - component: {fileID: 3761251110210934790} + m_Layer: 5 + m_Name: rankRewardGrid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7469343369005860892 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549298826355278015} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1928608338} + m_RootOrder: 18 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -8.9, y: -313.4} + m_SizeDelta: {x: 871.8, y: 775.7} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5994044027727461995 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549298826355278015} + m_CullTransparentMesh: 0 +--- !u!114 &3761251110210934790 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549298826355278015} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 42263669b8cc5c04a96720be44775913, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &1761137697866400360 GameObject: m_ObjectHideFlags: 0 @@ -2957,8 +2960,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -3036,8 +3037,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 578016bcc0473ff47a2694b7d2c27b1e, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -3126,15 +3125,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 50 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 50 + m_MinSize: 3 + m_MaxSize: 35 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -3206,8 +3203,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: a3b7ee2a75a2bfc47bf4534293029e8e, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -3281,8 +3276,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 634137158f07dff488d018d707aa403a, type: 2} m_FontSize: 0 @@ -3349,7 +3342,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 97.08, y: 62.999756} - m_SizeDelta: {x: 230, y: 100} + m_SizeDelta: {x: 184, y: 86} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1391469062428381930 CanvasRenderer: @@ -3399,8 +3392,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &3174495034196394672 GameObject: m_ObjectHideFlags: 0 @@ -3430,7 +3421,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1928608338} - m_RootOrder: 18 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3508,8 +3499,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 0eda4a9b16aadb140a481060f1911cf1, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -3582,8 +3571,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -3628,7 +3615,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 230, y: 100} + m_SizeDelta: {x: 184, y: 86} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8908893941870229199 CanvasRenderer: @@ -3656,8 +3643,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 3c2c09241e35b084583053797b5c3146, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -3730,8 +3715,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: f69a5d4e1c4288743ac4d31fbb5732c2, type: 3} m_Type: 1 m_PreserveAspect: 0 @@ -3804,8 +3787,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_FontSize: 62 @@ -3883,8 +3864,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -4031,8 +4010,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_FontSize: 36 @@ -4111,8 +4088,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_FontSize: 40 @@ -4191,8 +4166,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -4265,8 +4238,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -4339,8 +4310,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_FontSize: 36 @@ -4386,7 +4355,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1928608338} - m_RootOrder: 19 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4419,8 +4388,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 47b0d71d3c8ef79468a5fb4d8ec5f365, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -4470,8 +4437,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &7187415996225259485 GameObject: m_ObjectHideFlags: 0 @@ -4503,12 +4468,12 @@ RectTransform: - {fileID: 1289094338703573179} - {fileID: 7818653201462816865} m_Father: {fileID: 1928608338} - m_RootOrder: 7 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 66.19678} - m_SizeDelta: {x: 0, y: 132.39355} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -7.62, y: -762.92} + m_SizeDelta: {x: 869.3, y: 100.36} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5071778493598557864 MonoBehaviour: @@ -4540,8 +4505,6 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &7279517743723266676 GameObject: m_ObjectHideFlags: 0 @@ -4605,8 +4568,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: bd6340bf60e3e884c891b0c25013696b, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -4679,8 +4640,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: a2405fced91d3d443befb9c81440a05b, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -4724,7 +4683,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 540, y: 0} + m_AnchoredPosition: {x: 434.65002, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5890973826637358580 @@ -4804,7 +4763,7 @@ RectTransform: - {fileID: 5934877229019249322} - {fileID: 218911358659493289} m_Father: {fileID: 1928608338} - m_RootOrder: 21 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4837,8 +4796,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: f69a5d4e1c4288743ac4d31fbb5732c2, type: 3} m_Type: 1 m_PreserveAspect: 1 @@ -4888,8 +4845,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &7662671603684847257 GameObject: m_ObjectHideFlags: 0 @@ -4953,8 +4908,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 0e991e88b403b29409e591653827134c, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -5027,8 +4980,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: c3dd9610bb7d50b47bc158a0e12c6839, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -5137,8 +5088,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 7a37c8663d7814543baf6de1e8b993be, type: 3} m_Type: 1 m_PreserveAspect: 0 @@ -5212,8 +5161,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 7491ecf89cbc4344c9165af75629b7e4, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -5286,8 +5233,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_FontSize: 30 @@ -5333,7 +5278,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1928608338} - m_RootOrder: 22 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5366,8 +5311,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} m_FontSize: 45 @@ -5494,8 +5437,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 7481f1ebd61b03a49ba7fa41d24d8db1, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -5512,11 +5453,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1928608338} m_Modifications: - - target: {fileID: 2703482157249238580, guid: b8640cd662140234aaa12e809a61ca58, - type: 3} - propertyPath: m_Name - value: live2d_c_0056 - objectReference: {fileID: 0} - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, type: 3} propertyPath: m_LocalPosition.x @@ -5632,6 +5568,11 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.6 objectReference: {fileID: 0} + - target: {fileID: 2703482157249238580, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_Name + value: live2d_c_0056 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b8640cd662140234aaa12e809a61ca58, type: 3} --- !u!224 &42802824677809814 stripped