神尊特权 幸运转盘 GM刷冲礼包功能优化

dev_chengFeng
yuanshuai 2022-11-03 10:57:45 +08:00
parent 3aeed057e4
commit 45ad268ee8
8 changed files with 1803 additions and 1343 deletions

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: efb6d932cb8cbed4cb4169243c4dff50
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -314,7 +314,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -1.1, y: 0.00003968537}
m_AnchoredPosition: {x: -1.1, y: 0.000013566339}
m_SizeDelta: {x: 605, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &3433873305574489859
@ -909,9 +909,9 @@ RectTransform:
m_Father: {fileID: 8179482656062654083}
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, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 93, y: -25}
m_SizeDelta: {x: 0, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7312131547045877569
@ -2490,7 +2490,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 0.000013582505}
m_AnchoredPosition: {x: 0, y: 0.000039701532}
m_SizeDelta: {x: 195.7, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &3587392954050606833

View File

@ -7121,6 +7121,7 @@ RectTransform:
- {fileID: 165462485454605335}
- {fileID: 2025934754434711663}
- {fileID: 1248926969036112801}
- {fileID: 3999239444542945653}
m_Father: {fileID: 986452627335843391}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -77842,6 +77843,219 @@ ParticleSystemRenderer:
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
m_MaskInteraction: 0
--- !u!1 &7428186389609163065
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3999239444542945653}
- component: {fileID: 3006110700099534767}
- component: {fileID: 315478921201148480}
- component: {fileID: 6899447948068342917}
- component: {fileID: 1799401624212926467}
m_Layer: 5
m_Name: btnGMGift
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3999239444542945653
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7428186389609163065}
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:
- {fileID: 8364985247832632234}
- {fileID: 6553487087509411090}
m_Father: {fileID: 7019400324678272696}
m_RootOrder: 7
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: 208.70001, y: 187.80005}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3006110700099534767
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7428186389609163065}
m_CullTransparentMesh: 0
--- !u!114 &315478921201148480
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7428186389609163065}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 3
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 6899447948068342917}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &6899447948068342917
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7428186389609163065}
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: ce6a5e8caebae894bbb7d3eeb17e8dcb, 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!95 &1799401624212926467
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7428186389609163065}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &7442828269505751828
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6553487087509411090}
- component: {fileID: 8430770035766714770}
- component: {fileID: 2563297158266493770}
m_Layer: 5
m_Name: redPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6553487087509411090
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7442828269505751828}
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: 3999239444542945653}
m_RootOrder: 1
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: 35.4, y: 23.6}
m_SizeDelta: {x: 26, y: 26}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8430770035766714770
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7442828269505751828}
m_CullTransparentMesh: 0
--- !u!114 &2563297158266493770
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7442828269505751828}
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: 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_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 &7452369888929946402
GameObject:
m_ObjectHideFlags: 0
@ -92812,6 +93026,80 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u4ECA\u65E5\u53EF\u9886"
LanguageIndex: 0
--- !u!1 &8862042990930144155
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8364985247832632234}
- component: {fileID: 8106363761748936195}
- component: {fileID: 1178334903063699395}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8364985247832632234
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8862042990930144155}
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: 3999239444542945653}
m_RootOrder: 0
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: 0, y: 6.1}
m_SizeDelta: {x: 200, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8106363761748936195
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8862042990930144155}
m_CullTransparentMesh: 0
--- !u!114 &1178334903063699395
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8862042990930144155}
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: 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_Sprite: {fileID: 21300000, guid: a2ea741f017c1a947b6bb9dc2b460bdc, 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 &8880603617350584825
GameObject:
m_ObjectHideFlags: 0

View File

@ -1,4 +1,4 @@
-- Lua中的继承
-- Lua中的继承
function Inherit(tbParent, tbChild)
if not tbParent then
local o = tbChild or {}
@ -2761,6 +2761,7 @@ function CheckFunctionOpen(_funId)
--1关卡开启
--2玩家等级开启
--3鸿蒙阵神将等级
--4购买礼包开启
local openRule = data.OpenRules
if openRule then
if openRule[1] == 1 and not FightPointPassManager.IsFightPointPass(openRule[2]) then -- 关卡开启
@ -2769,6 +2770,8 @@ function CheckFunctionOpen(_funId)
return false
elseif openRule[1] == 3 and HarmonyManager.GetSingleAdditions(HarmonyAddType.AddLv) < openRule[2] then -- 鸿蒙阵神将共鸣等级
return false
elseif openRule[1] == 4 and not OperatingManager.IsBuyGift(openRule[2]) then
return false
end
end
--1#创角

View File

@ -476,6 +476,7 @@ UIName = {
GMEspecially=484,--gm创角即送
GMMingWangPanel=485,--gm名望特权
ActivityChongRank=486,--gm开服冲榜
GMShuaChongTeQuan=487,--GM礼包
}
SubUIConfig = {
@ -562,7 +563,7 @@ SubUIConfig = {
[39] = {name = "FightLevelTrialPanel",assetName = "FightLevelTrialPanel",script = "Modules/FightLevel/FightLevelTrialPanel"},
[40] = {name = "ShenzunPrivilegePage",assetName = "ShenzunPrivilegePage",script = "Modules/Operating/ShenzunPrivilegePage"},
[41] = {name = "HHBJPage",assetName = "HHBJPage",script = "Modules/Operating/HHBJPage"},
[42] = {name = "GMShuaChongTeQuan",assetName = "GMShuaChongTeQuan",script = "Modules/Operating/GMShuaChongTeQuan"},
-- [42] = {name = "GMShuaChongTeQuan",assetName = "GMShuaChongTeQuan",script = "Modules/Operating/GMShuaChongTeQuan"},
[43] = {name = "GMFreeRecharge",assetName = "GMFreeRecharge",script = "Modules/Operating/GMFreeRecharge"},
[44] = {name = "GMTurnTablePanel",assetName = "GMTurnTablePanel",script = "Modules/LuckyTurnTable/GMTurnTablePanel"},
}

View File

@ -145,6 +145,12 @@ function this:InitComponent()
Util.GetGameObject(this.btnGMChange,"Image"):GetComponent("Image").sprite=this.spLoader:LoadSprite("gm_change_maincity_btn_zh")
this.gmRedPoint = Util.GetGameObject(this.btnGMChange,"redPoint")
this.gmRedPoint:SetActive(false)
--gm礼包
this.btnGMGift=Util.GetGameObject(self.gameObject,"RightDown/btnGMGift")
Util.GetGameObject(this.btnGMGift,"Image"):GetComponent("Image").sprite=this.spLoader:LoadSprite("gm_change_maincity_btn_zh")
this.gmRedPoint = Util.GetGameObject(this.btnGMGift,"redPoint")
this.gmRedPoint:SetActive(false)
--名望系统
this.btnMingWang=Util.GetGameObject(self.gameObject,"RightDown/btnMingWang")
Util.GetGameObject(this.btnMingWang,"Image"):GetComponent("Image").sprite=this.spLoader:LoadSprite("gm_mingwang_icon")
@ -687,13 +693,17 @@ function this:BindEvent()
UIManager.OpenPanel(UIName.GMChangePanel)
end)
Util.AddClick(this.btnGMGift,function()
UIManager.OpenPanel(UIName.GMShuaChongTeQuan)
end)
Util.AddClick(this.btnMingWang,function()
UIManager.OpenPanel(UIName.GMMingWangPanel)
end)
Util.AddClick(this.btnShenzun,function()
UIManager.OpenPanel(UIName.NewShenZunPanel)
end)
Util.AddClick(this.btnTianShuMiJuan,function()
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.tianshumijuan) then
UIManager.OpenPanel(UIName.TianShuMiJuan,1)
@ -705,8 +715,9 @@ function this:BindEvent()
Util.AddClick(this.btnXingYunTanBao,function()
-- UIManager.OpenPanel(UIName.LuckyTurnTablePanel)
-- this.ScenceBtnClick(FUNCTION_OPEN_TYPE.LUCKYTURN)
JumpManager.GoJump(1027)
this.ScenceBtnClick(FUNCTION_OPEN_TYPE.LUCKYTURN)
-- JumpManager.GoJump(1027)
-- this.ScenceBtnClick(FUNCTION_OPEN_TYPE.LUCKYTURN)
UIManager.OpenPanel(UIName.ActivityMainPanel,40,5)
end)
Util.AddClick(this.btnExplore,function()
@ -1289,6 +1300,7 @@ function this:OnShow()
end
PlayerManager.StarBattleUpLvTipTime(1)
this.battleUpLvTip:SetActive(false)
this.btnShenzun:SetActive(CheckFunctionOpen(FUNCTION_OPEN_TYPE.NewShenzun))
--检测灵兽红点
PokemonManager.CheckRedPointStatusPokemonMainCityRed()

View File

@ -1,5 +1,7 @@

local GMShuaChongTeQuan = {}
require("Base/BasePanel")
GMShuaChongTeQuan = Inherit(BasePanel)
-- local GMShuaChongTeQuan = {}
self=GMShuaChongTeQuan
local sortingOrder = 0
local TabBox = require("Modules/Common/TabBox")
@ -9,13 +11,13 @@ local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_
[4] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "无上GM",img = "gm_shuachong_wsGM_01_zh",id=2204 },
}
function GMShuaChongTeQuan:New(gameObject)
local b = {}
b.gameObject = gameObject
b.transform = gameObject.transform
setmetatable(b, { __index = GMShuaChongTeQuan })
return b
end
-- function GMShuaChongTeQuan:New(gameObject)
-- local b = {}
-- b.gameObject = gameObject
-- b.transform = gameObject.transform
-- setmetatable(b, { __index = GMShuaChongTeQuan })
-- return b
-- end
local TabAdapter=nil
local SwitchView=nil
local infoList={}
@ -24,6 +26,7 @@ local dayList={}
--初始化组件(用于子类重写)
function GMShuaChongTeQuan:InitComponent()
self.spLoader = SpriteLoader.New()
self.btnBack = Util.GetGameObject(self.transform, "backBtn")
self.grid = Util.GetGameObject(self.gameObject, "grid")
self.titleImg=Util.GetGameObject(self.gameObject, "bg1/shenzuntequanName"):GetComponent("Image")
self.btn_buy=Util.GetGameObject(self.gameObject, "bg1/bg2/btn_buy")
@ -148,7 +151,9 @@ end
--绑定事件(用于子类重写)
function GMShuaChongTeQuan:BindEvent()
Util.AddClick(self.btnBack, function()
self:ClosePanel()
end)
end
--添加事件监听(用于子类重写)
@ -173,7 +178,7 @@ end
-- 打开,重新打开时回调
function GMShuaChongTeQuan:OnShow(_sortingOrder)
self.gameObject:SetActive(true)
-- self.gameObject:SetActive(true)
sortingOrder = _sortingOrder
end
@ -185,7 +190,7 @@ local activityData={}
--界面关闭时调用(用于子类重写)
function GMShuaChongTeQuan:OnClose()
self.gameObject:SetActive(false)
-- self.gameObject:SetActive(false)
end
--界面销毁时调用(用于子类重写)
function GMShuaChongTeQuan:OnDestroy()