[gm修改器]=====提交

dev_chengFeng
wangzhenxing 2022-09-20 17:04:48 +08:00
parent f23ef79935
commit fdaec2ac28
31 changed files with 5323 additions and 109 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 14953548b973a5141bb06748b7dcb20b
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: e769e6a9ba1a1f2428e242983f6b44d4
vertices: []
indices:
edges: []
weights: []
spritePackingTag: GMAltas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 67 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.0 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 9de42f8f578587d419a05e3442ef5937
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: ab18550428a26eb418815339a4dd5c39
vertices: []
indices:
edges: []
weights: []
spritePackingTag: GMAltas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 238 KiB

View File

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

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 88a83629b6d0bdb419608a0882107f0c
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -7114,6 +7114,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7936514539972252779}
- {fileID: 1174661642300151069}
- {fileID: 7679659585813988529}
- {fileID: 6606176237701159688}
@ -19574,6 +19575,145 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &1923338120475257371
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7936514539972252779}
- component: {fileID: 2875914181687123874}
- component: {fileID: 5538369231108235012}
- component: {fileID: 3623626025781409871}
- component: {fileID: 6635329454604044418}
m_Layer: 5
m_Name: btnGMChange
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7936514539972252779
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1923338120475257371}
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:
- {fileID: 4722879865143186141}
- {fileID: 6802873073147467582}
m_Father: {fileID: 7019400324678272696}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 208.70001, y: 187.80005}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2875914181687123874
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1923338120475257371}
m_CullTransparentMesh: 0
--- !u!114 &5538369231108235012
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1923338120475257371}
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: 3
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: 3623626025781409871}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &3623626025781409871
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1923338120475257371}
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: ce6a5e8caebae894bbb7d3eeb17e8dcb, 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!95 &6635329454604044418
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1923338120475257371}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &1930296161265385632
GameObject:
m_ObjectHideFlags: 0
@ -34182,11 +34322,11 @@ RectTransform:
- {fileID: 2608772048199405974}
- {fileID: 1149902287171607320}
m_Father: {fileID: 7019400324678272696}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -216.5, y: -50}
m_AnchoredPosition: {x: -216.49998, y: -50}
m_SizeDelta: {x: 977.6, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3661387098794875674
@ -45594,6 +45734,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &4237694208662489784
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4722879865143186141}
- component: {fileID: 2753988853598746416}
- component: {fileID: 9178366245928869107}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4722879865143186141
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4237694208662489784}
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: 7936514539972252779}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 148, y: 149}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2753988853598746416
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4237694208662489784}
m_CullTransparentMesh: 0
--- !u!114 &9178366245928869107
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4237694208662489784}
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: 0
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: b15e80d67c48e3e4599b81c6dcfffade, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &4298808317586433122
GameObject:
m_ObjectHideFlags: 0
@ -61726,7 +61940,7 @@ RectTransform:
- {fileID: 2393141543341706285}
- {fileID: 6848493942208162007}
m_Father: {fileID: 7019400324678272696}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -70429,6 +70643,80 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u79D8\u76D2"
LanguageIndex: 0
--- !u!1 &6686627033699372418
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6802873073147467582}
- component: {fileID: 5805847494463395012}
- component: {fileID: 877849791289276071}
m_Layer: 5
m_Name: redPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6802873073147467582
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6686627033699372418}
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: 7936514539972252779}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 35.4, y: 23.6}
m_SizeDelta: {x: 26, y: 26}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5805847494463395012
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6686627033699372418}
m_CullTransparentMesh: 0
--- !u!114 &877849791289276071
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6686627033699372418}
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: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &6710770906200055607
GameObject:
m_ObjectHideFlags: 0
@ -70499,7 +70787,7 @@ RectTransform:
- {fileID: 2175078994281552001}
- {fileID: 3210510460490899911}
m_Father: {fileID: 7019400324678272696}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -71204,7 +71492,7 @@ RectTransform:
- {fileID: 119690817069795584}
- {fileID: 998803897713680703}
m_Father: {fileID: 7019400324678272696}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -86465,7 +86753,7 @@ RectTransform:
- {fileID: 2641714763032379374}
- {fileID: 4972939020597592494}
m_Father: {fileID: 7019400324678272696}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}

View File

