Merge branch 'china/dev' into 0功能/命格

# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
dev_chengFeng
ZhangBiao 2021-12-06 18:26:14 +08:00
commit 3b53332e7b
34 changed files with 3365 additions and 2871 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 4ed52d03d7da888488e8060c5a413314
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
- 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: 2c20a2a1ca4988f4cbe236800b3dd178
vertices: []
indices:
edges: []
weights: []
spritePackingTag: FloatingViewAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: e1ddcd46aec19094eb4e502ecee56f27
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
- 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: 113817cc9f71d19478abdd5bc74319c7
vertices: []
indices:
edges: []
weights: []
spritePackingTag: FloatingViewAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: d1fe64721cef74b4ca24ebba34abf71b
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -4837,7 +4837,7 @@ Transform:
m_LocalScale: {x: 70, y: 70, z: 70}
m_Children:
- {fileID: 6657037368096572988}
m_Father: {fileID: 6657037368023566322}
m_Father: {fileID: 1885701817775423441}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1944585544759321175
@ -23861,7 +23861,7 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6657037368023566322}
- component: {fileID: 1885701817775423441}
m_Layer: 0
m_Name: c_ren_guocheng
m_TagString: Untagged
@ -23869,21 +23869,26 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6657037368023566322
Transform:
--- !u!224 &1885701817775423441
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6657037368023566321}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.32, y: 3.65, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1066330603867079341}
m_Father: {fileID: 0}
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.32, y: 3.65}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6657037368096572867
GameObject:
m_ObjectHideFlags: 0

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3e6a1424ecd7204469fb2801f0da057c
guid: 8013468c739c69b42a7a384257ada581
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}

View File

@ -6,7 +6,7 @@ AnimatorController:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ani
m_Name: ani_nmw
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:

View File

@ -2804,8 +2804,8 @@ 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: 4.7, y: -147.59998}
m_SizeDelta: {x: 745.3, y: 828.3}
m_AnchoredPosition: {x: 4.7, y: -156.5}
m_SizeDelta: {x: 745.3, y: 868.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6588532141008816022
CanvasRenderer:

View File

@ -34152,6 +34152,8 @@ GameObject:
m_Component:
- component: {fileID: 677725578348167058}
- component: {fileID: 7379619952752895271}
- component: {fileID: 4411509635042639406}
- component: {fileID: 5245989454281854074}
m_Layer: 5
m_Name: demons
m_TagString: Untagged
@ -34201,6 +34203,43 @@ MonoBehaviour:
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!222 &4411509635042639406
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5820207918186583478}
m_CullTransparentMesh: 0
--- !u!114 &5245989454281854074
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5820207918186583478}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
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: 0}
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 &5821728262193760155
GameObject:
m_ObjectHideFlags: 0
@ -62307,27 +62346,32 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -16.999998
objectReference: {fileID: 0}
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -16.999998
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -62337,11 +62381,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!224 &3225531421799583520 stripped
@ -63237,27 +63276,32 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -16.999998
objectReference: {fileID: 0}
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -16.999998
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -63267,11 +63311,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!224 &7238953302705786463 stripped
@ -63527,27 +63566,32 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -16.999998
objectReference: {fileID: 0}
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -16.999998
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -63557,11 +63601,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!224 &8646068175394664958 stripped
@ -63692,27 +63731,32 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -16.999998
objectReference: {fileID: 0}
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -16.999998
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -63722,11 +63766,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!224 &8637026968703866189 stripped
@ -64492,27 +64531,32 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -16.999998
objectReference: {fileID: 0}
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -16.999998
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -64522,11 +64566,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!224 &5398174965527698585 stripped
@ -64907,27 +64946,32 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -16.999998
objectReference: {fileID: 0}
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -16.999998
objectReference: {fileID: 0}
- target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
@ -64937,11 +64981,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!224 &5689749072929729188 stripped

View File

