关卡动态页面和巅峰赛竞技场

onepiece_demo_arena
xiejun 2023-12-22 15:36:03 +08:00
parent dddcea85b4
commit 4f8f3955ce
21 changed files with 6137 additions and 5902 deletions

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c5155c66ff9feba40b4e74803b8e72f6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 80d6eddf194d5a14f9b58d53dd7cc861
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: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 04e6c5cebdae13246a9f0ac1d7dd864e
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 554 KiB

View File

@ -0,0 +1,121 @@
fileFormatVersion: 2
guid: 1c4ef194d6d26fc4c8459d0aee2b8e25
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: 0
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: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 80ebdb1468d2d924c900218ba6a97a8f
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 134 KiB

View File

@ -0,0 +1,121 @@
fileFormatVersion: 2
guid: 9937e1d658e17c742b63f1dd1bcb548e
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: 0
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: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 8af82d84a12fbcf4f82a7f83d9e9309b
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -4655,7 +4655,7 @@ Transform:
m_Children:
- {fileID: 3495385564306021834}
m_Father: {fileID: 4343374085003958}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1209647849817650
GameObject:
@ -4685,7 +4685,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4343374085003958}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1213128075059670
GameObject:
@ -4715,10 +4715,11 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4042530150172320}
- {fileID: 7495896893958308733}
- {fileID: 4766003879720862}
- {fileID: 4241021889837394}
- {fileID: 470611767861168568}
- {fileID: 4278947233578360}
- {fileID: 470611767861168568}
- {fileID: 4786634400228552}
- {fileID: 224657949855403072}
m_Father: {fileID: 0}
@ -4752,7 +4753,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4343374085003958}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1470601689274756
GameObject:
@ -4856,7 +4857,7 @@ RectTransform:
m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
m_Children: []
m_Father: {fileID: 4343374085003958}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -9632,8 +9633,87 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4343374085003958}
m_RootOrder: 3
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1828155164706886717
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7495896893958308733}
- component: {fileID: 8875844077273936333}
m_Layer: 0
m_Name: bg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7495896893958308733
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1828155164706886717}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.1, y: -0.9, z: 1}
m_LocalScale: {x: 1.5, y: 1.5, z: 1}
m_Children: []
m_Father: {fileID: 4343374085003958}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &8875844077273936333
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1828155164706886717}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 1c4ef194d6d26fc4c8459d0aee2b8e25, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 10.8, y: 19.2}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &2280485689332016104
GameObject:
m_ObjectHideFlags: 0
@ -9659,7 +9739,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2280485689332016104}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: -8.1, y: 8.28, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4766003879720862}
@ -9707,7 +9787,7 @@ SpriteRenderer:
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_Size: {x: 10.8, y: 19.2}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 0

View File

@ -290,7 +290,7 @@ MonoBehaviour:
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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 34
m_FontStyle: 0
m_BestFit: 1

View File

@ -1178,7 +1178,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &925842822
RectTransform:
m_ObjectHideFlags: 0
@ -3364,7 +3364,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: -32.1, y: 16}
m_AnchoredPosition: {x: 0, y: 348}
m_SizeDelta: {x: 884.1, y: 859.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &110786301129899403
@ -4701,7 +4701,7 @@ MonoBehaviour:
- initV3: {x: -1490, y: 366, z: 0}
initFloat: 0
isInit: 1
changeV3: {x: -32.1, y: 100, z: 0}
changeV3: {x: 0, y: 348, z: 0}
changeFloat: 0
duration: 0.3
delay: 0

View File

@ -140244,7 +140244,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3395394859769483035
RectTransform:
m_ObjectHideFlags: 0
@ -146602,7 +146602,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8447084894214429180}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:

View File

