第一次bug修改提交
parent
ad9e76bda5
commit
56af6f1a11
Binary file not shown.
|
Before Width: | Height: | Size: 94 KiB After Width: | Height: | Size: 112 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.3 MiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0bfa2e41ed30aaf49a82cc695ad9cd57
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 57
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 455fd3e4b5ef1e04eaca77d8e636bb73
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -892,7 +892,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6760869819602811802
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -909,8 +909,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: -12.2, y: -166.3}
|
||||
m_SizeDelta: {x: 905, y: 1609}
|
||||
m_AnchoredPosition: {x: 0.26003, y: 41}
|
||||
m_SizeDelta: {x: 1053.3, y: 1053.3}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &131306474022066450
|
||||
CanvasRenderer:
|
||||
|
|
@ -940,7 +940,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: d8fcdc7a91410c740a4ea985523c6a2c, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 0bfa2e41ed30aaf49a82cc695ad9cd57, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 1
|
||||
m_FillCenter: 1
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 224444569024407278}
|
||||
m_RootOrder: 10
|
||||
m_RootOrder: 11
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -5159,7 +5159,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 8773189938152682684}
|
||||
m_Father: {fileID: 224444569024407278}
|
||||
m_RootOrder: 16
|
||||
m_RootOrder: 17
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
|
|
@ -5197,7 +5197,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 8773220857135124064}
|
||||
m_Father: {fileID: 224444569024407278}
|
||||
m_RootOrder: 14
|
||||
m_RootOrder: 15
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
|
|
@ -5909,6 +5909,7 @@ RectTransform:
|
|||
- {fileID: 224358324289722092}
|
||||
- {fileID: 8296304076087632614}
|
||||
- {fileID: 8773920232323521874}
|
||||
- {fileID: 5428701917218814035}
|
||||
- {fileID: 224802459047434312}
|
||||
- {fileID: 224391135548581998}
|
||||
- {fileID: 224760356928496956}
|
||||
|
|
@ -6804,7 +6805,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 928637308341248280}
|
||||
m_Father: {fileID: 224444569024407278}
|
||||
m_RootOrder: 13
|
||||
m_RootOrder: 14
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
|
|
@ -7021,7 +7022,7 @@ RectTransform:
|
|||
- {fileID: 224407622329357332}
|
||||
- {fileID: 224403650572873566}
|
||||
m_Father: {fileID: 224444569024407278}
|
||||
m_RootOrder: 9
|
||||
m_RootOrder: 10
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
|
|
@ -7287,7 +7288,7 @@ RectTransform:
|
|||
- {fileID: 8773650339473373148}
|
||||
- {fileID: 4689154057464412612}
|
||||
m_Father: {fileID: 224444569024407278}
|
||||
m_RootOrder: 11
|
||||
m_RootOrder: 12
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
|
|
@ -7426,7 +7427,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 8773028441719626338}
|
||||
m_Father: {fileID: 224444569024407278}
|
||||
m_RootOrder: 12
|
||||
m_RootOrder: 13
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
|
|
@ -27515,6 +27516,154 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &713060211094447166
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7766034504957065745}
|
||||
- component: {fileID: 5638899614943409840}
|
||||
- component: {fileID: 13032555596221420}
|
||||
m_Layer: 5
|
||||
m_Name: treebtn
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7766034504957065745
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 713060211094447166}
|
||||
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: 5428701917218814035}
|
||||
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: 125, y: 123}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5638899614943409840
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 713060211094447166}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &13032555596221420
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 713060211094447166}
|
||||
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: c0e2ff0e5cbd6384ea4afd24a076c9f8, 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 &827145628639397688
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7973024720331223790}
|
||||
- component: {fileID: 6845938121783729388}
|
||||
- component: {fileID: 1090216912924126921}
|
||||
m_Layer: 5
|
||||
m_Name: redPoint
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &7973024720331223790
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 827145628639397688}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 100}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 5428701917218814035}
|
||||
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: 40.8, y: 46.4}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6845938121783729388
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 827145628639397688}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1090216912924126921
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 827145628639397688}
|
||||
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 &828656887579548897
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -32564,7 +32713,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 1009503462481533844}
|
||||
m_Father: {fileID: 224444569024407278}
|
||||
m_RootOrder: 19
|
||||
m_RootOrder: 20
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
@ -47171,7 +47320,7 @@ RectTransform:
|
|||
- {fileID: 5561687783376730610}
|
||||
- {fileID: 7402777051519901064}
|
||||
m_Father: {fileID: 224444569024407278}
|
||||
m_RootOrder: 15
|
||||
m_RootOrder: 16
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
|
@ -71844,6 +71993,136 @@ ParticleSystemRenderer:
|
|||
m_Mesh2: {fileID: 0}
|
||||
m_Mesh3: {fileID: 0}
|
||||
m_MaskInteraction: 0
|
||||
--- !u!1 &2989819313393387400
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5428701917218814035}
|
||||
- component: {fileID: 5851003887503518368}
|
||||
- component: {fileID: 6433271483122099343}
|
||||
- component: {fileID: 8167455887458653178}
|
||||
- component: {fileID: 3428855361183380585}
|
||||
m_Layer: 5
|
||||
m_Name: treeBtn
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5428701917218814035
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2989819313393387400}
|
||||
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: 7766034504957065745}
|
||||
- {fileID: 7973024720331223790}
|
||||
m_Father: {fileID: 224444569024407278}
|
||||
m_RootOrder: 9
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -974.43, y: 1199}
|
||||
m_SizeDelta: {x: 127, y: 135}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5851003887503518368
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2989819313393387400}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6433271483122099343
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2989819313393387400}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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
|
||||
--- !u!114 &8167455887458653178
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2989819313393387400}
|
||||
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: 6433271483122099343}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!95 &3428855361183380585
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2989819313393387400}
|
||||
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 &3029551253820120583
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -77411,7 +77690,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 224444569024407278}
|
||||
m_RootOrder: 17
|
||||
m_RootOrder: 18
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
|
|
@ -91835,7 +92114,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 224444569024407278}
|
||||
m_RootOrder: 18
|
||||
m_RootOrder: 19
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
|
|
@ -106453,7 +106732,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 224444569024407278}
|
||||
m_RootOrder: 20
|
||||
m_RootOrder: 21
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
|
|
|||
|
|
@ -328,7 +328,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 231, y: 234}
|
||||
m_AnchoredPosition: {x: 231, y: 207.55}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.44683328, y: 0.35822254}
|
||||
--- !u!222 &222754335739163912
|
||||
|
|
@ -6207,7 +6207,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 231, y: 234}
|
||||
m_AnchoredPosition: {x: 231, y: 208.6}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.44683328, y: 0.35822254}
|
||||
--- !u!222 &8632397697918983482
|
||||
|
|
|
|||
|
|
@ -67,11 +67,11 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 40
|
||||
m_FontSize: 14
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 1
|
||||
m_MinSize: 26
|
||||
m_MaxSize: 40
|
||||
m_MinSize: 5
|
||||
m_MaxSize: 32
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
|
|
@ -107,15 +107,15 @@ RectTransform:
|
|||
m_GameObject: {fileID: 785060333507136899}
|
||||
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: 0.6, y: 0.6, z: 0.6}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1280971389820392845}
|
||||
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: 7.9, y: 0}
|
||||
m_SizeDelta: {x: 144.2, y: 30}
|
||||
m_AnchoredPosition: {x: 0.0000061989, y: 1.12}
|
||||
m_SizeDelta: {x: 144.2, y: 32.24}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &713855380676855364
|
||||
CanvasRenderer:
|
||||
|
|
@ -158,7 +158,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text:
|
||||
m_Text: 99999999
|
||||
--- !u!114 &2282114642779265658
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ function this:BtnClickEvent()
|
|||
end
|
||||
if freeTime <= 0 then
|
||||
if BagManager.GetItemCountById(itemId) < costNum then
|
||||
PopupTipPanel.ShowTip(string.format(Language[10343], itemConfig[itemId].Name))
|
||||
PopupTipPanel.ShowTip(string.format(Language[10298], itemConfig[itemId].Name))
|
||||
return
|
||||
end
|
||||
MsgPanel.ShowTwo(string.format("是否花费%s%s购买一次扫荡次数?",costNum,itemConfig[itemId].Name),function() end,function()
|
||||
|
|
|
|||
|
|
@ -94,7 +94,6 @@ function this.On_Btn2_Click()
|
|||
PopupTipPanel.ShowTip("挑战编队为空")
|
||||
return
|
||||
end
|
||||
LogGreen("this.root.curFormationIndex:"..this.root.curFormationIndex)
|
||||
FormationManager.RefreshFormation(
|
||||
this.root.curFormationIndex,
|
||||
this.root.choosedList,
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ function FourElementMonsterCampPanel:BindEvent()
|
|||
end)
|
||||
Util.AddClick(this.moppingUpBtn, function ()
|
||||
if trailData.canFightTime < 1 then
|
||||
PopupTipPanel.ShowTip("今日挑战次数不足")
|
||||
PopupTipPanel.ShowTip("今日已无购买次数")
|
||||
return
|
||||
end
|
||||
if not ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.CampTowerConfig,"CampId",curType,"FloorId",trailData.monsterWave + 1) then
|
||||
|
|
|
|||
|
|
@ -474,11 +474,44 @@ function this.SetFriendHelpHero(helpFightList,trailType)
|
|||
if not this.friendHelpHero[trailType] then
|
||||
this.friendHelpHero[trailType] = {}
|
||||
end
|
||||
|
||||
local team = FormationManager.GetFormationByID(trailType + 2000)
|
||||
if this.friendHelpHero[trailType].hero then
|
||||
local newteam = {}
|
||||
for k,v in ipairs(team.teamHeroInfos) do
|
||||
if v.heroId == this.friendHelpHero[trailType].hero.dynamicId then
|
||||
else
|
||||
table.insert(newteam,v)
|
||||
end
|
||||
end
|
||||
if LengthOfTable(newteam) ~= LengthOfTable(team.teamHeroInfos) then
|
||||
FormationManager.RefreshFormation(
|
||||
this.root.curFormationIndex,
|
||||
this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
end
|
||||
end
|
||||
if helpFightList then
|
||||
if this.friendHelpHero[trailType].hero then
|
||||
local newteam = {}
|
||||
for k,v in ipairs(team.teamHeroInfos) do
|
||||
if v.heroId == this.friendHelpHero[trailType].hero.dynamicId then
|
||||
else
|
||||
table.insert(newteam,v)
|
||||
end
|
||||
end
|
||||
if LengthOfTable(newteam) ~= LengthOfTable(team.teamHeroInfos) then
|
||||
FormationManager.RefreshFormation(
|
||||
this.root.curFormationIndex,
|
||||
this.root.choosedList,
|
||||
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
|
||||
end
|
||||
end
|
||||
|
||||
this.friendHelpHero[trailType].player = helpFightList
|
||||
this.friendHelpHero[trailType].hero = this.UpdateHeroDatas(helpFightList.hero,helpFightList)
|
||||
local allAddProVal = HeroManager.CalculateHeroAllProValList(1, this.friendHelpHero[trailType].hero, false)
|
||||
this.friendHelpHero[trailType].hero.warPower = allAddProVal[HeroProType.WarPower]
|
||||
this.friendHelpHero[trailType].hero.warPower = allAddProVal[HeroProType.WarPower]
|
||||
else
|
||||
this.friendHelpHero[trailType] = nil
|
||||
end
|
||||
|
|
|
|||
|
|
@ -5044,7 +5044,14 @@ end
|
|||
|
||||
function this.UpgradeGodTreeRequest(func)
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.UpgradeGodTreeRequest, MessageTypeProto_pb.UpgradeGodTreeResponse, nil, function(buffer)
|
||||
SacredTreeManager.treeLevel = SacredTreeManager.treeLevel + 1
|
||||
local configs = ConfigManager.GetConfig(ConfigName.JewelConfig)
|
||||
local maxlv = 0
|
||||
for k,v in ConfigPairs(configs) do
|
||||
if v.GodHoodMaxlv > maxlv then
|
||||
maxlv = v.GodHoodMaxlv
|
||||
end
|
||||
end
|
||||
SacredTreeManager.treeLevel = SacredTreeManager.treeLevel + 1 > maxlv and maxlv or SacredTreeManager.treeLevel + 1
|
||||
EquipTreasureManager.ChangeTreeLv()
|
||||
if func then
|
||||
func()
|
||||
|
|
|
|||
|
|
@ -148,6 +148,13 @@ function RoleEquipPanel:InitComponent()
|
|||
for i = 1, 6 do
|
||||
Util.GetGameObject(self.gameObject,"bg/equipInfo/equip"..i.."/mask"):GetComponent("Image").sprite = this.spLoader:LoadSprite(EquipPositionIcon[i])
|
||||
end
|
||||
|
||||
this.treeBtn = Util.GetGameObject(self.gameObject, "treeBtn")
|
||||
Util.AddClick(this.treeBtn, function()
|
||||
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.SACREDTREE) then
|
||||
UIManager.OpenPanel(UIName.SacredTreePanel)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
|
|
@ -280,6 +287,7 @@ function RoleEquipPanel:OnOpen(...)
|
|||
isUpZhen = data[4]
|
||||
end
|
||||
function RoleEquipPanel:OnShow()
|
||||
this.treeBtn:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.SACREDTREE))
|
||||
isPlayAnim = true
|
||||
for i = 1, #heroListData do
|
||||
if curHeroData == heroListData[i] then
|
||||
|
|
@ -435,9 +443,9 @@ function this:AllEquipUpBtnOnClick()
|
|||
end
|
||||
end
|
||||
end
|
||||
-- LogYellow("装备:"..#allEquipIds)
|
||||
-- LogYellow("宝物:"..#allTreasureIds)
|
||||
-- LogYellow("isCanUpEquipTreasure:"..tostring(isCanUpEquipTreasure))
|
||||
LogYellow("装备:"..#allEquipIds)
|
||||
LogYellow("宝物:"..#allTreasureIds)
|
||||
LogYellow("isCanUpEquipTreasure:"..tostring(isCanUpEquipTreasure))
|
||||
if (allEquipIds and #allEquipIds > 0) or (isCanUpEquipTreasure and allTreasureIds and #allTreasureIds > 0) then
|
||||
--isCanUpEquipTreasure
|
||||
if allEquipIds and #allEquipIds > 0 and not curHeroData.harmonyGongMing then
|
||||
|
|
@ -783,7 +791,7 @@ function this.SingleItemDataShow(_go, _itemData)
|
|||
this.equipPreList[_go].gameObject:SetActive(true)
|
||||
this.equipPreList[_go].transform:SetAsFirstSibling()
|
||||
if itemConfig[_itemData.id].ItemType == ItemType.EquipTreasure then
|
||||
this.equipPreList[_go]:OnOpen(false,{_itemData.id,0}, 1, true, false, false, 0,_itemData.idDyn)
|
||||
this.equipPreList[_go]:OnOpen(false,{_itemData.id,0}, 1.1, true, false, false, 0,_itemData.idDyn)
|
||||
if curHeroCanUpEquipTreasuresTabs and #curHeroCanUpEquipTreasuresTabs > 0 then
|
||||
local isShow = false
|
||||
for i = 1, #curHeroCanUpEquipTreasuresTabs do
|
||||
|
|
|
|||
|
|
@ -179,14 +179,15 @@ function FourElementSingleWave:SetIcon()
|
|||
if self.data.wave == self.trailData.monsterWave then
|
||||
self.rewardData = self.data.commonReward
|
||||
--设置扫荡按钮
|
||||
self.rewardText.text = "扫荡奖励"
|
||||
self.fightBtnMask.sprite = self.spLoader:LoadSprite("r_hero_button_002")
|
||||
self.rewardText.text = "扫荡奖励"
|
||||
if self.freeTimes > 0 then
|
||||
self.fightBtnIcon.gameObject:SetActive(false)
|
||||
self.fightBtnNum.gameObject:SetActive(false)
|
||||
self.fightBtnText.text = string.format("<color=#%s>%s</color>","17232A","免费扫荡")
|
||||
self.fightBtnMask.sprite = self.spLoader:LoadSprite("r_guji_jihuianniu_02")
|
||||
Util.SetGray(self.fight,false)
|
||||
else
|
||||
self.fightBtnMask.sprite = self.spLoader:LoadSprite("r_guji_jihuianniu_02")
|
||||
self.fightBtnIcon.gameObject:SetActive(true)
|
||||
self.fightBtnNum.gameObject:SetActive(true)
|
||||
self.fightBtnIcon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[self.itemId].ResourceID))
|
||||
|
|
@ -208,7 +209,7 @@ function FourElementSingleWave:SetIcon()
|
|||
--设置挑战fight
|
||||
self.fightBtnIcon.gameObject:SetActive(false)
|
||||
self.fightBtnNum.gameObject:SetActive(false)
|
||||
self.fightBtnMask:GetComponent("Image").sprite = self.spLoader:LoadSprite("r_hero_button_001")
|
||||
self.fightBtnMask:GetComponent("Image").sprite = self.spLoader:LoadSprite("s_shouchong_anniu")
|
||||
self.fightBtnText.text = string.format("<color=#%s>%s</color>","17232A","挑战")
|
||||
else
|
||||
self.fight.gameObject:SetActive(false)
|
||||
|
|
|
|||
Loading…
Reference in New Issue