@ -2070,7 +2070,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -121.78}
m_AnchoredPosition: {x: 0, y: -94}
m_SizeDelta: {x: 835.3, y: 81.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1831545724925285107
@ -2113,8 +2113,8 @@ MonoBehaviour:
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text:
m_LineSpacing: 0.9
m_Text: 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
LanguageIndex: 0
--- !u!1 &5514124625828332966
GameObject:

View File

@ -1117,6 +1117,9 @@ ItemType = {
GodPrint = 34, --神印
likeabilityItemChip = 35, --好感度物品碎片
EquipChip = 36, --装备碎片
GMzck =42, --gm直冲卡
GMzcq=43,--gm真充卡
CommonChip=50,--通用碎片
}
JumpType = {
Lottery = 1, --招募
@ -1524,6 +1527,7 @@ GoodsTypeDef = {
RecruiteTreasure = 16,
MeiRiTeHui = 17,
chaozhifanli = 18,
HHBG=22,--无限资源阁
}
--工坊功能类型

View File

@ -2735,6 +2735,23 @@ function ConnectTable(curTable,targetTable)
return curTable
end
--检测gm商店是否开启
function CheckGMIsOpen(type,value)
local str=""
if type==1 then
return PlayerManager.level>=value,string.format(Language[10293],value)
elseif type==2 then
local name=ConfigManager.GetConfigData(ConfigName.MainLevelConfig,value).Name or ""
return FightPointPassManager.IsFightPointPass(value),string.format(Language[10295], GetLanguageStrById(name))
elseif type==3 then
return true
elseif type==4 then
return VipManager.GetChargedNum()>=value
end
end
---检测功能开启方法
function CheckFunctionOpen(_funId)
local data = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,_funId)

View File

@ -265,6 +265,8 @@ ConfigName = {
CompareNumSetting="CompareNumSetting",
PrestigeConfig="PrestigeConfig",
UniversalWelfareConfig="UniversalWelfareConfig",
GMInfo="GMInfo",
GMMaster="GMMaster",
}
require "Framework/GameDataBase"

View File

@ -471,6 +471,8 @@ UIName = {
NewShenZunPanel=479, --新神尊特权界面
NewShenZunExpExchangePopup=480, --新神尊特权兑换弹窗
QuanMinFLPanel=481, --gm全民福利
GMChangePanel=482,--gm修改器
GMCommonConfirmPanel=483,--gm确认弹窗
}
SubUIConfig = {

View File

@ -578,6 +578,9 @@ LUCKWHEELREWARDPOSINFO = protobuf.Descriptor();
LUCKWHEELREWARDPOSINFO_POS_FIELD = protobuf.FieldDescriptor();
LUCKWHEELREWARDPOSINFO_LUCKID_FIELD = protobuf.FieldDescriptor();
LUCKWHEELREWARDPOSINFO_LUCKTIMES_FIELD = protobuf.FieldDescriptor();
DIALINFO = protobuf.Descriptor();
DIALINFO_ACTIVITYID_FIELD = protobuf.FieldDescriptor();
DIALINFO_REWARDINFO_FIELD = protobuf.FieldDescriptor();
REFRESHTASK = protobuf.Descriptor();
REFRESHTASK_TYPE_FIELD = protobuf.FieldDescriptor();
REFRESHTASK_TASKS_FIELD = protobuf.FieldDescriptor();
@ -6395,6 +6398,34 @@ LUCKWHEELREWARDPOSINFO.enum_types = {}
LUCKWHEELREWARDPOSINFO.fields = {LUCKWHEELREWARDPOSINFO_POS_FIELD, LUCKWHEELREWARDPOSINFO_LUCKID_FIELD, LUCKWHEELREWARDPOSINFO_LUCKTIMES_FIELD}
LUCKWHEELREWARDPOSINFO.is_extendable = false
LUCKWHEELREWARDPOSINFO.extensions = {}
DIALINFO_ACTIVITYID_FIELD.name = "activityId"
DIALINFO_ACTIVITYID_FIELD.full_name = ".rpc.protocols.DialInfo.activityId"
DIALINFO_ACTIVITYID_FIELD.number = 1
DIALINFO_ACTIVITYID_FIELD.index = 0
DIALINFO_ACTIVITYID_FIELD.label = 1
DIALINFO_ACTIVITYID_FIELD.has_default_value = false
DIALINFO_ACTIVITYID_FIELD.default_value = 0
DIALINFO_ACTIVITYID_FIELD.type = 5
DIALINFO_ACTIVITYID_FIELD.cpp_type = 1
DIALINFO_REWARDINFO_FIELD.name = "rewardInfo"
DIALINFO_REWARDINFO_FIELD.full_name = ".rpc.protocols.DialInfo.rewardInfo"
DIALINFO_REWARDINFO_FIELD.number = 2
DIALINFO_REWARDINFO_FIELD.index = 1
DIALINFO_REWARDINFO_FIELD.label = 3
DIALINFO_REWARDINFO_FIELD.has_default_value = false
DIALINFO_REWARDINFO_FIELD.default_value = {}
DIALINFO_REWARDINFO_FIELD.message_type = LUCKWHEELREWARDPOSINFO
DIALINFO_REWARDINFO_FIELD.type = 11
DIALINFO_REWARDINFO_FIELD.cpp_type = 10
DIALINFO.name = "DialInfo"
DIALINFO.full_name = ".rpc.protocols.DialInfo"
DIALINFO.nested_types = {}
DIALINFO.enum_types = {}
DIALINFO.fields = {DIALINFO_ACTIVITYID_FIELD, DIALINFO_REWARDINFO_FIELD}
DIALINFO.is_extendable = false
DIALINFO.extensions = {}
REFRESHTASK_TYPE_FIELD.name = "type"
REFRESHTASK_TYPE_FIELD.full_name = ".rpc.protocols.RefreshTask.type"
REFRESHTASK_TYPE_FIELD.number = 1
@ -9409,6 +9440,7 @@ CommKeyVal = protobuf.Message(COMMKEYVAL)
CompareNumLevelInfo = protobuf.Message(COMPARENUMLEVELINFO)
CompareNumLevelUserInfo = protobuf.Message(COMPARENUMLEVELUSERINFO)
Creature = protobuf.Message(CREATURE)
DialInfo = protobuf.Message(DIALINFO)
Drop = protobuf.Message(DROP)
EndlessPoint = protobuf.Message(ENDLESSPOINT)
EndlessRefreshInfo = protobuf.Message(ENDLESSREFRESHINFO)

File diff suppressed because one or more lines are too long

View File

@ -258,15 +258,14 @@ FIVEPLAYERUPDATEINDICATION_USERMISSIONINFO_FIELD = protobuf.FieldDescriptor();
FIVEPLAYERUPDATEINDICATION_FIVERESETTOWERINFO_FIELD = protobuf.FieldDescriptor();
FIVEPLAYERUPDATEINDICATION_SIGNININFO_FIELD = protobuf.FieldDescriptor();
FIVEPLAYERUPDATEINDICATION_PLAYERBINDPHONE_FIELD = protobuf.FieldDescriptor();
FIVEPLAYERUPDATEINDICATION_POSINFOS_FIELD = protobuf.FieldDescriptor();
FIVEPLAYERUPDATEINDICATION_POSINFOSADVANCE_FIELD = protobuf.FieldDescriptor();
FIVEPLAYERUPDATEINDICATION_INFOS_FIELD = protobuf.FieldDescriptor();
FIVEPLAYERUPDATEINDICATION_LIKABLEREMAINTIME_FIELD = protobuf.FieldDescriptor();
FIVEPLAYERUPDATEINDICATION_MONTHDAILYTAKE_FIELD = protobuf.FieldDescriptor();
FIVEPLAYERUPDATEINDICATION_LASTFETETYPE_FIELD = protobuf.FieldDescriptor();
FIVEPLAYERUPDATEINDICATION_TAKEFETEREWARD_FIELD = protobuf.FieldDescriptor();
FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD = protobuf.FieldDescriptor();
FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD = protobuf.FieldDescriptor();
FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD = protobuf.FieldDescriptor();
FIVEPLAYERUPDATEINDICATION_LIKABLEREMAINTIME_FIELD = protobuf.FieldDescriptor();
ZEROPLAYERUPDATEINDICATION = protobuf.Descriptor();
GETMISSIONRESPONSE = protobuf.Descriptor();
GETMISSIONRESPONSE_USERMISSIONINFO_FIELD = protobuf.FieldDescriptor();
@ -382,17 +381,18 @@ REFRESHLUCKWHEELREQUEST = protobuf.Descriptor();
REFRESHLUCKWHEELREQUEST_ACTIVITYID_FIELD = protobuf.FieldDescriptor();
REFRESHLUCKWHEELREQUEST_ISFREE_FIELD = protobuf.FieldDescriptor();
REFRESHLUCKWHEELRESPONSE = protobuf.Descriptor();
REFRESHLUCKWHEELRESPONSE_POSINFOS_FIELD = protobuf.FieldDescriptor();
REFRESHLUCKWHEELRESPONSE_DIALINFO_FIELD = protobuf.FieldDescriptor();
GETLUCKWHEELRANDREWARDREQUEST = protobuf.Descriptor();
GETLUCKWHEELRANDREWARDREQUEST_ACTIVITYID_FIELD = protobuf.FieldDescriptor();
GETLUCKWHEELRANDREWARDREQUEST_REPEATED_FIELD = protobuf.FieldDescriptor();
GETLUCKWHEELRANDREWARDRESPONSE = protobuf.Descriptor();
GETLUCKWHEELRANDREWARDRESPONSE_ACTIVITYID_FIELD = protobuf.FieldDescriptor();
GETLUCKWHEELRANDREWARDRESPONSE_POSINFOS_FIELD = protobuf.FieldDescriptor();
GETLUCKWHEELRANDREWARDRESPONSE_DIALINFO_FIELD = protobuf.FieldDescriptor();
GETLUCKWHEELRANDREWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
GETLUCKWHEELREQUEST = protobuf.Descriptor();
GETLUCKWHEELREQUEST_ACTIVITEID_FIELD = protobuf.FieldDescriptor();
LUCKWHEELINDICATION = protobuf.Descriptor();
LUCKWHEELINDICATION_POSINFOS_FIELD = protobuf.FieldDescriptor();
LUCKWHEELINDICATION_POSINFOSADVANCE_FIELD = protobuf.FieldDescriptor();
LUCKWHEELINDICATION_DIALINFO_FIELD = protobuf.FieldDescriptor();
GETMAINLEVELINFORESPONSE = protobuf.Descriptor();
GETMAINLEVELINFORESPONSE_FIGHTID_FIELD = protobuf.FieldDescriptor();
GETMAINLEVELINFORESPONSE_STATE_FIELD = protobuf.FieldDescriptor();
@ -741,6 +741,8 @@ GETCOMPARENUMINFORESPONSE = protobuf.Descriptor();
GETCOMPARENUMINFORESPONSE_LEVELID_FIELD = protobuf.FieldDescriptor();
GETCOMPARENUMINFORESPONSE_COMPLETENUM_FIELD = protobuf.FieldDescriptor();
GETCOMPARENUMINFORESPONSE_REWARDIDARR_FIELD = protobuf.FieldDescriptor();
GMBUYGOODREQUEST = protobuf.Descriptor();
GMBUYGOODREQUEST_GOODSID_FIELD = protobuf.FieldDescriptor();
ERRORMSGRESPONSE_MSG_FIELD.name = "msg"
ERRORMSGRESPONSE_MSG_FIELD.full_name = ".rpc.protocols.ErrorMsgResponse.msg"
@ -3125,27 +3127,26 @@ FIVEPLAYERUPDATEINDICATION_PLAYERBINDPHONE_FIELD.message_type = CommonProto_pb.P
FIVEPLAYERUPDATEINDICATION_PLAYERBINDPHONE_FIELD.type = 11
FIVEPLAYERUPDATEINDICATION_PLAYERBINDPHONE_FIELD.cpp_type = 10
FIVEPLAYERUPDATEINDICATION_POSINFOS_FIELD.name = "posInfos"
FIVEPLAYERUPDATEINDICATION_POSINFOS_FIELD.full_name = ".rpc.protocols.FivePlayerUpdateIndication.posInfos"
FIVEPLAYERUPDATEINDICATION_POSINFOS_FIELD.number = 8
FIVEPLAYERUPDATEINDICATION_POSINFOS_FIELD.index = 7
FIVEPLAYERUPDATEINDICATION_POSINFOS_FIELD.label = 3
FIVEPLAYERUPDATEINDICATION_POSINFOS_FIELD.has_default_value = false
FIVEPLAYERUPDATEINDICATION_POSINFOS_FIELD.default_value = {}
FIVEPLAYERUPDATEINDICATION_POSINFOS_FIELD.message_type = CommonProto_pb.LUCKWHEELREWARDPOSINFO
FIVEPLAYERUPDATEINDICATION_POSINFOS_FIELD.type = 11
FIVEPLAYERUPDATEINDICATION_POSINFOS_FIELD.cpp_type = 10
FIVEPLAYERUPDATEINDICATION_INFOS_FIELD.name = "infos"
FIVEPLAYERUPDATEINDICATION_INFOS_FIELD.full_name = ".rpc.protocols.FivePlayerUpdateIndication.infos"
FIVEPLAYERUPDATEINDICATION_INFOS_FIELD.number = 8
FIVEPLAYERUPDATEINDICATION_INFOS_FIELD.index = 7
FIVEPLAYERUPDATEINDICATION_INFOS_FIELD.label = 3
FIVEPLAYERUPDATEINDICATION_INFOS_FIELD.has_default_value = false
FIVEPLAYERUPDATEINDICATION_INFOS_FIELD.default_value = {}
FIVEPLAYERUPDATEINDICATION_INFOS_FIELD.message_type = CommonProto_pb.DIALINFO
FIVEPLAYERUPDATEINDICATION_INFOS_FIELD.type = 11
FIVEPLAYERUPDATEINDICATION_INFOS_FIELD.cpp_type = 10
FIVEPLAYERUPDATEINDICATION_POSINFOSADVANCE_FIELD.name = "posInfosAdvance"
FIVEPLAYERUPDATEINDICATION_POSINFOSADVANCE_FIELD.full_name = ".rpc.protocols.FivePlayerUpdateIndication.posInfosAdvance"
FIVEPLAYERUPDATEINDICATION_POSINFOSADVANCE_FIELD.number = 9
FIVEPLAYERUPDATEINDICATION_POSINFOSADVANCE_FIELD.index = 8
FIVEPLAYERUPDATEINDICATION_POSINFOSADVANCE_FIELD.label = 3
FIVEPLAYERUPDATEINDICATION_POSINFOSADVANCE_FIELD.has_default_value = false
FIVEPLAYERUPDATEINDICATION_POSINFOSADVANCE_FIELD.default_value = {}
FIVEPLAYERUPDATEINDICATION_POSINFOSADVANCE_FIELD.message_type = CommonProto_pb.LUCKWHEELREWARDPOSINFO
FIVEPLAYERUPDATEINDICATION_POSINFOSADVANCE_FIELD.type = 11
FIVEPLAYERUPDATEINDICATION_POSINFOSADVANCE_FIELD.cpp_type = 10
FIVEPLAYERUPDATEINDICATION_LIKABLEREMAINTIME_FIELD.name = "likableRemainTime"
FIVEPLAYERUPDATEINDICATION_LIKABLEREMAINTIME_FIELD.full_name = ".rpc.protocols.FivePlayerUpdateIndication.likableRemainTime"
FIVEPLAYERUPDATEINDICATION_LIKABLEREMAINTIME_FIELD.number = 9
FIVEPLAYERUPDATEINDICATION_LIKABLEREMAINTIME_FIELD.index = 8
FIVEPLAYERUPDATEINDICATION_LIKABLEREMAINTIME_FIELD.label = 1
FIVEPLAYERUPDATEINDICATION_LIKABLEREMAINTIME_FIELD.has_default_value = false
FIVEPLAYERUPDATEINDICATION_LIKABLEREMAINTIME_FIELD.default_value = 0
FIVEPLAYERUPDATEINDICATION_LIKABLEREMAINTIME_FIELD.type = 5
FIVEPLAYERUPDATEINDICATION_LIKABLEREMAINTIME_FIELD.cpp_type = 1
FIVEPLAYERUPDATEINDICATION_MONTHDAILYTAKE_FIELD.name = "MonthDailyTake"
FIVEPLAYERUPDATEINDICATION_MONTHDAILYTAKE_FIELD.full_name = ".rpc.protocols.FivePlayerUpdateIndication.MonthDailyTake"
@ -3207,21 +3208,11 @@ FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.default_value = 0
FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.type = 5
FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.cpp_type = 1
FIVEPLAYERUPDATEINDICATION_LIKABLEREMAINTIME_FIELD.name = "likableRemainTime"
FIVEPLAYERUPDATEINDICATION_LIKABLEREMAINTIME_FIELD.full_name = ".rpc.protocols.FivePlayerUpdateIndication.likableRemainTime"
FIVEPLAYERUPDATEINDICATION_LIKABLEREMAINTIME_FIELD.number = 16
FIVEPLAYERUPDATEINDICATION_LIKABLEREMAINTIME_FIELD.index = 15
FIVEPLAYERUPDATEINDICATION_LIKABLEREMAINTIME_FIELD.label = 1
FIVEPLAYERUPDATEINDICATION_LIKABLEREMAINTIME_FIELD.has_default_value = false
FIVEPLAYERUPDATEINDICATION_LIKABLEREMAINTIME_FIELD.default_value = 0
FIVEPLAYERUPDATEINDICATION_LIKABLEREMAINTIME_FIELD.type = 5
FIVEPLAYERUPDATEINDICATION_LIKABLEREMAINTIME_FIELD.cpp_type = 1
FIVEPLAYERUPDATEINDICATION.name = "FivePlayerUpdateIndication"
FIVEPLAYERUPDATEINDICATION.full_name = ".rpc.protocols.FivePlayerUpdateIndication"
FIVEPLAYERUPDATEINDICATION.nested_types = {}
FIVEPLAYERUPDATEINDICATION.enum_types = {}
FIVEPLAYERUPDATEINDICATION.fields = {FIVEPLAYERUPDATEINDICATION_HADTAKEDAILYBOX_FIELD, FIVEPLAYERUPDATEINDICATION_PRIVILEGE_FIELD, FIVEPLAYERUPDATEINDICATION_ACTIVITYINFO_FIELD, FIVEPLAYERUPDATEINDICATION_USERMISSIONINFO_FIELD, FIVEPLAYERUPDATEINDICATION_FIVERESETTOWERINFO_FIELD, FIVEPLAYERUPDATEINDICATION_SIGNININFO_FIELD, FIVEPLAYERUPDATEINDICATION_PLAYERBINDPHONE_FIELD, FIVEPLAYERUPDATEINDICATION_POSINFOS_FIELD, FIVEPLAYERUPDATEINDICATION_POSINFOSADVANCE_FIELD, FIVEPLAYERUPDATEINDICATION_MONTHDAILYTAKE_FIELD, FIVEPLAYERUPDATEINDICATION_LASTFETETYPE_FIELD, FIVEPLAYERUPDATEINDICATION_TAKEFETEREWARD_FIELD, FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD, FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD, FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD, FIVEPLAYERUPDATEINDICATION_LIKABLEREMAINTIME_FIELD}
FIVEPLAYERUPDATEINDICATION.fields = {FIVEPLAYERUPDATEINDICATION_HADTAKEDAILYBOX_FIELD, FIVEPLAYERUPDATEINDICATION_PRIVILEGE_FIELD, FIVEPLAYERUPDATEINDICATION_ACTIVITYINFO_FIELD, FIVEPLAYERUPDATEINDICATION_USERMISSIONINFO_FIELD, FIVEPLAYERUPDATEINDICATION_FIVERESETTOWERINFO_FIELD, FIVEPLAYERUPDATEINDICATION_SIGNININFO_FIELD, FIVEPLAYERUPDATEINDICATION_PLAYERBINDPHONE_FIELD, FIVEPLAYERUPDATEINDICATION_INFOS_FIELD, FIVEPLAYERUPDATEINDICATION_LIKABLEREMAINTIME_FIELD, FIVEPLAYERUPDATEINDICATION_MONTHDAILYTAKE_FIELD, FIVEPLAYERUPDATEINDICATION_LASTFETETYPE_FIELD, FIVEPLAYERUPDATEINDICATION_TAKEFETEREWARD_FIELD, FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD, FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD, FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD}
FIVEPLAYERUPDATEINDICATION.is_extendable = false
FIVEPLAYERUPDATEINDICATION.extensions = {}
ZEROPLAYERUPDATEINDICATION.name = "ZeroPlayerUpdateIndication"
@ -4252,22 +4243,22 @@ REFRESHLUCKWHEELREQUEST.enum_types = {}
REFRESHLUCKWHEELREQUEST.fields = {REFRESHLUCKWHEELREQUEST_ACTIVITYID_FIELD, REFRESHLUCKWHEELREQUEST_ISFREE_FIELD}
REFRESHLUCKWHEELREQUEST.is_extendable = false
REFRESHLUCKWHEELREQUEST.extensions = {}
REFRESHLUCKWHEELRESPONSE_POSINFOS_FIELD.name = "posInfos"
REFRESHLUCKWHEELRESPONSE_POSINFOS_FIELD.full_name = ".rpc.protocols.RefreshLuckWheelResponse.posInfos"
REFRESHLUCKWHEELRESPONSE_POSINFOS_FIELD.number = 1
REFRESHLUCKWHEELRESPONSE_POSINFOS_FIELD.index = 0
REFRESHLUCKWHEELRESPONSE_POSINFOS_FIELD.label = 3
REFRESHLUCKWHEELRESPONSE_POSINFOS_FIELD.has_default_value = false
REFRESHLUCKWHEELRESPONSE_POSINFOS_FIELD.default_value = {}
REFRESHLUCKWHEELRESPONSE_POSINFOS_FIELD.message_type = CommonProto_pb.LUCKWHEELREWARDPOSINFO
REFRESHLUCKWHEELRESPONSE_POSINFOS_FIELD.type = 11
REFRESHLUCKWHEELRESPONSE_POSINFOS_FIELD.cpp_type = 10
REFRESHLUCKWHEELRESPONSE_DIALINFO_FIELD.name = "dialInfo"
REFRESHLUCKWHEELRESPONSE_DIALINFO_FIELD.full_name = ".rpc.protocols.RefreshLuckWheelResponse.dialInfo"
REFRESHLUCKWHEELRESPONSE_DIALINFO_FIELD.number = 1
REFRESHLUCKWHEELRESPONSE_DIALINFO_FIELD.index = 0
REFRESHLUCKWHEELRESPONSE_DIALINFO_FIELD.label = 1
REFRESHLUCKWHEELRESPONSE_DIALINFO_FIELD.has_default_value = false
REFRESHLUCKWHEELRESPONSE_DIALINFO_FIELD.default_value = nil
REFRESHLUCKWHEELRESPONSE_DIALINFO_FIELD.message_type = CommonProto_pb.DIALINFO
REFRESHLUCKWHEELRESPONSE_DIALINFO_FIELD.type = 11
REFRESHLUCKWHEELRESPONSE_DIALINFO_FIELD.cpp_type = 10
REFRESHLUCKWHEELRESPONSE.name = "RefreshLuckWheelResponse"
REFRESHLUCKWHEELRESPONSE.full_name = ".rpc.protocols.RefreshLuckWheelResponse"
REFRESHLUCKWHEELRESPONSE.nested_types = {}
REFRESHLUCKWHEELRESPONSE.enum_types = {}
REFRESHLUCKWHEELRESPONSE.fields = {REFRESHLUCKWHEELRESPONSE_POSINFOS_FIELD}
REFRESHLUCKWHEELRESPONSE.fields = {REFRESHLUCKWHEELRESPONSE_DIALINFO_FIELD}
REFRESHLUCKWHEELRESPONSE.is_extendable = false
REFRESHLUCKWHEELRESPONSE.extensions = {}
GETLUCKWHEELRANDREWARDREQUEST_ACTIVITYID_FIELD.name = "activityId"
@ -4307,16 +4298,16 @@ GETLUCKWHEELRANDREWARDRESPONSE_ACTIVITYID_FIELD.default_value = 0
GETLUCKWHEELRANDREWARDRESPONSE_ACTIVITYID_FIELD.type = 5
GETLUCKWHEELRANDREWARDRESPONSE_ACTIVITYID_FIELD.cpp_type = 1
GETLUCKWHEELRANDREWARDRESPONSE_POSINFOS_FIELD.name = "posInfos"
GETLUCKWHEELRANDREWARDRESPONSE_POSINFOS_FIELD.full_name = ".rpc.protocols.GetLuckWheelRandRewardResponse.posInfos"
GETLUCKWHEELRANDREWARDRESPONSE_POSINFOS_FIELD.number = 2
GETLUCKWHEELRANDREWARDRESPONSE_POSINFOS_FIELD.index = 1
GETLUCKWHEELRANDREWARDRESPONSE_POSINFOS_FIELD.label = 3
GETLUCKWHEELRANDREWARDRESPONSE_POSINFOS_FIELD.has_default_value = false
GETLUCKWHEELRANDREWARDRESPONSE_POSINFOS_FIELD.default_value = {}
GETLUCKWHEELRANDREWARDRESPONSE_POSINFOS_FIELD.message_type = CommonProto_pb.LUCKWHEELREWARDPOSINFO
GETLUCKWHEELRANDREWARDRESPONSE_POSINFOS_FIELD.type = 11
GETLUCKWHEELRANDREWARDRESPONSE_POSINFOS_FIELD.cpp_type = 10
GETLUCKWHEELRANDREWARDRESPONSE_DIALINFO_FIELD.name = "dialInfo"
GETLUCKWHEELRANDREWARDRESPONSE_DIALINFO_FIELD.full_name = ".rpc.protocols.GetLuckWheelRandRewardResponse.dialInfo"
GETLUCKWHEELRANDREWARDRESPONSE_DIALINFO_FIELD.number = 2
GETLUCKWHEELRANDREWARDRESPONSE_DIALINFO_FIELD.index = 1
GETLUCKWHEELRANDREWARDRESPONSE_DIALINFO_FIELD.label = 1
GETLUCKWHEELRANDREWARDRESPONSE_DIALINFO_FIELD.has_default_value = false
GETLUCKWHEELRANDREWARDRESPONSE_DIALINFO_FIELD.default_value = nil
GETLUCKWHEELRANDREWARDRESPONSE_DIALINFO_FIELD.message_type = CommonProto_pb.DIALINFO
GETLUCKWHEELRANDREWARDRESPONSE_DIALINFO_FIELD.type = 11
GETLUCKWHEELRANDREWARDRESPONSE_DIALINFO_FIELD.cpp_type = 10
GETLUCKWHEELRANDREWARDRESPONSE_DROP_FIELD.name = "drop"
GETLUCKWHEELRANDREWARDRESPONSE_DROP_FIELD.full_name = ".rpc.protocols.GetLuckWheelRandRewardResponse.drop"
@ -4333,36 +4324,42 @@ GETLUCKWHEELRANDREWARDRESPONSE.name = "GetLuckWheelRandRewardResponse"
GETLUCKWHEELRANDREWARDRESPONSE.full_name = ".rpc.protocols.GetLuckWheelRandRewardResponse"
GETLUCKWHEELRANDREWARDRESPONSE.nested_types = {}
GETLUCKWHEELRANDREWARDRESPONSE.enum_types = {}
GETLUCKWHEELRANDREWARDRESPONSE.fields = {GETLUCKWHEELRANDREWARDRESPONSE_ACTIVITYID_FIELD, GETLUCKWHEELRANDREWARDRESPONSE_POSINFOS_FIELD, GETLUCKWHEELRANDREWARDRESPONSE_DROP_FIELD}
GETLUCKWHEELRANDREWARDRESPONSE.fields = {GETLUCKWHEELRANDREWARDRESPONSE_ACTIVITYID_FIELD, GETLUCKWHEELRANDREWARDRESPONSE_DIALINFO_FIELD, GETLUCKWHEELRANDREWARDRESPONSE_DROP_FIELD}
GETLUCKWHEELRANDREWARDRESPONSE.is_extendable = false
GETLUCKWHEELRANDREWARDRESPONSE.extensions = {}
LUCKWHEELINDICATION_POSINFOS_FIELD.name = "posInfos"
LUCKWHEELINDICATION_POSINFOS_FIELD.full_name = ".rpc.protocols.LuckWheelIndication.posInfos"
LUCKWHEELINDICATION_POSINFOS_FIELD.number = 1
LUCKWHEELINDICATION_POSINFOS_FIELD.index = 0
LUCKWHEELINDICATION_POSINFOS_FIELD.label = 3
LUCKWHEELINDICATION_POSINFOS_FIELD.has_default_value = false
LUCKWHEELINDICATION_POSINFOS_FIELD.default_value = {}
LUCKWHEELINDICATION_POSINFOS_FIELD.message_type = CommonProto_pb.LUCKWHEELREWARDPOSINFO
LUCKWHEELINDICATION_POSINFOS_FIELD.type = 11
LUCKWHEELINDICATION_POSINFOS_FIELD.cpp_type = 10
GETLUCKWHEELREQUEST_ACTIVITEID_FIELD.name = "activiteId"
GETLUCKWHEELREQUEST_ACTIVITEID_FIELD.full_name = ".rpc.protocols.GetLuckWheelRequest.activiteId"
GETLUCKWHEELREQUEST_ACTIVITEID_FIELD.number = 1
GETLUCKWHEELREQUEST_ACTIVITEID_FIELD.index = 0
GETLUCKWHEELREQUEST_ACTIVITEID_FIELD.label = 1
GETLUCKWHEELREQUEST_ACTIVITEID_FIELD.has_default_value = false
GETLUCKWHEELREQUEST_ACTIVITEID_FIELD.default_value = 0
GETLUCKWHEELREQUEST_ACTIVITEID_FIELD.type = 5
GETLUCKWHEELREQUEST_ACTIVITEID_FIELD.cpp_type = 1
LUCKWHEELINDICATION_POSINFOSADVANCE_FIELD.name = "posInfosAdvance"
LUCKWHEELINDICATION_POSINFOSADVANCE_FIELD.full_name = ".rpc.protocols.LuckWheelIndication.posInfosAdvance"
LUCKWHEELINDICATION_POSINFOSADVANCE_FIELD.number = 2
LUCKWHEELINDICATION_POSINFOSADVANCE_FIELD.index = 1
LUCKWHEELINDICATION_POSINFOSADVANCE_FIELD.label = 3
LUCKWHEELINDICATION_POSINFOSADVANCE_FIELD.has_default_value = false
LUCKWHEELINDICATION_POSINFOSADVANCE_FIELD.default_value = {}
LUCKWHEELINDICATION_POSINFOSADVANCE_FIELD.message_type = CommonProto_pb.LUCKWHEELREWARDPOSINFO
LUCKWHEELINDICATION_POSINFOSADVANCE_FIELD.type = 11
LUCKWHEELINDICATION_POSINFOSADVANCE_FIELD.cpp_type = 10
GETLUCKWHEELREQUEST.name = "GetLuckWheelRequest"
GETLUCKWHEELREQUEST.full_name = ".rpc.protocols.GetLuckWheelRequest"
GETLUCKWHEELREQUEST.nested_types = {}
GETLUCKWHEELREQUEST.enum_types = {}
GETLUCKWHEELREQUEST.fields = {GETLUCKWHEELREQUEST_ACTIVITEID_FIELD}
GETLUCKWHEELREQUEST.is_extendable = false
GETLUCKWHEELREQUEST.extensions = {}
LUCKWHEELINDICATION_DIALINFO_FIELD.name = "dialInfo"
LUCKWHEELINDICATION_DIALINFO_FIELD.full_name = ".rpc.protocols.LuckWheelIndication.dialInfo"
LUCKWHEELINDICATION_DIALINFO_FIELD.number = 1
LUCKWHEELINDICATION_DIALINFO_FIELD.index = 0
LUCKWHEELINDICATION_DIALINFO_FIELD.label = 3
LUCKWHEELINDICATION_DIALINFO_FIELD.has_default_value = false
LUCKWHEELINDICATION_DIALINFO_FIELD.default_value = {}
LUCKWHEELINDICATION_DIALINFO_FIELD.message_type = CommonProto_pb.DIALINFO
LUCKWHEELINDICATION_DIALINFO_FIELD.type = 11
LUCKWHEELINDICATION_DIALINFO_FIELD.cpp_type = 10
LUCKWHEELINDICATION.name = "LuckWheelIndication"
LUCKWHEELINDICATION.full_name = ".rpc.protocols.LuckWheelIndication"
LUCKWHEELINDICATION.nested_types = {}
LUCKWHEELINDICATION.enum_types = {}
LUCKWHEELINDICATION.fields = {LUCKWHEELINDICATION_POSINFOS_FIELD, LUCKWHEELINDICATION_POSINFOSADVANCE_FIELD}
LUCKWHEELINDICATION.fields = {LUCKWHEELINDICATION_DIALINFO_FIELD}
LUCKWHEELINDICATION.is_extendable = false
LUCKWHEELINDICATION.extensions = {}
GETMAINLEVELINFORESPONSE_FIGHTID_FIELD.name = "fightId"
@ -7499,6 +7496,23 @@ GETCOMPARENUMINFORESPONSE.enum_types = {}
GETCOMPARENUMINFORESPONSE.fields = {GETCOMPARENUMINFORESPONSE_LEVELID_FIELD, GETCOMPARENUMINFORESPONSE_COMPLETENUM_FIELD, GETCOMPARENUMINFORESPONSE_REWARDIDARR_FIELD}
GETCOMPARENUMINFORESPONSE.is_extendable = false
GETCOMPARENUMINFORESPONSE.extensions = {}
GMBUYGOODREQUEST_GOODSID_FIELD.name = "goodsId"
GMBUYGOODREQUEST_GOODSID_FIELD.full_name = ".rpc.protocols.GmBuyGoodRequest.goodsId"
GMBUYGOODREQUEST_GOODSID_FIELD.number = 1
GMBUYGOODREQUEST_GOODSID_FIELD.index = 0
GMBUYGOODREQUEST_GOODSID_FIELD.label = 1
GMBUYGOODREQUEST_GOODSID_FIELD.has_default_value = false
GMBUYGOODREQUEST_GOODSID_FIELD.default_value = 0
GMBUYGOODREQUEST_GOODSID_FIELD.type = 5
GMBUYGOODREQUEST_GOODSID_FIELD.cpp_type = 1
GMBUYGOODREQUEST.name = "GmBuyGoodRequest"
GMBUYGOODREQUEST.full_name = ".rpc.protocols.GmBuyGoodRequest"
GMBUYGOODREQUEST.nested_types = {}
GMBUYGOODREQUEST.enum_types = {}
GMBUYGOODREQUEST.fields = {GMBUYGOODREQUEST_GOODSID_FIELD}
GMBUYGOODREQUEST.is_extendable = false
GMBUYGOODREQUEST.extensions = {}
ActiveUserMountRequest = protobuf.Message(ACTIVEUSERMOUNTREQUEST)
ActiveUserMountResponse = protobuf.Message(ACTIVEUSERMOUNTRESPONSE)
@ -7586,6 +7600,7 @@ GetItemInfoRequest = protobuf.Message(GETITEMINFOREQUEST)
GetItemInfoResponse = protobuf.Message(GETITEMINFORESPONSE)
GetLuckWheelRandRewardRequest = protobuf.Message(GETLUCKWHEELRANDREWARDREQUEST)
GetLuckWheelRandRewardResponse = protobuf.Message(GETLUCKWHEELRANDREWARDRESPONSE)
GetLuckWheelRequest = protobuf.Message(GETLUCKWHEELREQUEST)
GetMainLevelInfoResponse = protobuf.Message(GETMAINLEVELINFORESPONSE)
GetMissionResponse = protobuf.Message(GETMISSIONRESPONSE)
GetMonsterRankInfoRequest = protobuf.Message(GETMONSTERRANKINFOREQUEST)
@ -7607,6 +7622,7 @@ GetStoreInfosResponse = protobuf.Message(GETSTOREINFOSRESPONSE)
GetWeekCardRewardRequest = protobuf.Message(GETWEEKCARDREWARDREQUEST)
GetWeekCardRewardResponse = protobuf.Message(GETWEEKCARDREWARDRESPONSE)
GetWorkShopInfoResponse = protobuf.Message(GETWORKSHOPINFORESPONSE)
GmBuyGoodRequest = protobuf.Message(GMBUYGOODREQUEST)
HardStageDailyRewardResponse = protobuf.Message(HARDSTAGEDAILYREWARDRESPONSE)
HardStageFightRequest = protobuf.Message(HARDSTAGEFIGHTREQUEST)
HardStageFightResponse = protobuf.Message(HARDSTAGEFIGHTRESPONSE)

View File

@ -110,7 +110,9 @@ function BagResolveAnCompoundPanel:BindEvent()
this.ShowCompoundNumData(value)
end)
Util.AddClick(this.addBtn, function()
if itemData.itemConfig.ItemType == ItemType.Box then
if itemData.itemConfig.ItemType == ItemType.Box
or itemData.itemConfig.ItemType == ItemType.GMzck
or itemData.itemConfig.ItemType == ItemType.GMzcq then--宝箱
if compoundNum<compoundMaxNum then
compoundNum=compoundNum+1
this.ShowCompoundNumData(compoundNum)
@ -136,7 +138,8 @@ function BagResolveAnCompoundPanel:BindEvent()
if itemData.itemConfig.ItemType==ItemType.HeroDebris
or itemData.itemConfig.ItemType==ItemType.ZuoQiChip
or itemData.itemConfig.ItemType==ItemType.likeabilityItemChip
or itemData.itemConfig.ItemType==ItemType.EquipChip then--碎片
or itemData.itemConfig.ItemType==ItemType.EquipChip
or itemData.itemConfig.ItemType==ItemType.CommonChip then--碎片
if compoundNum>0 then
local item={}
item.itemId=itemData.id
@ -148,7 +151,9 @@ function BagResolveAnCompoundPanel:BindEvent()
else
PopupTipPanel.ShowTip(Language[10183])
end
elseif itemData.itemConfig.ItemType==ItemType.Box then--宝箱
elseif itemData.itemConfig.ItemType==ItemType.Box
or itemData.itemConfig.ItemType == ItemType.GMzck
or itemData.itemConfig.ItemType == ItemType.GMzcq then
if compoundNum>0 then
local item={}
local itemList = {}
@ -235,6 +240,7 @@ function BagResolveAnCompoundPanel:OnOpen(...)
Log("itemData "..itemData.id)
this.OnShowLayout3Data()
elseif openLayoutType==4 then--宝箱使用
LogError("222222222222")
itemData=data[2]
callBackFun = data[3]
this.OnShowLayout3Data()
@ -308,6 +314,7 @@ function this.OnShowLayout3Data()
or itemData.itemConfig.ItemType==ItemType.ZuoQiChip
or itemData.itemConfig.ItemType==ItemType.likeabilityItemChip
or itemData.itemConfig.ItemType==ItemType.EquipChip
or itemData.itemConfig.ItemType==ItemType.CommonChip
then--碎片
this.chipFrame:SetActive(true)
this.chipFrame:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetHeroChipQuantityImageByquality(itemData.itemConfig.Quantity))
@ -322,13 +329,19 @@ function this.OnShowLayout3Data()
this.btnCompoundText.text=Language[10193]
local maxCompoundValue = math.floor(itemData.num/itemData.itemConfig.UsePerCount)
--
if itemData.itemConfig.ItemType==ItemType.HeroDebris or itemData.itemConfig.ItemType==ItemType.likeabilityItemChip or itemData.itemConfig.ItemType==ItemType.EquipChip then -- 神将碎片
if itemData.itemConfig.ItemType==ItemType.HeroDebris
or itemData.itemConfig.ItemType==ItemType.likeabilityItemChip
or itemData.itemConfig.ItemType==ItemType.EquipChip
or itemData.itemConfig.ItemType==ItemType.CommonChip
then -- 神将碎片
compoundMaxNum = math.min(maxCompoundValue, gameSetting.HeroCompoundLimit, gameSetting.HeroNumlimit-LengthOfTable(HeroManager.GetAllHeroDatas()))
elseif itemData.itemConfig.ItemType==ItemType.ZuoQiChip then -- 坐骑碎片
compoundMaxNum = math.min(maxCompoundValue, gameSetting.HeroCompoundLimit)
end
elseif itemData.itemConfig.ItemType==ItemType.Box then--宝箱
elseif itemData.itemConfig.ItemType==ItemType.Box
or itemData.itemConfig.ItemType == ItemType.GMzck
or itemData.itemConfig.ItemType == ItemType.GMzcq then--宝箱
this.nameText.text=Language[10194]
this.btnCompoundText.text=Language[10195]
local maxCompoundValue = itemData.num-- math.floor(itemData.num/itemData.itemConfig.UsePerCount)
@ -473,9 +486,13 @@ function this.ShowCompoundNumData(value)
if itemData.itemConfig.ItemType==ItemType.HeroDebris
or itemData.itemConfig.ItemType==ItemType.ZuoQiChip
or itemData.itemConfig.ItemType==ItemType.likeabilityItemChip
or itemData.itemConfig.ItemType==ItemType.EquipChip then--碎片
or itemData.itemConfig.ItemType==ItemType.EquipChip
or itemData.itemConfig.ItemType==ItemType.CommonChip
then--碎片
this.numText.text= Language[10198]..value*itemData.itemConfig.UsePerCount..Language[10199]..value..Language[10200].. string.gsub(GetLanguageStrById(itemData.itemConfig.Name),Language[10201],"")
elseif itemData.itemConfig.ItemType==ItemType.Box then--宝箱
elseif itemData.itemConfig.ItemType==ItemType.Box
or itemData.itemConfig.ItemType == ItemType.GMzck
or itemData.itemConfig.ItemType == ItemType.GMzcq then
this.numText.text= Language[10202]..value..Language[10200]..GetLanguageStrById(itemData.itemConfig.Name)..""
elseif itemData.itemConfig.ItemType==ItemType.TimeIsGold then--挂机奖励
this.numText.text= Language[10202]..value..Language[10200]..GetLanguageStrById(itemData.itemConfig.Name)..""

View File

@ -140,7 +140,11 @@ function this:InitComponent()
--新神尊特权
this.btnShenzun=Util.GetGameObject(self.gameObject,"RightDown/btnShenzun")
this.shenzunRedPoint = Util.GetGameObject(this.btnShenzun,"redPoint")
this.shenzunRedPoint:SetActive(false)
--gm修改器
this.btnGMChange=Util.GetGameObject(self.gameObject,"RightDown/btnGMChange")
Util.GetGameObject(this.btnGMChange,"Image"):GetComponent("Image").sprite=this.spLoader:LoadSprite("gm_change_maincity_btn_zh")
this.gmRedPoint = Util.GetGameObject(this.btnGMChange,"redPoint")
this.gmRedPoint:SetActive(false)
--六星前往
this.btnSixStarGo=Util.GetGameObject(self.gameObject,"LeftUp/GameObject/GameObject/sixStarHero")
--15日登陆活动预告
@ -674,6 +678,10 @@ function this:BindEvent()
end)
end)
Util.AddClick(this.btnGMChange,function()
UIManager.OpenPanel(UIName.GMChangePanel)
end)
Util.AddClick(this.btnShenzun,function()
UIManager.OpenPanel(UIName.NewShenZunPanel)
end)