@ -2752,6 +2752,7 @@ RectTransform:
- {fileID: 3094864558833778807}
- {fileID: 7868471710346716691}
- {fileID: 224758322593848220}
- {fileID: 4297169710694434552}
- {fileID: 7988514468786704464}
m_Father: {fileID: 224172487803996794}
m_RootOrder: 0
@ -2835,6 +2836,123 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &636554389393670323
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4297169710694434552}
- component: {fileID: 180724177236460629}
- component: {fileID: 3270857038592515383}
- component: {fileID: 723125615504392274}
m_Layer: 5
m_Name: yihuode
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4297169710694434552
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 636554389393670323}
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: 4300363014719737227}
m_RootOrder: 3
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: 34.5}
m_SizeDelta: {x: 137, y: 127}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &180724177236460629
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 636554389393670323}
m_CullTransparentMesh: 0
--- !u!114 &3270857038592515383
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 636554389393670323}
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: d2eff9e1ef9c15745986a5aa489eb10c, 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!114 &723125615504392274
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 636554389393670323}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 0
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 3270857038592515383}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &1302047608603813009
GameObject:
m_ObjectHideFlags: 0
@ -4542,7 +4660,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4300363014719737227}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}

View File

@ -565,7 +565,7 @@ GameObject:
- component: {fileID: 6189766711027579234}
- component: {fileID: 9092918934522304640}
m_Layer: 0
m_Name: time
m_Name: reward
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -580,15 +580,15 @@ RectTransform:
m_GameObject: {fileID: 973062803269646599}
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_LocalScale: {x: 1.0002098, y: 1.0002098, z: 1.0002098}
m_Children: []
m_Father: {fileID: 2634665790303701291}
m_RootOrder: 0
m_Father: {fileID: 2052763838201650754}
m_RootOrder: 3
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.020004, y: -0.99999}
m_SizeDelta: {x: 257.04, y: 30}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 192, y: 5.7132}
m_SizeDelta: {x: 190, y: 33}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6189766711027579234
CanvasRenderer:
@ -2137,7 +2137,7 @@ RectTransform:
- {fileID: 8893541264043238506}
- {fileID: 2983500461621442786}
- {fileID: 1971531226912261817}
- {fileID: 2634665790303701291}
- {fileID: 6727692027123842332}
m_Father: {fileID: 7581135397323237180}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -2503,51 +2503,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &2326400323695555520
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2634665790303701291}
- component: {fileID: 433126057131546742}
m_Layer: 5
m_Name: di1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2634665790303701291
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2326400323695555520}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.00021, y: 1.00021, z: 1.00021}
m_Children:
- {fileID: 6727692027123842332}
m_Father: {fileID: 2052763838201650754}
m_RootOrder: 3
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: -4.3, y: 84.6}
m_SizeDelta: {x: 257, y: 32}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &433126057131546742
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2326400323695555520}
m_CullTransparentMesh: 0
--- !u!1 &2372534746896705155
GameObject:
m_ObjectHideFlags: 0
@ -3629,6 +3584,7 @@ RectTransform:
- {fileID: 4355020182127029361}
- {fileID: 4452344794313098835}
- {fileID: 8329855622185798631}
- {fileID: 4828399117652629719}
m_Father: {fileID: 7581135397323237180}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -6937,6 +6893,86 @@ MonoBehaviour:
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &7879737806312872855
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4828399117652629719}
- component: {fileID: 6846715026067616094}
- component: {fileID: 2522048148372554234}
m_Layer: 0
m_Name: reward
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4828399117652629719
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7879737806312872855}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.0002097, y: 1.0002097, z: 1.0002097}
m_Children: []
m_Father: {fileID: 3088456174784992059}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 200, y: 5.7132}
m_SizeDelta: {x: 190, y: 33}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6846715026067616094
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7879737806312872855}
m_CullTransparentMesh: 0
--- !u!114 &2522048148372554234
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7879737806312872855}
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: 0.9960785, g: 0.9921569, b: 0.98823535, 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: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "17:20:01\u540E\u5237\u65B0"
LanguageIndex: 0
--- !u!1 &7883892829239888571
GameObject:
m_ObjectHideFlags: 0
@ -8601,6 +8637,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 8194293037922997897}
m_Modifications:
- target: {fileID: 545869090935395574, guid: ccf72b26803e0d34cb0033c5bdd37418,
type: 3}
propertyPath: m_Name
value: Fx_Circle 1
objectReference: {fileID: 0}
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
type: 3}
propertyPath: m_LocalPosition.x
@ -8706,11 +8747,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 545869090935395574, guid: ccf72b26803e0d34cb0033c5bdd37418,
type: 3}
propertyPath: m_Name
value: Fx_Circle 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ccf72b26803e0d34cb0033c5bdd37418, type: 3}
--- !u!224 &5237016229843866931 stripped

