From 747cb5b179fad9da2fced24255a17b69c5b6e03b Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 22 Oct 2021 10:00:19 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=BE=A1=E5=89=91=E8=A1=8C=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/YuJianXing/YuJianXingPanel.prefab | 111 +++++++++++++++--- .../GeneralPopup_YuJianXingBetSelectNum.lua | 2 + .../Modules/YuJianXing/YuJianXingManager.lua | 3 + .../Modules/YuJianXing/YuJianXingPanel.lua | 2 + 4 files changed, 100 insertions(+), 18 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/YuJianXing/YuJianXingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/YuJianXing/YuJianXingPanel.prefab index fe69c96f4d..09bc684249 100644 --- a/Assets/ManagedResources/Prefabs/UI/YuJianXing/YuJianXingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/YuJianXing/YuJianXingPanel.prefab @@ -295,10 +295,10 @@ RectTransform: m_Father: {fileID: 7925044777977901434} 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -374.5, y: -95.1} + m_SizeDelta: {x: 135, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1413377403886121470 CanvasRenderer: @@ -467,14 +467,15 @@ RectTransform: 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_Children: + - {fileID: 925792380096195027} m_Father: {fileID: 7925044777977901434} 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 96.5, y: -100} + m_SizeDelta: {x: 127, y: 127} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2883137899742134249 CanvasRenderer: @@ -2198,6 +2199,80 @@ MonoBehaviour: isPlayAudio: 1 isHaveCloseBtn: 0 isPlayOnOpen: 1 +--- !u!1 &7401818397706342110 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 925792380096195027} + - component: {fileID: 2101827253434861445} + - component: {fileID: 53769735263096255} + m_Layer: 0 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &925792380096195027 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7401818397706342110} + 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: 8782900371060601793} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -15, y: -15} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2101827253434861445 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7401818397706342110} + m_CullTransparentMesh: 0 +--- !u!114 &53769735263096255 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7401818397706342110} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + 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 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7438625072412861187 GameObject: m_ObjectHideFlags: 0 @@ -2777,10 +2852,10 @@ RectTransform: m_Father: {fileID: 7925044777977901434} 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -60.5, y: -100} + m_SizeDelta: {x: 127, y: 127} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5860288051094810877 CanvasRenderer: @@ -2927,7 +3002,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8896780380840302078} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -2978,10 +3053,10 @@ RectTransform: m_Father: {fileID: 7925044777977901434} m_RootOrder: 2 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -217.5, y: -100} + m_SizeDelta: {x: 127, y: 127} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5649778032499402204 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingBetSelectNum.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingBetSelectNum.lua index 15a2285890..f3e15cc6a2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingBetSelectNum.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YuJianXingBetSelectNum.lua @@ -68,6 +68,8 @@ function this:Refresh() self.slider.value = configData.JoinCost[2] self.icon.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(configData.JoinCost[1])) self.icon1.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(configData.JoinCost[1])) + self.slider.minValue = configData.JoinCost[2] + LogGreen("curGetNum:"..tostring(curGetNum)) self.slider.maxValue = curGetNum self.buyNumLab.text = self.slider.value self:SetTime() diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua index 7291f25052..9c9a304382 100644 --- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua @@ -57,6 +57,9 @@ function this.UpdataServerPanelData(msg,func) Log("界面剧本Id:"..tostring(msg.rankId).." 当前state:"..tostring(msg.state).." 下一阶段倒计时:"..TimeToMS(this.nextTimeCount- GetTimeStamp() ).." 模板玩家数:"..tostring(#msg.modelInfo)) this.modelList = {} this.modelList = msg.modelInfo--玩家模板信息 + if #this.modelList < 4 or not this.modelList[1] then + this.modelList = {[1] = {userName = "张大喵",sex = 0},[2] = {userName = "牛马山庄",sex = 0},[3] = {userName = "老八",sex = 0},[4] = {userName = "哎呦我去",sex = 0}} + end this.activityTimeCount = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.YuJianXing).endTime this.curResultId = {} this.curResultId = msg.rankId diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua index 80601d6005..9d3cc2128d 100644 --- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua @@ -10,6 +10,7 @@ function YuJianXingPanel:InitComponent() self.helpBtn = Util.GetGameObject(self.gameObject, "helpBtn") self.helpPosition = self.helpBtn:GetComponent("RectTransform").localPosition self.btnBet = Util.GetGameObject(self.gameObject, "Bgs/Down/btns/btnBet") + self.redPointBet = Util.GetGameObject(self.btnBet, "redPoint") self.btnRecord = Util.GetGameObject(self.gameObject, "Bgs/Down/btns/btnRecord") self.redPoint = Util.GetGameObject(self.btnRecord, "redPoint") self.btnRank = Util.GetGameObject(self.gameObject, "Bgs/Down/btns/btnRank") @@ -183,6 +184,7 @@ function YuJianXingPanel:SetTime() end self.canBetTime.text = string.format( "今日可竞猜次数:%s次",configData.JoinCount - YuJianXingManager.joinCount) self.redPoint:SetActive(YuJianXingManager.CheckRecordList()) + self.redPointBet:SetActive(configData.JoinCount - YuJianXingManager.joinCount > 0) self.timer = Timer.New(function () self.redPoint:SetActive(YuJianXingManager.CheckRecordList()) --设置人物上下飘动2s重置一次