Prg_ZhangXuheng
/
NLDClient-yudde
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://1.14.122.170:3000/PHXH/NLDClient

main
mashaohua 2025-10-21 17:51:53 +08:00
parent d8cf27df79 268e957137
commit 63472d5242
25 changed files with 2279 additions and 3000 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ProjectNLD/Assets/Art/Character/Models/Battery/R00057/R00057.FBX (Stored with Git LFS)
View File

Binary file not shown.

BIN
ProjectNLD/Assets/Art/Character/Models/Vehicle/C00067/C00067.FBX (Stored with Git LFS)
View File

Binary file not shown.

2
ProjectNLD/Assets/Art/Scene/Map/Mat/Maps03_Woodland_b_5_2.mat.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 84e80750b5a59cb42b7639a8b70a2e30
guid: 5ede66ec927b9c54abf94f7a16ed7ab0
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

BIN
ProjectNLD/Assets/Art/UI/Texture/CampNew/UI_dispatch.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

140
ProjectNLD/Assets/Art/UI/Texture/CampNew/UI_dispatch.png.meta Normal file
View File

@ -0,0 +1,140 @@
fileFormatVersion: 2
guid: 35632b4183c180d45934b7cfff5573b2
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
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
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
ProjectNLD/Assets/Art/UI/Texture/TrainAssign/UI_dispatch_Finish_di.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

140
ProjectNLD/Assets/Art/UI/Texture/TrainAssign/UI_dispatch_Finish_di.png.meta Normal file
View File

@ -0,0 +1,140 @@
fileFormatVersion: 2
guid: 43aca50b772cffe48bbb840618109977
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
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
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

2
ProjectNLD/Assets/Art_Out/UI/Prefab/Camp/UI_Camp.prefab
View File

@ -478,7 +478,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &963564873180621856
RectTransform:
m_ObjectHideFlags: 0

146
ProjectNLD/Assets/Art_Out/UI/Prefab/LegionBattleNew/UI_LB_BattleRes.prefab
View File

@ -24764,141 +24764,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &4836953860966565037
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5385278835410328557}
- component: {fileID: 4652670500835870520}
- component: {fileID: 4828544980558355245}
m_Layer: 5
m_Name: TextRes
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5385278835410328557
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4836953860966565037}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3388828544067979572}
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: 109.3, y: -45.600006}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4652670500835870520
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4836953860966565037}
m_CullTransparentMesh: 1
--- !u!114 &4828544980558355245
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4836953860966565037}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u52BF\u5747\u529B\u654C"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: d996718f19de68245bc356be2938e063, type: 2}
m_sharedMaterial: {fileID: -8559898196655864114, guid: d996718f19de68245bc356be2938e063,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4278190335
m_fontColor: {r: 1, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 42
m_fontSizeBase: 42
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &4838355405782606475
GameObject:
m_ObjectHideFlags: 0
@ -24928,7 +24793,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2177017390283887315}
- {fileID: 5385278835410328557}
- {fileID: 6736714497376719573}
- {fileID: 5577855119359796392}
m_Father: {fileID: 1963831367310329197}
@ -28826,8 +28690,8 @@ 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: -80.7, y: -45.600006}
m_SizeDelta: {x: 200, y: 50}
m_AnchoredPosition: {x: 0, y: -45.5}
m_SizeDelta: {x: 600, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3512033394659237961
CanvasRenderer:
@ -28857,7 +28721,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u6218\u6597\u7ED3\u679C-"
m_text: "\u6218\u6597\u7ED3\u679C-<color=#ff0000>\u5168\u519B\u8986\u6CA1</color>"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: d996718f19de68245bc356be2938e063, type: 2}
m_sharedMaterial: {fileID: -8559898196655864114, guid: d996718f19de68245bc356be2938e063,
@ -28892,8 +28756,8 @@ MonoBehaviour:
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0

16
ProjectNLD/Assets/Art_Out/UI/Prefab/Medal/UI_ConfirmClaimMedal.prefab
View File

@ -535,6 +535,7 @@ GameObject:
- component: {fileID: 2674151210539335688}
- component: {fileID: 1884636584443821548}
- component: {fileID: 4959295927281491276}
- component: {fileID: 1685817192477544690}
m_Layer: 5
m_Name: TextClickCloseDesc
m_TagString: Untagged
@ -589,7 +590,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u70B9\u51FB\u4EFB\u610F\u51FA\u7EE7\u7EED"
m_text: Medal_GetInfo
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: d996718f19de68245bc356be2938e063, type: 2}
m_sharedMaterial: {fileID: -8559898196655864114, guid: d996718f19de68245bc356be2938e063,
@ -659,6 +660,19 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &1685817192477544690
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6411496975045003580}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4545b363802045e3a540e37e426a5df3, type: 3}
m_Name:
m_EditorClassIdentifier:
text_key: Medal_GetInfo
--- !u!1 &8588731722528660264
GameObject:
m_ObjectHideFlags: 0