View File

@ -6876,4 +6876,21 @@ function NetManager.SendUpgradeGodTreeRequest(_jewelId,_count,func)
end
function NetManager.SendGmBuyGoodRequest(_id,func)
local data = PlayerInfoProto_pb.GmBuyGoodRequest()
data.goodsId=_id
LogError("id========================".._id)
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.GmBuyGoodRequest,MessageTypeProto_pb.TEST_BUY_GIGT_GOODS_RESPONSE,msg,function(buffer)
local data = buffer:DataByte()
local msg = PlayerInfoProto_pb.BuyGoodsDropIndication()
msg:ParseFromString(data)
LogError("11111111111111111111111")
if func then
func(msg)
end
end)
end
return this

View File

@ -0,0 +1,191 @@
require("Base/BasePanel")
GMChangePanel = Inherit(BasePanel)
local this= GMChangePanel
local GMInfo=ConfigManager.GetConfig(ConfigName.GMInfo)
local GMMaster=ConfigManager.GetConfig(ConfigName.GMMaster)
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
local rechargeCommodityConfig=ConfigManager.GetConfig(ConfigName.RechargeCommodityConfig)
local sortingOrder = 0
--初始化组件(用于子类重写)
function GMChangePanel:InitComponent()
this.spLoader = SpriteLoader.New()
--定义头部文字和按钮
this.curTxt=Util.GetGameObject(self.gameObject, "layout/top/value1"):GetComponent("Text")
this.addTxt=Util.GetGameObject(self.gameObject, "layout/top/value2"):GetComponent("Text")
this.btn_add=Util.GetGameObject(self.gameObject, "layout/top/btn_chong")
this.btn_up=Util.GetGameObject(self.gameObject, "layout/top/btn_up")
this.progressTxt=Util.GetGameObject(self.gameObject, "layout/top/progress/value"):GetComponent("Text")
this.progressBar=Util.GetGameObject(self.gameObject, "layout/top/progress/progressBar"):GetComponent("Image")
this.progressBar.fillAmount=0
--滚动条和预设
--self.scrollItem = Util.GetGameObject(self.gameObject, "rzyBg/scrollItem")
this.itemPre = Util.GetGameObject(self.gameObject, "layout/tabBtnPre")
this.grid = Util.GetGameObject(self.gameObject, "layout/tabScroll/grid")
this.btn_close=Util.GetGameObject(self.gameObject, "layout/backBtn")
this.selectBtn=Util.GetGameObject(self.gameObject, "layout/tabSelectBtn")
this.selectBtnText=Util.GetGameObject(self.gameObject, "layout/tabSelectBtn/Text"):GetComponent("Text")
this.shopItemPre=Util.GetGameObject(self.gameObject, "layout/shopItemPre")
this.scroll=Util.GetGameObject(self.gameObject, "layout/scroll")
this.hint=Util.GetGameObject(self.gameObject, "layout/hint"):GetComponent("Text")
--设置滚动条
local rootHight = this.scroll.transform.rect.height
local width = this.scroll.transform.rect.width
this.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.scroll.transform,
this.shopItemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 5),false)
this.scrollView.moveTween.MomentumAmount = 1
this.scrollView.moveTween.Strength = 2
local isFirst=true
for k, v in ConfigPairs(GMInfo) do
if v.IsOpen==1 then
local tabBtn = newObjToParent(this.itemPre,this.grid)
Util.GetGameObject(tabBtn, "Text"):GetComponent("Text").text=v.Name
Util.AddClick(tabBtn,function ()
this.TabBtnOnClick(tabBtn,v)
end)
if isFirst then
this.TabBtnOnClick(tabBtn,v)
isFirst=false
end
end
end
end
--绑定事件(用于子类重写)
function GMChangePanel:BindEvent()
Util.AddClick(this.btn_close, function()
self:ClosePanel()
end)
Util.AddClick(this.btn_add, function()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,1342)
end)
Util.AddClick(this.btn_up, function()
end)
end
--添加事件监听(用于子类重写)
function GMChangePanel:AddListener()
end
--移除事件监听(用于子类重写)
function GMChangePanel:RemoveListener()
end
--界面打开时调用(用于子类重写)
function GMChangePanel:OnOpen(activityId)
this:ShowTopInfo()
end
function GMChangePanel:ShowTopInfo()
local num=BagManager.GetItemCountById(1367)
this.curTxt.text=num..""
local maxnum=8000
this.addTxt.text=maxnum-num..""
this.progressBar.fillAmount=num/maxnum
this.progressTxt.text=num.."/"..maxnum
end
function this.TabBtnOnClick(btn,config)
--local _level=_privilegeLv>0 and _privilegeLv or 1
--local clickBtn=this.tabGrid.transform:GetChild(_level-1)
this.selectBtn.transform:SetParent(btn.gameObject.transform)
this.selectBtn.transform.localScale = Vector3.one
this.selectBtn.transform.localPosition = Vector3.zero
this.selectBtnText.text=config.Name
--this.UpdateLayout(_level)
local dataList={}
local aa=config.Unlock[1]
LogError("aa[1]==="..aa[1].." aa[2]==="..aa[2])
local isOpen,tip=CheckGMIsOpen(aa[1],aa[2])
if isOpen then
this.hint.gameObject:SetActive(false)
this.scroll:SetActive(true)
for k, v in ConfigPairs(GMMaster) do
if v.Type==config.Type then
table.insert(dataList,v)
end
end
this.scrollView:SetData(dataList,function(index, rewardItem)
this:SingleTask(rewardItem, dataList[index])
end,not false,not false)
else
this.hint.gameObject:SetActive(true)
this.hint.text=tip
this.scroll:SetActive(false)
end
end
function GMChangePanel:SingleTask(go,data)
local name=Util.GetGameObject(go, "name"):GetComponent("Text")
local num=Util.GetGameObject(go, "num"):GetComponent("Text")
local itemDes=Util.GetGameObject(go, "item"):GetComponent("Text")
local btn=Util.GetGameObject(go, "btn")
local btnTxt=Util.GetGameObject(go, "btn/Text"):GetComponent("Text")
local recharge=rechargeCommodityConfig[data.PackID]
name.text=recharge.Name
LogError("type=="..recharge.Type.." id=="..recharge.Id)
local leftBuyTime=OperatingManager.GetLeftBuyTime(recharge.Type,recharge.Id)
num.text="("..leftBuyTime.."/"..recharge.Limit..")"
local des=""
for i = 1, #data.Price do
if itemConfig[data.Price[i][1]] then
des=des.." "..itemConfig[data.Price[i][1]].Name.." *"..data.Price[i][2]
end
end
itemDes.text=des
Util.SetGray(btn,leftBuyTime<=0)
btn:GetComponent("Button").interactable = leftBuyTime>0
Util.AddClick(btn, function()
local sureFunc=function()
NetManager.SendGmBuyGoodRequest(data.PackID,function()
if data.Jump~=0 then
self:ClosePanel()
JumpManager.GoJump(data.Jump)
return
end
local leftBuyTime=OperatingManager.GetLeftBuyTime(recharge.Type,recharge.Id)
num.text="("..leftBuyTime.."/"..recharge.Limit..")"
Util.SetGray(btn,leftBuyTime<=0)
btn:GetComponent("Button").interactable = leftBuyTime>0
this:ShowTopInfo()
end)
end
local args={}
args[1]="是否兑换?"
args[2]="兑换"
args[3]="取消"
args[4]=sureFunc
UIManager.OpenPanel(UIName.GMCommonConfirmPanel,args)
end)
end
function GMChangePanel:OnSortingOrderChange()
end
-- 打开,重新打开时回调
function GMChangePanel:OnShow(_sortingOrder)
end
--界面关闭时调用(用于子类重写)
function GMChangePanel:OnClose()
end
--界面销毁时调用(用于子类重写)
function GMChangePanel:OnDestroy()
this.spLoader:Destroy()
end
return GMChangePanel

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 9010c527fb38f394a8bce47f38c27e1d
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -161,7 +161,6 @@ function HHBJPage:SetCardShow(i)
Util.AddOnceClick(self.cardPres[i].month,function()
if state==0 then
PayManager.Pay(gifts[i], function()
-- self.curAllMonthCardData = MonthCardManager.GetMonthCardData()
Util.SetGray(self.cardPres[i].month,false)
self.cardPres[i].month:GetComponent("Button").enabled = true

View File

@ -63,13 +63,39 @@ function this.Pay(id, func)
CheckRedPointStatus(RedPointType.GrowthPackage)--成长礼包的红点检测
--直购商品
local rechargeConfig = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, id)
if AppConst.isSDKLogin and rechargeConfig.Price > 0 then
PayManager.SdkPay({ Id = id, orderId = orderId })
else
NetManager.RequestBuyGiftGoods(id, function(msg)
this.onSdkPayResult(id)
end)
if rechargeConfig.BuyType==1 then --人民币
if AppConst.isSDKLogin and rechargeConfig.Price > 0 then
PayManager.SdkPay({ Id = id, orderId = orderId })
else
NetManager.RequestBuyGiftGoods(id, function(msg)
this.onSdkPayResult(id)
end)
end
elseif rechargeConfig.BuyType==2 then --gm余额购买
NetManager.SendGmBuyGoodRequest(id)
elseif rechargeConfig.BuyType==3 then --rmb/gm余额购买
local sureFunc=function()
NetManager.SendGmBuyGoodRequest(id,function()
end)
end
local cancelFunc=function()
if AppConst.isSDKLogin and rechargeConfig.Price > 0 then
PayManager.SdkPay({ Id = id, orderId = orderId })
else
NetManager.RequestBuyGiftGoods(id, function(msg)
this.onSdkPayResult(id)
end)
end
end
local args={}
args[1]="该福利可以通过GM修改器获得是否继续充值"
args[2]="GM修改器"
args[3]="直接充值"
args[4]=sureFunc
args[5]=cancelFunc
UIManager.OpenPanel(UIName.GMCommonConfirmPanel,args)
end
end)
end

