diff --git a/Assets/ManagedResources/Atlas/FateAtlas.meta b/Assets/ManagedResources/Atlas/FateAtlas.meta new file mode 100644 index 0000000000..890b4264c0 --- /dev/null +++ b/Assets/ManagedResources/Atlas/FateAtlas.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9e32c3f03f9d4fb4790dd93b25397428 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Fate/FateManager.lua b/Assets/ManagedResources/~Lua/Modules/Fate/FateManager.lua new file mode 100644 index 0000000000..fe7578e899 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Fate/FateManager.lua @@ -0,0 +1,10 @@ +FateManager = {} +local this = FateManager +function this.Initialize() +end + +function this.GetServerData(msg) + -- body +end + +return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Fate/FatePanel.lua b/Assets/ManagedResources/~Lua/Modules/Fate/FatePanel.lua index e89d33b414..39f2b458f4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fate/FatePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fate/FatePanel.lua @@ -1,5 +1,4 @@ local Fate = quick_class("Fate", BasePanel) -local orginLayer = 0 function Fate:InitComponent() self.spLoader = SpriteLoader.New() @@ -10,7 +9,6 @@ function Fate:InitComponent() end --MidPart self.mid = Util.GetGameObject(self.gameObject, "Mid") - self.levelName = Util.GetGameObject(self.mid, "LevelName"):GetComponent("Image") self.img = Util.GetGameObject(self.mid, "Man"):GetComponent("Image") self.ManCanvas = Util.GetGameObject(self.mid, "Man"):GetComponent("Canvas") @@ -24,10 +22,6 @@ function Fate:BindEvent() UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.Practice, self.helpPosition.x,self.helpPosition.y) end) - Util.AddClick(self.BtnBack, function() - PlaySoundWithoutClick(SoundConfig.Sound_UICancel) - self:ClosePanel() - end) Util.AddClick(self.btnPractice, function() UIManager.OpenPanel(UIName.PracticePanel) self:ClosePanel() @@ -47,7 +41,6 @@ function Fate:OnOpen() end function Fate:OnSortingOrderChange() - orginLayer = self.sortingOrder self.ManCanvas.sortingOrder = self.sortingOrder + 2 -- 头像层级 if self.playerInfoView then @@ -67,31 +60,6 @@ function Fate:RefreshMid() self.ManCanvas.sortingOrder = self.sortingOrder + 2 end ---刷新 点间的线 -function Fate:RefreshLines() - if not self.lineList then - self.lineList = {} - end - for k,v in ipairs(self.lineList) do - v.gameObject:SetActive(false) - end - for i = 1, #self.lineData do - local data = self.lineData[i] - if not self.lineList[i] then - self.lineList[i] = newObject(self.LinePre) - self.lineList[i].transform:SetParent(self.lines.transform) - self.lineList[i].transform.localScale = Vector3.one - self.lineList[i].transform.localPosition = Vector3.zero - end - self.lineList[i]:SetActive(true) - local imgName = data.State == 1 and "x_xiuxing_xian_01" or "x_xiuxing_xian_02" - self.lineList[i]:GetComponent("Image").sprite = self.spLoader:LoadSprite(imgName) - self.lineList[i]:GetComponent("RectTransform").localPosition = data.Pos - self.lineList[i]:GetComponent("RectTransform").rotation = Quaternion.Euler(data.Rota) - end -end - - function Fate:OnClose() end diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua index c56247bb86..6470e6ef76 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua @@ -94,10 +94,6 @@ function Practice:BindEvent() UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.Practice, self.helpPosition.x,self.helpPosition.y) end) - Util.AddClick(self.BtnBack, function() - PlaySoundWithoutClick(SoundConfig.Sound_UICancel) - self:ClosePanel() - end) Util.AddClick(self.previewBtn, function() UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.PracticeStatePreview) end)