94
ProjectNLD/Assets/Art_Out/UI/Prefab/Train/UI_AssignPanel.prefab
View File

@ -160,17 +160,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 790888254233167636}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4592134867282015867}
m_Father: {fileID: 7248714673279684707}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: -67.74}
m_SizeDelta: {x: 0, y: 3}
m_AnchoredPosition: {x: -0.00012207031, y: 50.39}
m_SizeDelta: {x: 373.86, y: 3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1645786233684350069
CanvasRenderer:
@ -193,14 +193,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0.9843138, g: 1, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 73400c06185760d46bd24366c8b0743f, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -384,6 +384,81 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &1360383760788756354
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1760873088141769411}
- component: {fileID: 1957157822559389259}
- component: {fileID: 7533093932595423477}
m_Layer: 5
m_Name: ImageLine (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1760873088141769411
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1360383760788756354}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2088957896247983721}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -2.8867188, y: -458}
m_SizeDelta: {x: -231.3359, y: 3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1957157822559389259
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1360383760788756354}
m_CullTransparentMesh: 1
--- !u!114 &7533093932595423477
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1360383760788756354}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 73400c06185760d46bd24366c8b0743f, 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
m_PixelsPerUnitMultiplier: 1
--- !u!1 &2507617826231452611
GameObject:
m_ObjectHideFlags: 0
@ -1082,13 +1157,12 @@ RectTransform:
- {fileID: 6768870737461535244}
- {fileID: 5100949244044434012}
- {fileID: 1689711021515480332}
- {fileID: 8365985457293435796}
- {fileID: 5787875564461738149}
m_Father: {fileID: 6470094911541836932}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 242.6, y: -113}
m_AnchoredPosition: {x: 242.6, y: -118}
m_SizeDelta: {x: 409.86, y: 174.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3953877814520396567
@ -1376,7 +1450,7 @@ MonoBehaviour:
lines: 1
squareSpacing: 0
cell: {fileID: 3708229757298695105}
Spacing: {x: 10, y: 10}
Spacing: {x: 15, y: 0}
row: 0
col: 0
paddingTop: 0
@ -1565,6 +1639,7 @@ RectTransform:
- {fileID: 1938974795477313034}
- {fileID: 7611548694220542172}
- {fileID: 8853870050619307954}
- {fileID: 1760873088141769411}
- {fileID: 4603695914987725456}
- {fileID: 3898224450948322593}
m_Father: {fileID: 0}
@ -2077,6 +2152,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8365985457293435796}
- {fileID: 5094405446521664370}
m_Father: {fileID: 4592134867282015867}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

257
ProjectNLD/Assets/Art_Out/UI/Prefab/Train/UI_DispatchDetail.prefab
View File