@ -63,7 +63,7 @@ function FightPointPassMainPanel:InitComponent()
invadeMonster:InitComponent(self.gameObject, this)
this.spLoader = SpriteLoader.New()
isAnimActive = false
--fightMap:InitComponent(self.gameObject, this)
fightMap:InitComponent(self.gameObject, this)
-- 通关豪礼入口
this.pgBtn=Util.GetGameObject(self.gameObject,"LeftUp/box/passGift")
this.pgFrame=Util.GetGameObject(this.pgBtn,"frame"):GetComponent("Image")
@ -373,7 +373,7 @@ function this.SetInitAnim()
-- fightSkeleton.AnimationState:SetAnimation(0, fightAnim[2], false)
-- isAnimActive = true
-- chooseAnim = FightPointPassManager.IsFightBoss() and 4 or 3
--fightMap.StopAction()
fightMap.StopAction()
UIManager.OpenPanel(UIName.FightLevelSwitchPopup, true)
end
@ -385,7 +385,7 @@ function this:PlayerKillAllSkill()
go.transform.localPosition =offset
go:SetActive(true)
this.skillTimer = Timer.New(function ()
--fightMap.AllBattleEnd()
fightMap.AllBattleEnd()
end,3)
this.skillTimer:Start()
Timer.New(function ()
@ -404,7 +404,7 @@ end
function FightPointPassMainPanel:AddListener()
invadeMonster:AddListener()
--fightMap:AddListener()
fightMap:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.FunctionCtrl.OnFunctionOpen, this.BtnsIsOpen)
Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold, this.UpdateFindTreasureMaterialNum)
Game.GlobalEvent:AddEvent(GameEvent.FindTreasure.RefreshFindTreasureRedPot, this.RefreshFindTreasureRedPoint)
@ -423,7 +423,7 @@ end
function FightPointPassMainPanel:RemoveListener()
invadeMonster:RemoveListener()
--fightMap:RemoveListener()
fightMap:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.FunctionCtrl.OnFunctionOpen, this.BtnsIsOpen)
Game.GlobalEvent:RemoveEvent(GameEvent.Bag.BagGold, this.UpdateFindTreasureMaterialNum)
Game.GlobalEvent:RemoveEvent(GameEvent.FindTreasure.RefreshFindTreasureRedPot, this.RefreshFindTre3asureRedPoint)
@ -532,7 +532,7 @@ function FightPointPassMainPanel:OnShow()
coroutine.start(function()
-- coroutine.wait(0.01)
if UIManager.IsOpen(UIName.FightPointPassMainPanel) then
--fightMap:Init()
fightMap:Init()
hasMap = true
end
end)
@ -800,10 +800,10 @@ end
-- 执行关卡战斗
function this.ExcuteBattle()
if not FightPointPassManager.IsChapterClossState() then
--fightMap.StopAction()
fightMap.StopAction()
if hasMap then
LogGreen("关闭挂机")
--fightMap:OnClose()
fightMap:OnClose()
hasMap = false
end
-- UIManager.OpenPanel(UIName.FightMiddleChoosePanel, FightPointPassManager.curOpenFight, true,function ()
@ -892,7 +892,7 @@ function FightPointPassMainPanel:OnSortingOrderChange()
--Util.AddParticleSortLayer(this.UI_Effect_MuBiaoJiangLi, self.sortingOrder - orginLayer)
Util.SetParticleSortLayer(this.fightSaoGuang, self.sortingOrder + 1)
Util.SetParticleSortLayer(this.fightGuideEffect, self.sortingOrder + 2)
--fightMap:OnSortingOrderChange(self.sortingOrder)
fightMap:OnSortingOrderChange(self.sortingOrder)
orginLayer = self.sortingOrder
@ -910,7 +910,7 @@ function FightPointPassMainPanel:OnClose()
hasLoad = false
invadeMonster:OnClose()
if hasMap then
--fightMap:OnClose()
fightMap:OnClose()
hasMap = false
end

View File

@ -21,36 +21,37 @@ local mapIdList = {
-- 临时可生成怪的区域
local monsterArea = {
[5005] = {
x_pos = {min = 8, max = 28},
y_pos = {min = 8, max = 14},
x_pos = {min = 2, max =6},
y_pos = {min = 2, max = 6},
},
[4002] = {
x_pos = {min = 8, max = 24},
y_pos = {min = 9, max = 23},
x_pos = {min = 2, max =6},
y_pos = {min = 2, max = 6},
},
[5002] = {
x_pos = {min = 9, max = 32},
y_pos = {min = 8, max = 16},
x_pos = {min = 2, max =7},
y_pos = {min = 2, max = 7},
},
[5003] = {
x_pos = {min = 8, max = 28},
y_pos = {min = 8, max = 14},
x_pos = {min = 2, max =6},
y_pos = {min = 2, max = 6},
},
[5004] = {
x_pos = {min = 8, max = 27},
y_pos = {min = 8, max = 15},
x_pos = {min = 2, max =6},
y_pos = {min = 2, max = 6},
},
}
--自己角色的出生点
local startUV = {
[5005] = {u = 15, v = 10},
[4002] = {u = 15, v = 15},
[5002] = {u = 15, v = 15},
[5003] = {u = 15, v = 10},
[5004] = {u = 15, v = 10},
[5005] = {u = 3, v = 3},
[4002] = {u = 3, v = 3},
[5002] = {u = 3, v = 3},
[5003] = {u = 3, v = 3},
[5004] = {u = 3, v = 3},
}
-- 允许出现的事件点的图标数量
local iconNum = 9
-- 地图图标的上限值
@ -109,7 +110,7 @@ function this:Init()
if not this.playerViews[0] then
--Log(m_curMapId)
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.guajigongneng) then
iconNum = 20
iconNum = 5
local randomNum = 0--math.random(2,3)
PlayerManager.GetFightMapPlayerNPCData(randomNum,function(NPCList)
if this.isClose then
@ -349,9 +350,11 @@ function this.LoadPointIcon(useAnim)
local u = math.random(area.x_pos.min, area.x_pos.max)
--Log("area.y_pos.min:"..tostring(area.y_pos.min).." area.y_pos.max:"..tostring(area.y_pos.max))
local v = math.random(area.y_pos.min, area.y_pos.max)
--Log("u:"..tostring(u).." v:"..tostring(v))
LogError("u:"..tostring(u).." v:"..tostring(v))
local pos = Map_UV2Pos(u, v)
if pos <256 then
LogError("小于256的uv"..u.."|"..v)
end
local mapPointId = math.random(1,maxIcon)
-- 随机出来的位置已经有图标,则再次随机
if this.iconList[pos] or pos == 1285 or this.IsHaveBitchNear(pos) or mapPointId==5 or mapPointId==7 then

View File

@ -268,9 +268,9 @@ function this.ShowSingleData(go,data,i)
Util.GetGameObject(go, "sdBtn/dianzanImage/Text"):GetComponent("Text").text = data.worshipTime
dianzanImage:SetActive(data.hadProud)
if data.hadProud then
sdBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_button_001")
sdBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("Btn_hz_cheng_01")
else
sdBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("f_feishengshi_huanganniu")
sdBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("Btn_hz_cheng_01")
end

View File

@ -69,7 +69,10 @@ function this.InithightLadderData(_msg)
enterable = _msg.enterable--是否可以参加 竞技场100名以内参加
isGroup = _msg.isGroup--是否被分组 是1 否0
isStart = _msg.isStart--是否在3周内在为0 不在为1 开服三周后功能开始
Log(string.format("获取到了当前为开服第%s周",tostring(isStart)))
if isStart==0 then
isStart=1
end
LogError(string.format("获取到了当前为开服第%s周",tostring(isStart)))
end
--推送更新
function this.IndicationHightLadderData(_msg)

View File

@ -165,8 +165,8 @@ function this.New(ulen, vlen)
instance.uLen = ulen
instance.vLen = vlen
instance.mapData = {}
for i = 1, ulen do
for j = 1, vlen do
for i = 0, ulen do
for j = 0, vlen do
instance.mapData[Map_UV2Pos(i, j)] = TileData.New(i, j,0)
end
end

View File

@ -47,7 +47,7 @@ local _tileSize
local _tileLivePool
local _tileClearPool
---chanllengeMapConfig的size字段
local _tileUMaxNum
local _tileVMaxNum
@ -246,6 +246,15 @@ function this.CameraScale(screenPoint, scale)
end
function this.IsOutArea(u, v)
if u<1 then
LogError("Out1")
elseif v<1 then
LogError("Out2")
elseif u>_tileUMaxNum then
LogError("Out3")
elseif v>_tileVMaxNum then
LogError("Out4")
end
return u < 1 or v < 1 or u > _tileUMaxNum or v > _tileVMaxNum
end
@ -344,6 +353,7 @@ local pathCache = {}
function this.ShowPath(u, v, targetU, targetV, funcCanPass)
this.ClearPath()
if this.IsOutArea(targetU, targetV) then
LogError("超出边界"..u.."and"..v.."targetU"..targetU.."targetV"..targetV)
return
end
local list = _mapData:FindPath(_mapData:GetMapData(u, v), _mapData:GetMapData(targetU, targetV), funcCanPass)
@ -554,8 +564,9 @@ function this.Init()
if not _bg then
_bg = transform:Find("BG#")
_bg:SetParent(transform, false)
--sample 1080 /100/2=54
_bgW = _mapConfig[_mapId].TileSize[1] / this.PIXELS_PER_UNIT / 2
--sample 1920 /100/2=96
_bgH = _mapConfig[_mapId].TileSize[2] / this.PIXELS_PER_UNIT / 2
local offsetX = math.ceil((_mapConfig[_mapId].TileSize[1]-_mapData.uLen*_defaultTileSize.x)/_defaultTileSize.x/2)
@ -681,7 +692,7 @@ function this.DrawTiles()
uiRoot = transform:Find("uiObj#")
uiRoot.gameObject:GetComponent("Canvas").worldCamera = ViewCamera
uiRoot.gameObject:GetComponent("RectTransform").sizeDelta = Vector2.New(_mapConfig[_mapId].TileSize[1], _mapConfig[_mapId].TileSize[2])
--uiRoot.transform.localPosition = _bg.localPosition
uiRoot.gameObject:SetActive(true)
while _tilesGroup.childCount > 0 do
GameObject.DestroyImmediate(_tilesGroup:GetChild(0).gameObject)

View File

@ -87,14 +87,14 @@ function PlayerLiveView:RemoveListener()
end
--界面打开时调用(用于子类重写)
function PlayerLiveView:OnOpen(scale,pos,dir)
function PlayerLiveView:OnOpen(scale,pos,dir,isMap)
if scale then
self.leader.transform.localScale = Vector3.New(scale,scale,scale)
end
if pos then
self.leader.transform.localPosition = pos
end
self:OnShowLive()
self:OnShowLive(isMap)
if dir then
self:SetWalkDir(dir)
end
@ -124,8 +124,14 @@ end
--加载三个立绘(称号 坐骑 皮肤)
function PlayerLiveView:OnShowLive()
function PlayerLiveView:OnShowLive(isMap)
-- LogBlue("self.rideLiveGo "..self.rideLiveGo.name)
local IsMap=false
if isMap==nil then
IsMap=false
else
IsMap=isMap
end
self.rideLiveGo:SetActive(false)
self.playerLiveGo:SetActive(false)
self.titleLiveGo:SetActive(false)
@ -140,7 +146,7 @@ function PlayerLiveView:OnShowLive()
--时装
if self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0 then
self.playerLiveGo:SetActive(true)
local skinId = tonumber( tostring(self.PlayerLiveViewData.skin) .. tostring(self.PlayerLiveViewData.sex))--皮肤 有男女之分 所以在id后加0 or 1
local skinId = tonumber( tostring(self.PlayerLiveViewData.skin) .. tostring(IsMap==true and 2 or self.PlayerLiveViewData.sex))--皮肤 有男女之分 所以在id后加0 or 1
local curPlayerRole = ConfigManager.GetConfigData(ConfigName.PlayerRole,skinId)
local curArtResourcesConfig = ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig,curPlayerRole.LiveAnimName)
local curLocalScale = Vector3.New(curArtResourcesConfig.Scale,curArtResourcesConfig.Scale,curArtResourcesConfig.Scale)

View File

@ -46,8 +46,8 @@ end
local sortingorder = 0
local hitRootPath = "UI_Map_XunBaoEffect_hit"
local npc1 = "live2d_npc_map_boy"
local npc2 = "live2d_npc_map_nv"
local npc1 = "live2d_map_meili"
local npc2 = "live2d_map_meili"
-- 飘血资源
local hurtRes = "FloatingText"
function SingleExplorePlayerView:InitComponent()
@ -626,7 +626,7 @@ function SingleExplorePlayerView:SetIconShow(_eventpoint)
if iconType == -1 then
self:NotBattleShow()
elseif iconType == 8 or iconType == 11 then -- 宝箱
self:SetWalkDir(WALK_DIR.JINGYA)
-- self:SetWalkDir(WALK_DIR.JINGYA)
if self.isSelf then
self.dialogueRoot.gameObject:SetActive(true)
self.dialogueRoot.transform.localEulerAngles = Vector3.New(0, m_roleTextPos[index].angleOffset, 0)
@ -647,7 +647,7 @@ function SingleExplorePlayerView:SetIconShow(_eventpoint)
end
self:NotBattleShow()
elseif iconType == 7 then -- NPC, 不一样的BB
self:SetWalkDir(WALK_DIR.JINGYA)
-- self:SetWalkDir(WALK_DIR.JINGYA)
if self.isSelf then
local str, str1 = ""
local strList,strList1 = {}

View File

@ -49,8 +49,8 @@ end
local sortingorder = 0
local hitRootPath = "UI_Map_XunBaoEffect_hit"
local npc1 = "live2d_npc_map_boy"
local npc2 = "live2d_npc_map_nv"
local npc1 = "live2d_map_meili"
local npc2 = "live2d_map_meili"
-- 飘血资源
local hurtRes = "FloatingText"
function SingleFightPlayerView:InitComponent()
@ -192,7 +192,7 @@ function SingleFightPlayerView:SetData(u,v,isSelf,data)
PracticeManager.SetPracticeIcon(self.PracticeIcon,data.practiceLevel)
end
end
self.playerLiveView:OnOpen(GetPlayerRoleSingleConFig().Scale2)
self.playerLiveView:OnOpen(GetPlayerRoleSingleConFig().Scale2,nil,nil,true)
self.playerLiveView:OnSortingOrderChange(sortingorder)
if isSelf then
self.playerLiveView:SetSelfTag()
@ -205,7 +205,7 @@ function SingleFightPlayerView:SetData(u,v,isSelf,data)
-- LogWarn(self.roleCurPos.u.."||"..self.roleCurPos.v)
self.bLeaderIsIdle = true
self:SetWalkDir(WALK_DIR.LAUCH)
-- self:SetWalkDir(WALK_DIR.LAUCH)
self:HideSomeTrash()
self:OnSortingOrderChange(self.parent.GetCurLayer())
@ -279,6 +279,12 @@ function SingleFightPlayerView:SetRoleHitTarget()
pos = self:SelectTargetPos()
end
--LogGreen("选中的点:"..tostring(pos).." "..tostring(self.userId))
if pos.x==0 then
LogError(tostring(pos).."pos.x")
end
if pos.y==0 then
LogError(tostring(pos).."pos.y")
end
local pathlist = self:SetRoleWalk(pos)
self:RoleMove(pathlist)
end)
@ -337,6 +343,9 @@ end
-- 获取当前图标的目标值,传入图标的坐标值, 就近原则
function SingleFightPlayerView:GetTargetPos(iconPos)
local u0, v0 = Map_Pos2UV(iconPos)
if u0==0 then
LogError("iconPos"..tostring(iconPos))
end
local posList = {
[1] = Vector2.New(u0, v0 - 1), -- 上
[2] = Vector2.New(u0, v0 + 1), -- 下
@ -365,6 +374,9 @@ function SingleFightPlayerView:GetTargetPos(iconPos)
end
local pos = posList[newList[1].index]
if pos.x==0 then
LogError(tostring(newList[1]))
end
return pos
end
@ -372,6 +384,9 @@ function SingleFightPlayerView:SetRoleWalk(targetPos)
local funcCanPass = function(data)
return data.val <= 1
end
if targetPos.x==0 then
LogError(tostring(targetPos))
end
local pathList = TileMapView.ShowPath(self.roleCurPos.u, self.roleCurPos.v, targetPos.x, targetPos.y, funcCanPass)
TileMapView.ClearPath()
return pathList
@ -547,7 +562,7 @@ function SingleFightPlayerView:SetIconShow(_eventpoint)
self.context.text = strList[FightPointPassManager.randomNum] or Language[12322]
self:NotBattleShow()
elseif iconType == 8 or iconType == 11 then -- 宝箱
self:SetWalkDir(WALK_DIR.JINGYA)
-- self:SetWalkDir(WALK_DIR.JINGYA)
if self.isSelf then
self.dialogueRoot.gameObject:SetActive(true)
self.dialogueRoot.transform.localEulerAngles = Vector3.New(0, m_roleTextPos[index].angleOffset, 0)
@ -568,7 +583,7 @@ function SingleFightPlayerView:SetIconShow(_eventpoint)
end
self:NotBattleShow()
elseif iconType == 7 then -- NPC, 不一样的BB
self:SetWalkDir(WALK_DIR.JINGYA)
-- self:SetWalkDir(WALK_DIR.JINGYA)
if self.isSelf then
local str, str1 = ""
local strList,strList1 = {}