【御剑行】提交

dev_chengFeng
ZhangBiao 2021-10-14 18:02:30 +08:00
parent cd04fc3d37
commit 46d38b01ec
7 changed files with 194 additions and 14 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

View File

@ -0,0 +1,99 @@
fileFormatVersion: 2
guid: 3163a133e2b82fc4c92d5395f31c55e5
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 2e07e7aef4e91f5459c7f67f4720a790
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TagAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -612,7 +612,7 @@ RectTransform:
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: 193.8, y: 20.2}
m_AnchoredPosition: {x: 212, y: 20.2}
m_SizeDelta: {x: 520.6, y: 163}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8394200931281104665
@ -802,6 +802,86 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &3100141905683586139
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3070260945047934797}
- component: {fileID: 72890709324579209}
- component: {fileID: 3515077434335806758}
m_Layer: 0
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3070260945047934797
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3100141905683586139}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 60.942368}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 382989129249096390}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -1, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &72890709324579209
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3100141905683586139}
m_CullTransparentMesh: 0
--- !u!114 &3515077434335806758
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3100141905683586139}
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: 0.9019608, b: 0.63529414, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 36
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u7ADE\u731C\u6709\u793C"
LanguageIndex: 0
--- !u!1 &3202043061616719039
GameObject:
m_ObjectHideFlags: 0
@ -1665,14 +1745,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: 3070260945047934797}
m_Father: {fileID: 7225928139430877591}
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: -261, y: 0}
m_SizeDelta: {x: 20, y: 191}
m_SizeDelta: {x: 50, y: 191}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2076739492594695998
CanvasRenderer:
@ -1702,7 +1783,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: e18e0fda570ca8140ad838af36b88960, type: 3}
m_Sprite: {fileID: 21300000, guid: 9a9a19e7998087f4caa9c49984bc79f0, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -488,7 +488,7 @@ PanelType = {
QiJie = {14,16,1240},--七界试炼
WorldArena = { 107,16,23}, --玉虚论道
Compound_equip = { 14, 16,1258 }, --装备合成
YuJianXing = {14,16}--御剑行
YuJianXing = {14,16,1010}--御剑行
}

View File

@ -4,7 +4,7 @@ local rankImg = {
[1] = "r_Dungeon_001",
[2] = "r_Dungeon_002",
[3] = "r_Dungeon_003",
[4] = "y_yujianxing_paimingsi",
[4] = "r_Dungeon_004",
}
local SwordImg = {
[1] = "y_yujianxing_banner01_01",

View File

@ -60,8 +60,8 @@ function this.UpdataServerPanelData(msg,func)
this.activityTimeCount = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.YuJianXing).endTime
this.curResultId = {}
this.curResultId = msg.rankId
Log("界面剧本Id:"..tostring(msg.rankId))
Game.GlobalEvent:DispatchEvent(GameEvent.YuJianXing.UpdateRank)
-- CheckRedPointStatus(RedPointType.YuJianXingMian)
if func then
func()
end
@ -86,7 +86,6 @@ function this.UpdataServerData(msg,func)
end
end )
this.joinCount = msg.betCount--参与投注的轮数
-- CheckRedPointStatus(RedPointType.YuJianXingMian)
if func then
func()
end

View File

@ -57,11 +57,13 @@ function YuJianXingPanel:BindEvent()
end)
Util.AddOnceClick(self.btnRecord,function ()
if #YuJianXingManager.curRecordList <= 0 then
PopupTipPanel.ShowTip("暂无竞猜纪录!")
return
end
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.YuJianXingRecord)
NetManager.RidingSwardInfoRequest(function ()
if #YuJianXingManager.curRecordList <= 0 then
PopupTipPanel.ShowTip("暂无竞猜纪录!")
return
end
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.YuJianXingRecord)
end)
end)
Util.AddOnceClick(self.btnRank,function ()
@ -156,7 +158,6 @@ function YuJianXingPanel:StartAnimation()
end
function YuJianXingPanel:SetTime()
LogBlue("设置了时间~")
if self.timer then
self.timer:Stop()
self.timer = nil