@ -3335,6 +3335,7 @@ RectTransform:
- {fileID: 7238956077295196847}
- {fileID: 2713702908591280888}
- {fileID: 5797270221398894535}
- {fileID: 3973530689027125350}
m_Father: {fileID: 2557194754554042403}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -4581,6 +4582,127 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &5994907889141395500
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3973530689027125350}
- component: {fileID: 2730335736602835362}
- component: {fileID: 6987759817982451441}
- component: {fileID: 482419413574895161}
m_Layer: 5
m_Name: ButtonCant
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3973530689027125350
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5994907889141395500}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1401306244487892988}
m_Father: {fileID: 3824250010727387121}
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: 385, y: -509.39978}
m_SizeDelta: {x: 769, y: 109}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2730335736602835362
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5994907889141395500}
m_CullTransparentMesh: 1
--- !u!114 &6987759817982451441
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5994907889141395500}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.4433962, g: 0.38274294, b: 0.38274294, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 0acb82201f6f84340b6f66d247bf1d45, 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
m_PixelsPerUnitMultiplier: 1
--- !u!114 &482419413574895161
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5994907889141395500}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
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.43529412, g: 0.43529412, b: 0.43529412, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 0}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &6018990591123257603
GameObject:
m_ObjectHideFlags: 0
@ -5208,6 +5330,141 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &7431407857744203793
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1401306244487892988}
- component: {fileID: 3902262782810108638}
- component: {fileID: 7920117983195732025}
m_Layer: 5
m_Name: Text_StartFight
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1401306244487892988
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7431407857744203793}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3973530689027125350}
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: 300, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3902262782810108638
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7431407857744203793}
m_CullTransparentMesh: 1
--- !u!114 &7920117983195732025
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7431407857744203793}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u5F00\u59CB\u6D3E\u9063"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: d996718f19de68245bc356be2938e063, type: 2}
m_sharedMaterial: {fileID: -8559898196655864114, guid: d996718f19de68245bc356be2938e063,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &7489011483857908189
GameObject:
m_ObjectHideFlags: 0

827
ProjectNLD/Assets/Art_Out/UI/Prefab/Train/UI_DispatchTip.prefab
View File

File diff suppressed because it is too large Load Diff

129
ProjectNLD/Assets/Code/Scripts/Framework/BI/BIManager.cs
View File

@ -3,6 +3,7 @@ using Newtonsoft.Json;
using PhxhSDK;
using System;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
@ -18,9 +19,9 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
private BILevelInfo levelInfo;
/// <summary>
/// BI接口
/// BI接口 10.21 转为多个bi借口
/// </summary>
private IBIService _biService;
/// private IBIService _biService;
/// <summary>
/// 一次性事件缓存类
@ -50,8 +51,14 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
#if SDK_TAPTAP
SDKManager.SdkName.TapTap,
#endif
#if SDK_THINKINGDATA
SDKManager.SdkName.ThinkingData,
#endif
};
private List<IBIService> biServices = new List<IBIService>();
public PublicDictionaryPool DictionaryPool { get; } = new PublicDictionaryPool();
/// <summary>
@ -60,10 +67,12 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
private Dictionary<string, object> _tempEventDictionary = new(12);
private readonly string PhxhBiUrl = "https://bi.kedrgame.com/api/v1/events";
/// <summary>
/// BI专属accessKey，请勿与中台key混用
/// </summary>
private readonly string AccessKey = "yd9kWI798IWyyq1t";
/// <summary>
/// BI专属密钥，请勿与中台密钥混用
/// </summary>
@ -99,16 +108,15 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
/// <summary>
/// 登陆后初始化
/// </summary>
/// <param name="name"></param>
public void AfterLoginInitService(SDKManager.SdkName name)
public void AfterLoginInitService()
{
_biService = SDKManager.Instance.GetSdkHelper(name) as IBIService;
if (_biService == null)
biServices.Clear();
foreach (var sdkName in ExistBiService)
{
DebugUtil.Log("After Login Get BI Service error, SDK helper name is {0}", name);
return;
var service = SDKManager.Instance.GetSdkHelper(sdkName) as IBIService;
if (service != null)
biServices.Add(service);
}
DebugUtil.Log("After Login Get BI Service success, SDK helper name is {0}", name);
}
/// <summary>
@ -118,8 +126,13 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
{
baseInfo.SetUserInfo();
baseInfo.PrintAllValues();
if (!_isInit || (_biService == null && ExistBiService.Count != 0)) return;
_biService?.SetUser(baseInfo.actor_id);
if (!_isInit || biServices.Count <= 0) return;
foreach (var biService in biServices)
{
biService?.SetUser(baseInfo.actor_id);
}
SetUserProperty();
// 发送积累事件
SendQueuedEvents();
@ -130,26 +143,12 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
/// </summary>
private void InitService()
{
var helperName = SDKManager.SdkName.TalkingData;
#if SDK_FIREBASE
helperName = SDKManager.SdkName.FireBase;
_biService = SDKManager.Instance.GetSdkHelper(helperName) as IBIService;
#endif
#if SDK_TAPTAP
helperName = SDKManager.SdkName.TapTap;
_biService = SDKManager.Instance.GetSdkHelper(helperName) as IBIService;
#endif
#if SDK_TALKINGDATA
helperName = SDKManager.SdkName.TalkingData;
_biService = SDKManager.Instance.GetSdkHelper(helperName) as IBIService;
#endif
if ((_biService == null && ExistBiService.Count != 0))
biServices.Clear();
foreach (var sdkName in ExistBiService)
{
DebugUtil.Log("Before Login Get BI Service error, SDK helper name is {0}", helperName);
var service = SDKManager.Instance.GetSdkHelper(sdkName) as IBIService;
if (service != null)
biServices.Add(service);
}
}
@ -180,9 +179,12 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
#endif
}
public void SetUserProperty(string name, string value)
private void SetUserProperty(string name, string value)
{
_biService?.SetUserProperty(name, value);
foreach (var biService in biServices)
{
biService?.SetUserProperty(name, value);
}
}
#endregion
@ -195,7 +197,7 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
_dictPool = null; // 释放对象池
if (_isInit && _networkAvailable && eventQueue.Count > 0)
{
{
SendQueuedEvents();
}
}
@ -207,7 +209,8 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
/// <summary>
/// 事件队列 - 增加时间戳信息
/// </summary>
private readonly Queue<(string eventName, Dictionary<string, object> param, long localTime, ulong serverTime)> eventQueue = new();
private readonly Queue<(string eventName, Dictionary<string, object> param, long localTime, ulong serverTime)>
eventQueue = new();
/// <summary>
/// 是否使用队列模式（无网络或设置了发送周期）
@ -329,7 +332,7 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
/// </summary>
private void SendQueuedEvents()
{
if ((_biService == null && ExistBiService.Count != 0) || !_networkAvailable)
if (biServices.Count <= 0 || !_networkAvailable)
return;
// 只要队列有事件就全部处理
@ -337,8 +340,12 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
{
//将缓存的事件上报
var (eventName, param, localTime, serverTime) = eventQueue.Dequeue();
DebugUtil.Log("发送缓存事件: {0}, 事件参数: {1}", eventName, JsonConvert.SerializeObject(param));
_biService?.ReportEvent(eventName, param);
foreach (var biService in biServices)
{
biService?.ReportEvent(eventName, param);
DebugUtil.Log("{0} 发送缓存事件: {1}, 事件参数: {2}", biService, eventName, JsonConvert.SerializeObject(param));
}
TrackEventPhxh(eventName, param, localTime, serverTime);
}
}
@ -379,7 +386,7 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
try
{
var localTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
_tempEventDictionary.Clear();
var userParam = _tempEventDictionary;
if (!string.IsNullOrEmpty(param1Key) && param1 != null)
@ -394,15 +401,18 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
if (!string.IsNullOrEmpty(param4Key) && param4 != null)
userParam.Add(param4Key, param4);
if (_useQueueMode || (_biService == null && ExistBiService.Count != 0))
if (_useQueueMode || biServices.Count <= 0)
{
DebugUtil.Log("缓存发送事件: {0}, 事件参数: {1}", eventName, JsonConvert.SerializeObject(userParam));
EnqueueEvent(eventName, userParam, localTime, serverTime);
}
else
{
DebugUtil.Log("发送事件: {0}, 事件参数: {1}", eventName, JsonConvert.SerializeObject(userParam));
_biService?.ReportEvent(eventName, userParam);
foreach (var biService in biServices)
{
biService?.ReportEvent(eventName, userParam);
DebugUtil.Log("{0} 发送缓存事件: {1}, 事件参数: {2}", biService, eventName, JsonConvert.SerializeObject(userParam));
}
TrackEventPhxh(eventName, userParam, localTime, serverTime);
}
}
@ -422,7 +432,7 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
try
{
var localTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
_tempEventDictionary.Clear();
var userParam = _tempEventDictionary;
foreach (var item in recycleDictionary.dict)
@ -432,15 +442,19 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
userParam.Add(item.Key, item.Value);
}
}
DictionaryPool.ReturnDictToPool(recycleDictionary);
if (_useQueueMode || (_biService == null && ExistBiService.Count != 0))
if (_useQueueMode || biServices.Count <= 0)
{
EnqueueEvent(eventName, userParam, localTime, serverTime);
}
else
{
DebugUtil.Log("发送事件: {0}, 事件参数: {1}", eventName, JsonConvert.SerializeObject(userParam));
_biService?.ReportEvent(eventName, userParam);
foreach (var biService in biServices)
{
biService?.ReportEvent(eventName, userParam);
DebugUtil.Log("{0} 发送缓存事件: {1}, 事件参数: {2}", biService, eventName, JsonConvert.SerializeObject(userParam));
}
TrackEventPhxh(eventName, userParam, localTime, serverTime);
}
}
@ -484,7 +498,7 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
try
{
var localTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
_tempEventDictionary.Clear();
var userParam = _tempEventDictionary;
userParam.Add("level_id", levelInfo.level_id); // 关卡ID
@ -505,13 +519,17 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
DebugUtil.Log("发送关卡事件: {0}, 事件参数: {1}", eventName, JsonConvert.SerializeObject(userParam));
if (_useQueueMode || (_biService == null && ExistBiService.Count != 0))
if (_useQueueMode || biServices.Count <= 0)
{
EnqueueEvent(eventName, userParam, localTime, serverTime);
}
else
{
_biService?.ReportEvent(eventName, userParam);
foreach (var biService in biServices)
{
biService?.ReportEvent(eventName, userParam);
DebugUtil.Log("{0} 发送缓存事件: {1}, 事件参数: {2}", biService, eventName, JsonConvert.SerializeObject(userParam));
}
TrackEventPhxh(eventName, userParam, localTime, serverTime);
}
}
@ -535,6 +553,7 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
DebugUtil.Log("已经上报过 {0} 关卡事件,不会再次上报", eventName);
return;
}
_storageEvent.EventList.Add(eventName);
StorageMgr.Instance.SyncForce = true;
TrackLevelEvent(eventName, serverTime, param1Key, param1, param2Key, param2, param3Key, param3);
@ -550,6 +569,8 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
return;
try
{
DebugUtil.Log("PHXH 发送事件: {0}, 事件参数: {1}", eventName, JsonConvert.SerializeObject(param));
var url = PhxhBiUrl;
baseInfo ??= new BIBaseInfo();
//var timestampMs = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
@ -584,7 +605,7 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
Dictionary<string, string> headData = PostHeader.PostHeaderInfo(new Dictionary<string, string>
{
{ "event_key", sendData.event_key },
{ "app_name",sendData.app_name },
{ "app_name", sendData.app_name },
{ "event_value", sendData.event_value },
{ "channel", sendData.channel },
{ "model", sendData.model },
@ -596,14 +617,13 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
{ "build_code", sendData.build_code },
{ "assets_version", sendData.assets_version },
{ "language", sendData.language },
{ "region",sendData.region },
{ "region", sendData.region },
{ "actor_id", sendData.actor_id },
{ "third_platform", sendData.third_platform },
{ "third_id", sendData.third_id },
{ "local_time", sendData.local_time.ToString() },
{ "server_time", sendData.server_time.ToString() },
{ "access_key", sendData.access_key },
}, SecretKey, AccessKey);
HttpHelper.PostAsync(url, sendData, headData).Forget();
@ -636,7 +656,7 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
public string third_platform; // 第三方账号源
public string third_id; // 第三方账号ID
public string access_key;//中台accesskey，包体打包内自带
public string access_key; //中台accesskey，包体打包内自带
// 新增的时间戳字段
public long local_time; // 本地时间
@ -695,9 +715,11 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
_dictPoolIndex = (_dictPoolIndex + 1) % DICT_POOL_SIZE;
return dict;
}
#endregion
#region 外部打点字典对象池
/// <summary>
/// 对象池字典，请使用BIManager内部的PublicDictionaryPool获取对象
/// </summary>
@ -749,6 +771,7 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
{
_dictPool.Add(new RecycleDictionary());
}
_dictPoolIndex = 0;
}
@ -760,6 +783,7 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
// TODO 也可以扩容池
return new RecycleDictionary();
}
var dict = _dictPool[_dictPoolIndex];
_dictPoolIndex++;
dict.Clear();
@ -774,5 +798,6 @@ public partial class BIManager : Singlenton<BIManager>, IInitable, IUpdatable
_dictPool[_dictPoolIndex] = dict;
}
}
#endregion
}