File diff suppressed because it is too large Load Diff

View File

@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD:Assets/ManagedResources/Spine/s_fuxi/s_fuxi_Atlas.asset.meta
guid: f4cf89c472b0a9941bbc2b04492aad86
=======
guid: 8874d283334a16a44ac5145495051337
>>>>>>> china/dev:Assets/ManagedResources/Spine/s_fuxi/s_fuxi_SkeletonData.asset.meta
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000

View File

@ -1125,6 +1125,7 @@ JumpType = {
SiXiangXinFa = 113,--四象心法
likeability = 114,
LingMaiMiJing = 118,--灵脉秘境
shenwaihuashen = 120,--身外化身
StateActivity = 121,--固定活动,抽卡
BuyVigor = 10000, --体力购买

View File

@ -599,6 +599,7 @@ EXPEDITIONSIMPLEBOSSINFO_STAR_FIELD = protobuf.FieldDescriptor();
EXPEDITIONSIMPLEBOSSINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
EXPEDITIONSIMPLEBOSSINFO_REMAINHP_FIELD = protobuf.FieldDescriptor();
EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD = protobuf.FieldDescriptor();
EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD = protobuf.FieldDescriptor();
EXPEDITIONTEAMINFO = protobuf.Descriptor();
EXPEDITIONTEAMINFO_HERO_FIELD = protobuf.FieldDescriptor();
EXPEDITIONTEAMINFO_POKEMONINFOS_FIELD = protobuf.FieldDescriptor();
@ -6544,11 +6545,21 @@ EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.default_value = 0
EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.type = 5
EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD.cpp_type = 1
EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.name = "godSoulLv"
EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.full_name = ".rpc.protocols.ExpeditionSimpleBossInfo.godSoulLv"
EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.number = 6
EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.index = 5
EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.label = 1
EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.has_default_value = false
EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.default_value = 0
EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.type = 5
EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD.cpp_type = 1
EXPEDITIONSIMPLEBOSSINFO.name = "ExpeditionSimpleBossInfo"
EXPEDITIONSIMPLEBOSSINFO.full_name = ".rpc.protocols.ExpeditionSimpleBossInfo"
EXPEDITIONSIMPLEBOSSINFO.nested_types = {}
EXPEDITIONSIMPLEBOSSINFO.enum_types = {}
EXPEDITIONSIMPLEBOSSINFO.fields = {EXPEDITIONSIMPLEBOSSINFO_HEROTID_FIELD, EXPEDITIONSIMPLEBOSSINFO_STAR_FIELD, EXPEDITIONSIMPLEBOSSINFO_LEVEL_FIELD, EXPEDITIONSIMPLEBOSSINFO_REMAINHP_FIELD, EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD}
EXPEDITIONSIMPLEBOSSINFO.fields = {EXPEDITIONSIMPLEBOSSINFO_HEROTID_FIELD, EXPEDITIONSIMPLEBOSSINFO_STAR_FIELD, EXPEDITIONSIMPLEBOSSINFO_LEVEL_FIELD, EXPEDITIONSIMPLEBOSSINFO_REMAINHP_FIELD, EXPEDITIONSIMPLEBOSSINFO_POSITION_FIELD, EXPEDITIONSIMPLEBOSSINFO_GODSOULLV_FIELD}
EXPEDITIONSIMPLEBOSSINFO.is_extendable = false
EXPEDITIONSIMPLEBOSSINFO.extensions = {}
EXPEDITIONTEAMINFO_HERO_FIELD.name = "hero"

View File

@ -9881,7 +9881,7 @@ local passivityList = {
local type=args[1]
local num=args[2]
local time=args[3]
local triggerNum=0
local timeList={}
local onBuffImmune=function(buff,target,immCaster)
if immCaster~=role then
return
@ -9889,16 +9889,20 @@ local passivityList = {
if buff.type~=type then
return
end
if triggerNum==time then
if timeList[target.position] and timeList[target.position]==time then
return
end
BattleUtil.CalRage(role,role,num,CountTypeName.Add)
triggerNum=triggerNum+1
BattleUtil.CalRage(role,target,num,CountTypeName.Add)
if timeList[target.position] then
timeList[target.position]=timeList[target.position]+1
else
timeList[target.position]=1
end
end
BattleLogic.Event:AddEvent(BattleEventName.ImmuneDebuffSuccess,onBuffImmune,nil,nil,role)
local onRoundChange=function()
triggerNum=0
timeList={}
end
BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange,onRoundChange,nil,nil,role)
end,
@ -10067,9 +10071,10 @@ local passivityList = {
return
end
local ishave=BattleLogic.BuffMgr:HasBuff(defRole,t1,function(buff)
if buff.Type==BuffName.SigilSign then
-- if buff.Type==BuffName.SigilSign then
-- LogError("t1==="..t1)
return true
end
-- end
end)
if ishave then
if defRole.Rage>=n1 then
@ -10091,9 +10096,9 @@ local passivityList = {
return
end
local ishave=BattleLogic.BuffMgr:HasBuff(defRole,t1,function(buff)
if t1==BuffName.SigilSign then
return true
end
-- if t1==BuffName.SigilSign then
return true
-- end
end)
if ishave then
if defRole.Rage<n3 then

View File

@ -121,24 +121,32 @@ function RoleLogic:Init(uid, data, position)
end
--如果时363类型得被动就存起来
if id==363 then
coverPass[args[1]]=args
if coverPass[args[1]] then
table.insert(coverPass[args[1]],args)
else
coverPass[args[1]]={}
table.insert(coverPass[args[1]],args)
end
else
--如果有363修改的被动就修改
if coverPass[passivityId] then
local coverArgs=coverPass[passivityId]
local len=floor((#coverArgs-1)/2)
for i = 1, len do
local id=0
if #coverArgs>i+i then
id=coverArgs[i+i]
end
local value=0
if #coverArgs>=i+i+1 then
value=coverArgs[i+i+1]
end
if id~=0 and #args>=id and args[id] then
args[id]=value
end
local list=coverPass[passivityId]
for i = 1, #list do
local coverArgs=list[i]
local len=floor((#coverArgs-1)/2)
for i = 1, len do
local id=0
if #coverArgs>i+i then
id=coverArgs[i+i]
end
local value=0
if #coverArgs>=i+i+1 then
value=coverArgs[i+i+1]
end
if id~=0 and #args>=id and args[id] then
args[id]=value
end
end
end
end
end

View File

@ -30,7 +30,7 @@ function ContinuePackagePanel:InitComponent()
local rootHight = self.scrollItem.transform.rect.height
local width = self.scrollItem.transform.rect.width
self.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.scrollItem.transform,
self.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 0))
self.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, -5))
self.scrollView.moveTween.MomentumAmount = 1
self.scrollView.moveTween.Strength = 2
self.scrollView.elastic = false
@ -187,7 +187,7 @@ function ContinuePackagePanel:ShowSingleHero(go,data,index)
PayManager.Pay(data.otherData.GoodId, function(id)
FirstRechargeManager.RefreshAccumRechargeValue(data.otherData.GoodId)
OperatingManager.SetHadBuyGoodsId({data.otherData.GoodId})
OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, data.otherData.GoodId)
-- OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, data.otherData.GoodId)
self:Refresh(false,false)
end)
elseif data.otherData.GoodType == 2 then--商品

View File

@ -46,7 +46,7 @@ end
--绑定事件(用于子类重写)
function YiJingBaoKu:BindEvent()
Util.AddOnceClick(self.zhenqibaogeBtn, function()
JumpManager.GoJump(40011)
JumpManager.GoJump(40050,nil,self.actId)
end)
Util.AddOnceClick(self.addBtn,function()
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.YiJingBaoKu,self.ActData,function()

View File

@ -35,13 +35,15 @@ function this.InitExpeditionData(msg)
singleNodeInfo.state = nodeInfo.state--节点状态 0未开启 1未通过 2未领取圣物 3已完成
singleNodeInfo.bossTeaminfo = {}--节点队伍信息
singleNodeInfo.bossTeaminfo.hero = {}--节点队伍信息 英雄
-- --LogGreen("-----||||服务端初始化节点信息 "..singleNodeInfo.sortId.." "..singleNodeInfo.state.." "..singleNodeInfo.lay )
--LogGreen("-----||||服务端初始化节点信息 "..singleNodeInfo.sortId.." "..singleNodeInfo.state.." "..singleNodeInfo.lay )
if nodeInfo.bossTeaminfo then
if nodeInfo.bossTeaminfo.hero and #nodeInfo.bossTeaminfo.hero > 0 then
for k = 1, #nodeInfo.bossTeaminfo.hero do
local singleHero = {}
singleHero.heroTid = nodeInfo.bossTeaminfo.hero[k].heroTid
singleHero.star = nodeInfo.bossTeaminfo.hero[k].star
singleHero.godSoulLv = nodeInfo.bossTeaminfo.hero[k].godSoulLv
--LogGreen("singleHero.godSoulLv:"..tostring(singleHero.godSoulLv).." singleHero.heroTid:"..singleHero.heroTid)
singleHero.level = nodeInfo.bossTeaminfo.hero[k].level
singleHero.remainHp = nodeInfo.bossTeaminfo.hero[k].remainHp
singleHero.position = nodeInfo.bossTeaminfo.hero[k].position
@ -223,6 +225,8 @@ function this.UpdateNodeValue(nodeInfo)
local singleHero = {}
singleHero.heroTid = nodeInfo.bossTeaminfo.hero[k].heroTid
singleHero.star = nodeInfo.bossTeaminfo.hero[k].star
singleHero.godSoulLv = nodeInfo.bossTeaminfo.hero[k].godSoulLv
--LogGreen("singleHero.godSoulLv:"..tostring(singleHero.godSoulLv) .." singleHero.heroTid:"..singleHero.heroTid)
singleHero.level = nodeInfo.bossTeaminfo.hero[k].level
singleHero.remainHp = nodeInfo.bossTeaminfo.hero[k].remainHp
singleHero.position = nodeInfo.bossTeaminfo.hero[k].position

View File

@ -42,9 +42,6 @@ function ExpeditionMonsterInfoPopup:InitComponent()
for i=1,#contentScripts do
contentPrefabs[i]=Util.GetGameObject(this.contents,contentScripts[i].panelName)
end
end
--绑定事件(用于子类重写)

View File

@ -179,7 +179,12 @@ function this.SetCardSingleData(o,monsterId, _pos)
fg.sprite = this.spLoader:LoadSprite(GetHeroCardStarFg[monsterId.star])
pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
SetCardStars(starGrid,monsterId.star)
local star,starType = GetStarOrGodSoulLv(1,monsterId)
if starType == 3 then
fg.sprite = this.spLoader:LoadSprite("t_zhandoukuang_zhuangshi006")
end
SetCardStars(starGrid,star,starType)
Util.SetParticleSortLayer(starGrid, sortingOrder + 1)
if monsterId.star > 9 then
Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(true)
else

View File

@ -71,7 +71,6 @@ function this:OnShow(_parent,...)
local args = {...}
monsterData = args[1]
type = args[2]
--LogGreen("type "..type)
fun = args[3]
this.titleText.text=Language[10564]
if type == 1 then
@ -125,6 +124,7 @@ function this:FormationAdapter(msg)
Util.GetGameObject(demon, "nameText"):GetComponent("Text").text = SubString2(GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId).ReadingName),6)
local star,starType = GetStarOrGodSoulLv(1,curData.hero)
SetHeroStars(this.spLoader, starGrid, star,starType)
Util.SetParticleSortLayer(starGrid,sortingOrder + 1)
proImage.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(demonData.PropertyName))
--posImage.sprite = this.spLoader:LoadSprite(GetJobSpriteStrByJobNum(demonData.Profession))
roleLevel.text = curData.hero.level

