diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua index ae9ed48e0c..5475f63da8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua @@ -73,7 +73,7 @@ function ExpeditionMainPanel:InitComponent() self.liveNode:OnClose() end self.liveNode = PlayerLiveView:New(Util.GetTransform(self.parent, "playerLive"),1) - self.liveNode:OnOpen(25,nil,WALK_DIR.IDLE_FRONT) + self.liveNode:OnOpen(18,nil,WALK_DIR.IDLE_FRONT) self.singlePre = Util.GetGameObject(self.transform, "singlePre") self.grid = Util.GetGameObject(self.transform, "rect/grid") diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index aab84aa868..9eaa3d6040 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -791,7 +791,7 @@ function this.RefreshLittleMap() this.liveNode:OnClose() end this.liveNode = PlayerLiveView:New(this.btnMap.transform,1) - this.liveNode:OnOpen(10,Vector3.New(0,-40,0)) + this.liveNode:OnOpen(6,Vector3.New(0,-40,0)) if FightPointPassManager.GetRoleDirection()==1 then this.liveNode:SetWalkDir(WALK_DIR.RUN_LEFT) else diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightSmallChoosePanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightSmallChoosePanel.lua index af7687897e..ac7b865e97 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightSmallChoosePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightSmallChoosePanel.lua @@ -42,7 +42,7 @@ function FightSmallChoosePanel:InitComponent() -- end if self.liveNode == nil then self.liveNode = PlayerLiveView:New(Util.GetTransform(self.selectMap, "pos"),1) - self.liveNode:OnOpen(60,Vector3.New(0,40,0)) + self.liveNode:OnOpen(40,Vector3.New(0,40,0)) if FightPointPassManager.GetRoleDirection()==1 then self.liveNode:SetWalkDir(WALK_DIR.RUN_LEFT) else @@ -113,7 +113,7 @@ function FightSmallChoosePanel:OnShowPanelData() -- end if self.liveNode == nil then self.liveNode = PlayerLiveView:New(Util.GetTransform(self.selectMap, "pos"),1) - self.liveNode:OnOpen(60,Vector3.New(0,40,0)) + self.liveNode:OnOpen(40,Vector3.New(0,40,0)) if FightPointPassManager.GetRoleDirection()==1 then self.liveNode:SetWalkDir(WALK_DIR.RUN_LEFT) else diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/View/FightMiddleChooseMapView.lua b/Assets/ManagedResources/~Lua/Modules/Fight/View/FightMiddleChooseMapView.lua index 639212049f..6f727a1096 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/View/FightMiddleChooseMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/View/FightMiddleChooseMapView.lua @@ -44,7 +44,7 @@ function this:InitComponent(root) this.liveNode:OnClose() end this.liveNode = PlayerLiveView:New(Util.GetTransform(root, "mapParent/selectMap/Image (1)/roleRoot"),1) - this.liveNode:OnOpen(170,Vector3.New(0,40,0),WALK_DIR.IDLE_FRONT) + this.liveNode:OnOpen(140,Vector3.New(0,40,0),WALK_DIR.IDLE_FRONT) end local IsPlayAni = false local curSmallFightId = 0 @@ -101,7 +101,7 @@ function this:LoadMapData() -- end if this.liveNode == nil then this.liveNode = PlayerLiveView:New(Util.GetTransform(root, "mapParent/selectMap/Image (1)/roleRoot"),1) - this.liveNode:OnOpen(170,Vector3.New(0,40,0),WALK_DIR.IDLE_FRONT) + this.liveNode:OnOpen(140,Vector3.New(0,40,0),WALK_DIR.IDLE_FRONT) end this._BuildFlag = {} this._BuildFlagClick = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua b/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua index ef6549bdb1..0b94791a89 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua @@ -297,9 +297,8 @@ function this.LoadRole(u, v) this.NpcGO = nil end this.NpcGO = PlayerLiveView:New(Util.GetTransform(this.role, "root/ui/roleRoot"),1, nil) - this.NpcGO:OnOpen() + this.NpcGO:OnOpen(75) this.NpcGO.name = "npc" - this.NpcGO.leader.transform.localScale = Vector3.New(100,100,100) this.roleCurPos = TileMapView.GetMapData():GetMapData(u, v) this.roleRoot = Util.GetGameObject(this.role, "root/ui/roleRoot") diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua index e70f0abe8e..21404354f6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua @@ -143,7 +143,7 @@ function this.InitRolePre(u, v) this.NpcGO:OnClose() end this.NpcGO = PlayerLiveView:New(Util.GetTransform(this.leader, "root/ui/roleRoot"),1) - this.NpcGO:OnOpen(100,Vector3.New(0,40,0),WALK_DIR.IDLE_FRONT) + this.NpcGO:OnOpen(75,Vector3.New(0,40,0),WALK_DIR.IDLE_FRONT) end function this.RefreshOption() diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua index 991cd2067c..8da00f7633 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua @@ -568,6 +568,10 @@ function this.CalculatePlayerDcorateProAddVal() end return addAllProVal end + +function this.GetPlayerRideRedPoint() + PlayerPrefs.GetString(PlayerManager.uid..PlayerManager.serverInfo.server_id.."PlayerRide", 0) +end -----------------------------------玩家坐骑 皮肤 称号结束 function this.GetHeroDataByStar(star,staticid) if PlayerManager.heroHandBook and PlayerManager.heroHandBook[staticid] and PlayerManager.heroHandBook[staticid].maxStar >= star then diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua index 03c0387744..16193b0cd3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua @@ -226,7 +226,7 @@ function this.SetHeadsInfo(data,root,index,name,level) designation = data.userTitle } npc = PlayerLiveView:New(this.livePrefab.transform,2, curPlayerLiveViewData) - npc:OnOpen(25,Vector3.New(0,-118.65,0),WALK_DIR.IDLE_LEFT) + npc:OnOpen(20,Vector3.New(0,-118.65,0),WALK_DIR.IDLE_LEFT) Util.AddOnceClick(this.firstheadClick,function() UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid) diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua index 1df65334e5..a7435bebd8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua @@ -150,12 +150,12 @@ function this.SingleRideClickShowInfo(data) ride = curPlayerHeadIconConfig.Id, } live2dRoot = PlayerLiveView:New(this.live2dRootParent,2, curPlayerLiveViewData) - live2dRoot:OnOpen(25,nil,WALK_DIR.IDLE_LEFT) + live2dRoot:OnOpen(15,nil,WALK_DIR.IDLE_LEFT) local ridePlayerLiveViewData = { ride = curPlayerHeadIconConfig.Id, } live2dRoot2 = PlayerLiveView:New(this.live2dRootParent2,2, ridePlayerLiveViewData) - live2dRoot2:OnOpen(80,nil,WALK_DIR.IDLE_LEFT) + live2dRoot2:OnOpen(50,nil,WALK_DIR.IDLE_LEFT) Util.AddOnceClick(this.goToBtn, function() if not isGet and not isUser then