2
ProjectNLD/Assets/Code/Scripts/Framework/Event/Events.cs
View File

@ -39,6 +39,8 @@
//diapatch
DispatchTeamChange,
DispatchStart,
DispatchCancel,
DispatchAcclerate,
// level battle
UnitDispose,
LevelUnitBorn,

BIN
ProjectNLD/Assets/Code/Scripts/GamePlay_Dll/GamePlay.dll
View File

Binary file not shown.

23
ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/DataGlobalConfig.cs
View File

File diff suppressed because one or more lines are too long

12
ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/GlobalConfig.cs
View File

@ -997,6 +997,14 @@ public partial class GlobalConfig
/// </summary>
public float LegionPveCharacterPowerParam => _data.LegionPveCharacterPowerParam;
/// <summary>
/// 军团战伤害公式K
/// </summary>
public float LegionPveDefFactor => _data.LegionPveDefFactor;
/// <summary>
/// 军团战战斗结果，0:大获全胜，1：略占上风，2：势均力敌，3：损失惨重
/// </summary>
public System.Collections.Generic.List<float> LegionPvePredictList => _data.LegionPvePredictList;
/// <summary>
/// 训练关卡载具最大数量
/// </summary>
public int TrainingLevelVehicleCountLimit => _data.TrainingLevelVehicleCountLimit;
@ -1025,10 +1033,6 @@ public partial class GlobalConfig
/// </summary>
public float RefundLimit => _data.RefundLimit;
/// <summary>
/// 军团战伤害公式K
/// </summary>
public float LegionPveDefFactor => _data.LegionPveDefFactor;
/// <summary>
/// 敌人战斗AI是否不清理攻击距离以外的目标
/// </summary>
public int NormalFightAI => _data.NormalFightAI;