View File

@ -93,7 +93,8 @@ function RewardItemSingleShowPopup:BindEvent()
end
if itemConfigData.ItemType == ItemType.HeroDebris
or itemConfigData.ItemType==ItemType.likeabilityItemChip
or itemConfigData.ItemType==ItemType.EquipChip then
or itemConfigData.ItemType==ItemType.EquipChip
or itemConfigData.ItemType==ItemType.CommonChip then
local gameSetting = ConfigManager.GetConfigData(ConfigName.GameSetting, 1)
local endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.GetAllHeroDatas())
local sum = BagManager.GetItemCountById(itemSid) / BagManager.bagDatas[itemSid].itemConfig.UsePerCount
@ -138,7 +139,10 @@ function RewardItemSingleShowPopup:BindEvent()
this.DeleteActiveLanTuData()
end)
end
elseif itemConfigData.ItemType == ItemType.Box then
elseif itemConfigData.ItemType == ItemType.Box
or itemConfigData.ItemType == ItemType.GMzck
or itemConfigData.ItemType == ItemType.GMzcq then
LogError("1111111111111111111")
local _itemData = BagManager.bagDatas[itemSid]
if itemConfig[itemSid].UseType ~= 2 then
UIManager.OpenPanel(UIName.BagResolveAnCompoundPanel, 4, _itemData, function()
@ -349,11 +353,12 @@ function RewardItemSingleShowPopup:OnShow()
or itemConfigData.ItemType == ItemType.ZuoQiChip
or itemConfigData.ItemType == ItemType.likeabilityItemChip
or itemConfigData.ItemType == ItemType.EquipChip
or itemConfigData.ItemType == ItemType.CommonChip
)
then
this.btnSureText.text = Language[10193]
this.btnSure:SetActive(true)
elseif isBagPanel and itemConfigData.ItemType == 10 and func then--是否宝箱可使用
elseif isBagPanel and (itemConfigData.ItemType == 10 or itemConfigData.ItemType == ItemType.GMzck or itemConfigData.ItemType == ItemType.GMzcq) and func then--是否宝箱可使用
this.btnSure:SetActive(true)
this.btnSureText.text = Language[10195]
elseif isBagPanel and itemConfigData.ItemType == 12 and func then-- 改名卡

