【御剑行】提交

dev_chengFeng
ZhangBiao 2021-10-14 15:30:46 +08:00
parent 4eb6e1d9ae
commit 3d1a5ebd4c
10 changed files with 281 additions and 51 deletions

View File

@ -1,5 +1,79 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2979814043196781526
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1516490098041091239}
- component: {fileID: 7343700367924836283}
- component: {fileID: 4570732387350203493}
m_Layer: 0
m_Name: di
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1516490098041091239
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2979814043196781526}
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: 6079931969892452556}
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: 0}
m_SizeDelta: {x: 200, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7343700367924836283
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2979814043196781526}
m_CullTransparentMesh: 0
--- !u!114 &4570732387350203493
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2979814043196781526}
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: 6e536e4b62dcc6c43ac791552344d50f, 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 &3411260253700379205
GameObject:
m_ObjectHideFlags: 0
@ -239,7 +313,6 @@ GameObject:
m_Component:
- component: {fileID: 6079931969892452556}
- component: {fileID: 9139777253356738529}
- component: {fileID: 1603115514734952050}
m_Layer: 0
m_Name: Name
m_TagString: Untagged
@ -257,7 +330,9 @@ 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: 1516490098041091239}
- {fileID: 397450284916201891}
m_Father: {fileID: 8297825075348053570}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -274,41 +349,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4902773343167608226}
m_CullTransparentMesh: 0
--- !u!114 &1603115514734952050
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4902773343167608226}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, 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_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 50
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text:
LanguageIndex: 0
--- !u!1 &5077064202207718042
GameObject:
m_ObjectHideFlags: 0
@ -617,3 +657,83 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: -50}
m_SizeDelta: {x: 100, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8456773264218824696
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 397450284916201891}
- component: {fileID: 4537321093564969479}
- component: {fileID: 596016933847443796}
m_Layer: 0
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &397450284916201891
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8456773264218824696}
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: 6079931969892452556}
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: 0, y: 0}
m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4537321093564969479
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8456773264218824696}
m_CullTransparentMesh: 0
--- !u!114 &596016933847443796
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8456773264218824696}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, 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_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 50
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text:
LanguageIndex: 0

View File

@ -137,6 +137,80 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &156683495737600235
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6567456149468595464}
- component: {fileID: 1475508844113600877}
- component: {fileID: 2152465188647714457}
m_Layer: 0
m_Name: redPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6567456149468595464
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 156683495737600235}
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: 1337108380664959713}
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 &1475508844113600877
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 156683495737600235}
m_CullTransparentMesh: 0
--- !u!114 &2152465188647714457
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 156683495737600235}
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 &263847803420851068
GameObject:
m_ObjectHideFlags: 0
@ -669,7 +743,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3558052596352230989
RectTransform:
m_ObjectHideFlags: 0
@ -2617,7 +2691,8 @@ 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: 6567456149468595464}
m_Father: {fileID: 7925044777977901434}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@ -985,6 +985,10 @@ RedPointType = {
--七界试炼
QiJieShiLian = 860,--入口
QiJieTreasure = 8601,--秘宝
--御剑行
YuJianXingMian = 870,--主界面
YuJianXingTime = 8701,--次数
YuJianXingRecord = 8702,--纪录
}
RedPointStatus = {

View File

@ -642,14 +642,13 @@ function this:BindEvent()
end)
Util.AddClick(this.btnHongMeng,function()
-- NetManager.HongMengInfoResponse(function ()
-- if HarmonyManager:HongMengTowerUpLimit() > 0 then
-- UIManager.OpenPanel(UIName.HongMengEnvoyPanel)
-- else
-- UIManager.OpenPanel(UIName.HongMengPanel)
-- end
-- end)
UIManager.OpenPanel(UIName.YuJianXingPanel)
NetManager.HongMengInfoResponse(function ()
if HarmonyManager:HongMengTowerUpLimit() > 0 then
UIManager.OpenPanel(UIName.HongMengEnvoyPanel)
else
UIManager.OpenPanel(UIName.HongMengPanel)
end
end)
end)
Util.AddClick(this.btnTianShuMiJuan,function()

View File

@ -304,6 +304,9 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.DailyRecharge,RedPointType.RightUp2)
--七界试炼
RPData:SetParent(RedPointType.QiJieShiLian, RedPointType.JumpServer_MainCity)
--御剑行
RPData:SetParent(RedPointType.YuJianXingRecord, RedPointType.YuJianXingMian)
RPData:SetParent(RedPointType.YuJianXingTime, RedPointType.YuJianXingMian)
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.ActivityGroups)) do
if v.RpType > 0 and v.RpTypeParent > 0 then
@ -572,6 +575,9 @@ function this.RegisterRedCheckFunc()
--七界试炼
RPData:AddCheckFunc(RedPointType.QiJieShiLian,QiJieShiLianManager.CheckQiJieRedPoint,FUNCTION_OPEN_TYPE.QIJIESHILIAN)
RPData:AddCheckFunc(RedPointType.LikeabilityRed,LikabilityManager.CheckRedPot)
--御剑行
RPData:AddCheckFunc(RedPointType.YuJianXingRecord,YuJianXingManager.CheckBetRecord)
RPData:AddCheckFunc(RedPointType.YuJianXingTime,YuJianXingManager.CheckBetTime)
end
-- 向红点绑定物体