8
ProjectNLD/Assets/Config/Data/globalconfig.json
View File

@ -363,6 +363,13 @@
"LegionPveSeasonResurrectionItem": 5005,
"LegionPveSeasonResurrectionCount": 10,
"LegionPveCharacterPowerParam": 1.12,
"LegionPveDefFactor": 300,
"LegionPvePredictList": [
0.7,
0.2,
-0.2,
-0.7
],
"TrainingLevelVehicleCountLimit": 1,
"TrainingLevelCharacterCountLimit": 6,
"DefaultTrainingTeamIcon": 510003,
@ -373,7 +380,6 @@
"LegionPveScheduleID": 30002,
"LegionPveIdleHpParamKp": 1,
"RefundLimit": 8,
"LegionPveDefFactor": 300,
"NormalFightAI": 1,
"SurviveFightAI": 0,
"DefyDeathFightAI": 1,

531
ProjectNLD/Assets/Config/Maps/MapData_Maps03_Woodland_2_1.json Normal file
View File

@ -0,0 +1,531 @@
{
"cameraMarginInfo": {
"leftMarginInFight": 1.2000000476837159,
"rightMarginInFight": 1.2000000476837159,
"topMarginInFight": 0.699999988079071,
"bottomMarginInFight": 0.699999988079071,
"leftMarginInPre": 1.2000000476837159,
"rightMarginInPre": 1.2000000476837159,
"topMarginInInPre": 0.699999988079071,
"bottomMarginInPre": 0.699999988079071,
"initialFOV": 30.0,
"initialOrthographicSize": 12.0
},
"position": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"_width": 16,
"_height": 7,
"environmentType": 3,
"BlocksData": [
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": 0,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": 0,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": 4,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": 4,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": 4,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": 0,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": 0,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": 4,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": 4,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": 4,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": 4,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": 2,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": 0,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": 2,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": 4,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": 0,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": 4,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": 4,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": 4,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": 0,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
},
{
"TerrainTypeIndex": -1,
"LegionTypeIndex": -1
}
],
"regions": [
{
"positions": [
50,
49,
34,
35,
18,
51
],
"centerCellIndex": -1,
"note": ""
},
{
"positions": [
96,
80,
64,
48,
32,
16,
0
],
"centerCellIndex": -1,
"note": ""
},
{
"positions": [
62,
46,
29,
14,
47,
30,
15,
31,
63
],
"centerCellIndex": -1,
"note": ""
}
],
"blockRegions": [],
"defenseRegions": [],
"BlockSphereInfos": [],
"initialCameraPosition": {
"x": 3,
"y": 1
},
"showBuffPoints": [
{
"cellIndex": 4,
"path": "Assets/Art_Out/Other/BuffPoint/Buff_BulletF.prefab"
},
{
"cellIndex": 5,
"path": "Assets/Art_Out/Other/BuffPoint/Buff_BulletF.prefab"
}
]
}