View File

@ -0,0 +1,96 @@
--[[
* @Classname CommonConfirmPanel
* @Description TODO
* @Date 2019/7/25 14:18
* @Created by MagicianJoker
--]]
---@class GMCommonConfirmPanel
local GMCommonConfirmPanel = quick_class("GMCommonConfirmPanel", BasePanel)
function GMCommonConfirmPanel:InitComponent()
self.spLoader = SpriteLoader.New()
self.title = Util.GetGameObject(self.transform, "frame/bg/title"):GetComponent("Text")
self.content = Util.GetGameObject(self.transform, "frame/bg/content"):GetComponent("Text")
self.doublePart = Util.GetGameObject(self.transform, "frame/bg/doublepart")
self.confirmBtn = Util.GetGameObject(self.doublePart, "confirmBtn")
self.confirmText = Util.GetGameObject(self.confirmBtn, "Text"):GetComponent("Text")
self.cancelBtn = Util.GetGameObject(self.doublePart, "cancelBtn")
self.cancelText = Util.GetGameObject(self.cancelBtn, "Text"):GetComponent("Text")
self.singlePart = Util.GetGameObject(self.transform, "frame/bg/singlepart")
self.singlePart:SetActive(false)
self.singleConfirmBtn = Util.GetGameObject(self.singlePart, "confirmBtn")
self.singleConfirmText = Util.GetGameObject(self.singleConfirmBtn, "Text"):GetComponent("Text")
self.btn_close=Util.GetGameObject(self.transform, "frame/bg/btn_close")
end
function GMCommonConfirmPanel:BindEvent()
Util.AddClick(self.confirmBtn, function()
self:OnConfirmBtnClicked()
end)
Util.AddClick(self.singleConfirmBtn, function()
self:OnConfirmBtnClicked()
end)
Util.AddClick(self.cancelBtn, function()
self:OnCancelBtnClicked()
end)
Util.AddClick(self.btn_close, function()
self:ClosePanel()
end)
end
-- context = {
-- title = "",
-- content = "",
-- confirmCallback = function() end,
-- cancelCallback = function() end,
-- confirmText = "确认",
-- cancelText = "取消",
-- type, -- 单双按钮
-- extra,--额外操作
-- }
local sureFunc=nil
local cancelFunc=nil
function GMCommonConfirmPanel:OnOpen(args)
local info=args[1]
local sureStr=args[2]
local cancelStr=args[3]
sureFunc=args[4]
cancelFunc=args[5]
self.title.text = Language[11309]
self.content.text = info
self.confirmText.text = sureStr or Language[11934]
self.cancelText.text = cancelStr or Language[10731]
self.doublePart:SetActive(true)
end
function GMCommonConfirmPanel:OnShow()
end
function GMCommonConfirmPanel:OnClose()
end
function GMCommonConfirmPanel:OnConfirmBtnClicked()
self:ClosePanel()
if sureFunc then
sureFunc()
end
end
function GMCommonConfirmPanel:OnCancelBtnClicked()
self:ClosePanel()
if cancelFunc then
cancelFunc()
end
end
return GMCommonConfirmPanel

View File

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