View File

@ -63,8 +63,10 @@ end
function this:Refresh()
local curGetNum = BagManager.GetTotalItemNum(configData.JoinCost[1]) > configData.MaxRaiseNum[2] and configData.MaxRaiseNum[2] or BagManager.GetTotalItemNum(configData.JoinCost[1])
self.curNum.text = BagManager.GetTotalItemNum(configData.JoinCost[1])
self.minNum.text = configData.JoinCost[2]
self.minNum.text = configData.JoinCost[2].."/次"
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.maxValue = curGetNum
self.buyNumLab.text = self.slider.value
self:SetTime()
@ -72,7 +74,6 @@ end
function this:SetTime()
local roundTime = YuJianXingManager.nextTimeCount- GetTimeStamp()
LogRed("roundTime:"..tostring(TimeToMS(roundTime)))
if self.timer then
self.timer:Stop()
self.timer = nil

View File

@ -93,7 +93,6 @@ function this:SingleDataShow(go,data)
end
function this:OnClose()
LogRed("############")
end
function this:OnDestroy()

View File

@ -38,7 +38,7 @@ function RiceSinglePlayerView:InitComponent()
self.gameObject:GetComponent("RectTransform").sizeDelta = Vector2.New(12500,100)
self.player = Util.GetGameObject(self.gameObject,"Root")
self.playerRoot = Util.GetGameObject(self.gameObject,"Player")
self.playerName = Util.GetGameObject(self.playerRoot,"Name"):GetComponent("Text")
self.playerName = Util.GetGameObject(self.playerRoot,"Name/Text"):GetComponent("Text")
self.playerLiveRoot = Util.GetGameObject(self.player,"Live")
self.swordRoot = Util.GetGameObject(self.player,"Sword")
self.upPre = Util.GetGameObject(self.gameObject,"upPre")

View File

@ -2,6 +2,7 @@ YuJianXingManager = {}
local this = YuJianXingManager
local riceCtrl = require("Modules/YuJianXing/RiceCtrlView")
local bgList = {"y_yujianxing_bg","y_yujianxing_bg","y_yujianxing_bg","y_yujianxing_bg","y_yujianxing_bg"}
local configData = ConfigManager.GetConfigData(ConfigName.RidingSwardConfig,1)
function this.Initialize()
this.joinCount = 0--参与投注的轮数
@ -60,6 +61,7 @@ function this.UpdataServerPanelData(msg,func)
this.curResultId = {}
this.curResultId = msg.rankId
Game.GlobalEvent:DispatchEvent(GameEvent.YuJianXing.UpdateRank)
CheckRedPointStatus(RedPointType.YuJianXingMian)
if func then
func()
end
@ -84,6 +86,7 @@ function this.UpdataServerData(msg,func)
end
end )
this.joinCount = msg.betCount--参与投注的轮数
CheckRedPointStatus(RedPointType.YuJianXingMian)
if func then
func()
end
@ -125,4 +128,24 @@ function this.ResetPlayerPosVertical()
this.riceCtrl:ResetPlayerPosVertical()
end
function this.CheckBetTime()
local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.YuJianXing)
NetManager.RidingSwardActivityRequest(id,function ()
LogGreen("御剑行:"..tostring(configData.JoinCount - this.joinCount ))
return configData.JoinCount - this.joinCount > 0
end)
end
function this.CheckBetRecord()
NetManager.RidingSwardInfoRequest(function ()
for i = 1, #this.curRecordList do
if this.curRecordList[i].state == 0 then
LogYellow("御剑行true")
return true
end
end
LogYellow("御剑行false")
return false
end)
end
return YuJianXingManager

View File

@ -11,6 +11,7 @@ function YuJianXingPanel:InitComponent()
self.helpPosition = self.helpBtn:GetComponent("RectTransform").localPosition
self.btnBet = Util.GetGameObject(self.gameObject, "Bgs/Down/btns/btnBet")
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")
self.btnStore = Util.GetGameObject(self.gameObject, "Bgs/Down/btns/btnStore")
--Text
@ -70,6 +71,7 @@ function YuJianXingPanel:BindEvent()
end
JumpManager.GoJump(20003)
end)
BindRedPointObject(RedPointType.YuJianXingRecord,self.redPoint)
end
--添加事件监听(用于子类重写)
@ -215,6 +217,7 @@ end
--界面销毁时调用(用于子类重写)
function YuJianXingPanel:OnDestroy()
SubUIManager.Close(self.UpView)
ClearRedPointObject(RedPointType.YuJianXingRecord,self.redPoint)
end
return YuJianXingPanel