7
ProjectNLD/Assets/Config/Maps/MapData_Maps03_Woodland_2_1.json.meta Normal file
View File

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

2
ProjectNLD/Assets/PhxhSDK

@ -1 +1 @@
Subproject commit 30a38e04fd749844a2c5d3d7bb10cf4737872dd9
Subproject commit 1d299c7a2ee10b60435484257b3fe1543b0ce3e6

BIN
ProjectNLD/Assets/Resources/Fonts/SourceHanSansCN-Medium SDF.asset (Stored with Git LFS)
View File

Binary file not shown.

201
ProjectNLD/Assets/Scenes/Maps/Maps03_Woodland/Maps03_Woodland_2.unity
View File

@ -38,7 +38,6 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.12731749, g: 0.13414757, b: 0.1210787, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -2787,6 +2786,37 @@ MonoBehaviour:
_useSurface: 0
renderInfo: {fileID: 11400000, guid: 06ea445db34fe44418bf8bbf970c7b6d, type: 2}
sceneObjectType: 1
--- !u!1 &548805670
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 548805671}
m_Layer: 0
m_Name: Buff_BulletF(Clone)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &548805671
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 548805670}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -8.249996, y: 0.0000009536743, z: -7.7942247}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1379028030}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &550827717
PrefabInstance:
m_ObjectHideFlags: 0
@ -3190,37 +3220,6 @@ MonoBehaviour:
_useSurface: 0
renderInfo: {fileID: 11400000, guid: 06ea445db34fe44418bf8bbf970c7b6d, type: 2}
sceneObjectType: 1
--- !u!1 &609335259
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 609335260}
m_Layer: 0
m_Name: Surfaces
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &609335260
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 609335259}
serializedVersion: 2
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 836657156}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &654546571
PrefabInstance:
m_ObjectHideFlags: 0
@ -4055,7 +4054,7 @@ MonoBehaviour:
_highlightScaleMax: 1.1
_highlightFadeSpeed: 1
_highlightMinimumTerrainDistance: 1
_highlightEffect: 5
_highlightEffect: 0
_highlightMask: {fileID: 0}
_overlayMode: 1
_gridCenter: {x: 0, y: 0}
@ -4162,7 +4161,7 @@ MonoBehaviour:
_showTerritoriesInteriorBorders: 0
_territoryInteriorBorderOnTop: 0
_territoryInteriorBorderIncludeEnclaves: 1
_colorizeTerritories: 1
_colorizeTerritories: 0
_colorizedTerritoriesAlpha: 0.9
_territoryHighlightColor: {r: 1, g: 0, b: 0, a: 0.7}
_territoryHighlightColor2: {r: 0, g: 1, b: 0, a: 0.8}
@ -4237,7 +4236,7 @@ Transform:
m_LocalScale: {x: 1000, y: 1000, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 609335260}
- {fileID: 1851419752}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!1001 &844883865
@ -6945,6 +6944,39 @@ MonoBehaviour:
_useSurface: 0
renderInfo: {fileID: 11400000, guid: 06ea445db34fe44418bf8bbf970c7b6d, type: 2}
sceneObjectType: 1
--- !u!1 &1379028029
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1379028030}
m_Layer: 0
m_Name: buffRoot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1379028030
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1379028029}
serializedVersion: 2
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1781198294}
- {fileID: 548805671}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1396343301
PrefabInstance:
m_ObjectHideFlags: 0
@ -9149,6 +9181,37 @@ MonoBehaviour:
_useSurface: 0
renderInfo: {fileID: 11400000, guid: 06ea445db34fe44418bf8bbf970c7b6d, type: 2}
sceneObjectType: 1
--- !u!1 &1781198293
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1781198294}
m_Layer: 0
m_Name: Buff_BulletF(Clone)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1781198294
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1781198293}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -11.249995, y: 0.0000009536743, z: -7.7942247}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1379028030}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1839263798
PrefabInstance:
m_ObjectHideFlags: 0
@ -9352,7 +9415,7 @@ Transform:
m_GameObject: {fileID: 1846858569}
serializedVersion: 2
m_LocalRotation: {x: 0.3812272, y: 0.08052145, z: -0.033353075, w: 0.9203639}
m_LocalPosition: {x: -23.438492, y: 27, z: -26.589811}
m_LocalPosition: {x: -15.038491, y: 27, z: -26.589811}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -9396,12 +9459,12 @@ MonoBehaviour:
m_RequiresColorTexture: 0
m_Version: 2
m_TaaSettings:
quality: 3
frameInfluence: 0.1
jitterScale: 1
mipBias: 0
varianceClampScale: 0.9
contrastAdaptiveSharpening: 0
m_Quality: 3
m_FrameInfluence: 0.1
m_JitterScale: 1
m_MipBias: 0
m_VarianceClampScale: 0.9
m_ContrastAdaptiveSharpening: 0
--- !u!114 &1846858574
MonoBehaviour:
m_ObjectHideFlags: 0
@ -9414,19 +9477,57 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2464a54fcbf54d5e86eaf720c30381b, type: 3}
m_Name:
m_EditorClassIdentifier:
leftMargin: 0.5
rightMargin: 0.5
topMargin: 0.5
bottomMargin: 0.5
zoomSensitivity: 2
zoomScaleFactor: 0.75
smoothZoom: 1
zoomSmoothTime: 0.2
leftMargin: 1.2
rightMargin: 1.2
topMargin: 0.7
bottomMargin: 0.7
moveSpeedX: 0.19
moveSpeedY: 0.3
unitPerPixel: 0.01
smoothPanning: 0
panSmoothTime: 0.08
panInertia: 0.8
maxPanSpeed: 3000
CameraMinSize: 6
CameraMaxSize: 12
boxBounds: {fileID: 0}
CameraMinFOV: 15
CameraMaxFOV: 30
isFightCamera: 1
--- !u!1 &1851419751
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1851419752}
m_Layer: 0
m_Name: Surfaces
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1851419752
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1851419751}
serializedVersion: 2
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 836657156}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1869539873
PrefabInstance:
m_ObjectHideFlags: 0
@ -11033,7 +11134,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1acf874a624983e40a274522b9ac6a50, type: 3}
m_Name:
m_EditorClassIdentifier:
_levelDataJson: {fileID: 4900000, guid: 67fc8fcbb0ccddd44898b24301f567dc, type: 3}
_levelDataJson: {fileID: 4900000, guid: 3772fefaa995acc49bc775606ee20217, type: 3}
--- !u!114 &4946899301643550723
MonoBehaviour:
m_ObjectHideFlags: 0
@ -11046,7 +11147,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6d4893ffb2e67d04d82cfc15a195a1a6, type: 3}
m_Name:
m_EditorClassIdentifier:
_mapDataJson: {fileID: 4900000, guid: 3e7e8f224670c2f418cbae798e0ce1c0, type: 3}
_mapDataJson: {fileID: 4900000, guid: c38004de9c7cf4d45b99eff233832b40, type: 3}
isLegionMap: 0
--- !u!4 &6525358489752447729
Transform:
m_ObjectHideFlags: 0
@ -11105,3 +11207,4 @@ SceneRoots:
- {fileID: 8224225936758222018}
- {fileID: 1779911301602886938}
- {fileID: 1747868970}
- {fileID: 1379028030}

2722
ProjectNLD/Assets/Scenes/Maps/Maps04_Snowfield/Maps04_Snowfield_13.unity
View File

File diff suppressed because it is too large Load Diff