View File

@ -267,7 +267,7 @@ function IncarnationLottery:Recruit(recrutType,recrutId,uiName)
weight = self.rewardWeight[str]
bestIndex = self.reward[str]
else
if weight < self.rewardWeight[str] then
if weight > self.rewardWeight[str] then
weight = self.rewardWeight[str]
bestIndex = self.reward[str]
end

View File

@ -158,8 +158,8 @@ end
function IncarnationPanel:RemoveListener()
end
function IncarnationPanel:OnOpen()
proId = 1
function IncarnationPanel:OnOpen(_proId)
proId = _proId or 1
end
function IncarnationPanel:OnShow()

View File

@ -336,13 +336,14 @@ local TypeUpdateFunc = {
tempData.otherData.Name = rechargeConfig[configData[j].GoodId].Name
tempData.otherData.Reward = rechargeConfig[configData[j].GoodId].RewardShow
tempData.otherData.Price = rechargeConfig[configData[j].GoodId].Price
tempData.progress = OperatingManager.GetLeftBuyTime(5,configData[j].GoodId)
tempData.progress = rechargeConfig[configData[j].GoodId].Limit - OperatingManager.GetGoodsBuyTime(5,configData[j].GoodId)
elseif configData[j].GoodType == 2 then
tempData.otherData.Name = goodsConfig[configData[j].GoodId].GoodsName
tempData.otherData.Reward = goodsConfig[configData[j].GoodId].Goods
tempData.otherData.Price = goodsConfig[configData[j].GoodId].Price
tempData.progress = goodsConfig[configData[j].GoodId].Limit - curData.rewards[i].progress
end
-- LogPink("missionId:"..tostring(tempData.missionId).." progress:"..tostring(tempData.progress))
if not tempDataList[configData[j].Type] then
tempDataList[configData[j].Type] = {}
end

View File

@ -852,6 +852,9 @@ local jumpDic = {
[JumpType.ContinuePackage] = function(data,args)
UIManager.OpenPanel(UIName.ContinuePackagePanel,args[1])
end,
[JumpType.shenwaihuashen] = function(data,args)
UIManager.OpenPanel(UIName.IncarnationPanel,data[1])
end,
}
function this.JumpActivity(data,skipfactor)

View File

@ -485,6 +485,7 @@ function this:ShopItemAdapter(shopItem, itemData)
local costIcon = Util.GetGameObject(bg, "pricebg/costIcon"):GetComponent("Image")
local discountbg = Util.GetGameObject(bg, "discountbg")
local empty = Util.GetGameObject(shopItem, "empty")
local yihuode = Util.GetGameObject(shopItem, "yihuode")
local lock = Util.GetGameObject(shopItem, "lock")
local lockTip = Util.GetGameObject(shopItem, "lock/tip"):GetComponent("Text")
local new = Util.GetGameObject(shopItem, "GameObject/new")
@ -586,6 +587,15 @@ function this:ShopItemAdapter(shopItem, itemData)
else
new.gameObject:SetActive(false)
end
yihuode.gameObject:SetActive(false)
if con.ItemType == ItemType.Incarnation and not isEmpty then
local num = BagManager.GetItemCountById(con.Id)
if num > 0 or IncarnationManager.GetStatusByItemId(con.Id) >= 0 then
yihuode.gameObject:SetActive(true)
Util.SetColor(bg, Color.New(0.5, 0.5, 0.5, 1))
end
end
-- 购买事件
Util.AddOnceClick(lock, function()

View File

@ -468,6 +468,8 @@ function ShopViewNew:ShopItemAdapter(shopItem, itemData)
local costIcon = Util.GetGameObject(bg, "pricebg/costIcon"):GetComponent("Image")
local discountbg = Util.GetGameObject(bg, "discountbg")
local empty = Util.GetGameObject(shopItem, "empty")
local yihuode = Util.GetGameObject(shopItem, "yihuode")
local lock = Util.GetGameObject(shopItem, "lock")
local lockTip = Util.GetGameObject(shopItem, "lock/tip"):GetComponent("Text")
local new = Util.GetGameObject(shopItem, "GameObject/new")
@ -570,6 +572,14 @@ function ShopViewNew:ShopItemAdapter(shopItem, itemData)
else
new.gameObject:SetActive(false)
end
yihuode.gameObject:SetActive(false)
if con.ItemType == ItemType.Incarnation and not isEmpty then
local num = BagManager.GetItemCountById(con.Id)
if num > 0 or IncarnationManager.GetStatusByItemId(con.Id) >= 0 then
yihuode.gameObject:SetActive(true)
Util.SetColor(bg, Color.New(0.5, 0.5, 0.5, 1))
end
end
-- 购买事件
Util.AddOnceClick(lock, function()