Merge branch 'china/dev' into 0功能/命格
# Conflicts: # Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab # Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua # Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.luadev_chengFeng
|
|
@ -0,0 +1,362 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!29 &1
|
||||
OcclusionCullingSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_OcclusionBakeSettings:
|
||||
smallestOccluder: 5
|
||||
smallestHole: 0.25
|
||||
backfaceThreshold: 100
|
||||
m_SceneGUID: 00000000000000000000000000000000
|
||||
m_OcclusionCullingData: {fileID: 0}
|
||||
--- !u!1 &2
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 16}
|
||||
- component: {fileID: 42}
|
||||
- component: {fileID: 44}
|
||||
- component: {fileID: 43}
|
||||
- component: {fileID: 5}
|
||||
- component: {fileID: 3}
|
||||
m_Layer: 0
|
||||
m_Name: EventSystem
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &3
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: c7cbe2940276bfc4f946d442c07229d2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!196 &4
|
||||
NavMeshSettings:
|
||||
serializedVersion: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_BuildSettings:
|
||||
serializedVersion: 2
|
||||
agentTypeID: 0
|
||||
agentRadius: 0.5
|
||||
agentHeight: 2
|
||||
agentSlope: 45
|
||||
agentClimb: 0.4
|
||||
ledgeDropHeight: 0
|
||||
maxJumpAcrossDistance: 0
|
||||
minRegionArea: 2
|
||||
manualCellSize: 0
|
||||
cellSize: 0.16666667
|
||||
manualTileSize: 0
|
||||
tileSize: 256
|
||||
accuratePlacement: 0
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!81 &5
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2}
|
||||
m_Enabled: 1
|
||||
--- !u!4 &16
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!104 &22
|
||||
RenderSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 9
|
||||
m_Fog: 0
|
||||
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
|
||||
m_FogMode: 3
|
||||
m_FogDensity: 0.01
|
||||
m_LinearFogStart: 0
|
||||
m_LinearFogEnd: 300
|
||||
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
|
||||
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
|
||||
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
|
||||
m_AmbientIntensity: 1
|
||||
m_AmbientMode: 3
|
||||
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
|
||||
m_SkyboxMaterial: {fileID: 0}
|
||||
m_HaloStrength: 0.5
|
||||
m_FlareStrength: 1
|
||||
m_FlareFadeSpeed: 3
|
||||
m_HaloTexture: {fileID: 0}
|
||||
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_DefaultReflectionMode: 0
|
||||
m_DefaultReflectionResolution: 128
|
||||
m_ReflectionBounces: 1
|
||||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &24
|
||||
LightmapSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 11
|
||||
m_GIWorkflowMode: 1
|
||||
m_GISettings:
|
||||
serializedVersion: 2
|
||||
m_BounceScale: 1
|
||||
m_IndirectOutputScale: 1
|
||||
m_AlbedoBoost: 1
|
||||
m_EnvironmentLightingMode: 0
|
||||
m_EnableBakedLightmaps: 0
|
||||
m_EnableRealtimeLightmaps: 0
|
||||
m_LightmapEditorSettings:
|
||||
serializedVersion: 10
|
||||
m_Resolution: 2
|
||||
m_BakeResolution: 40
|
||||
m_AtlasSize: 1024
|
||||
m_AO: 0
|
||||
m_AOMaxDistance: 1
|
||||
m_CompAOExponent: 1
|
||||
m_CompAOExponentDirect: 0
|
||||
m_Padding: 2
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_LightmapsBakeMode: 1
|
||||
m_TextureCompression: 1
|
||||
m_FinalGather: 0
|
||||
m_FinalGatherFiltering: 1
|
||||
m_FinalGatherRayCount: 256
|
||||
m_ReflectionCompression: 2
|
||||
m_MixedBakeMode: 2
|
||||
m_BakeBackend: 0
|
||||
m_PVRSampling: 1
|
||||
m_PVRDirectSampleCount: 32
|
||||
m_PVRSampleCount: 500
|
||||
m_PVRBounces: 2
|
||||
m_PVRFilterTypeDirect: 0
|
||||
m_PVRFilterTypeIndirect: 0
|
||||
m_PVRFilterTypeAO: 0
|
||||
m_PVRFilteringMode: 1
|
||||
m_PVRCulling: 1
|
||||
m_PVRFilteringGaussRadiusDirect: 1
|
||||
m_PVRFilteringGaussRadiusIndirect: 5
|
||||
m_PVRFilteringGaussRadiusAO: 2
|
||||
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
|
||||
m_PVRFilteringAtrousPositionSigmaIndirect: 2
|
||||
m_PVRFilteringAtrousPositionSigmaAO: 1
|
||||
m_ShowResolutionOverlay: 1
|
||||
m_LightingDataAsset: {fileID: 0}
|
||||
m_UseShadowmask: 1
|
||||
--- !u!114 &42
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_FirstSelected: {fileID: 0}
|
||||
m_sendNavigationEvents: 1
|
||||
m_DragThreshold: 50
|
||||
--- !u!114 &43
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_ForceModuleActive: 0
|
||||
--- !u!114 &44
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalAxis: Horizontal
|
||||
m_VerticalAxis: Vertical
|
||||
m_SubmitButton: Submit
|
||||
m_CancelButton: Cancel
|
||||
m_InputActionsPerSecond: 10
|
||||
m_RepeatDelay: 0.5
|
||||
m_ForceModuleActive: 0
|
||||
--- !u!1 &1013149005
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1013149006}
|
||||
- component: {fileID: 1013149007}
|
||||
- component: {fileID: 1013149008}
|
||||
m_Layer: 0
|
||||
m_Name: GameStart
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1013149006
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1013149005}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0.26726648, y: 0.43754014, z: -0.046788022}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1013149007
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1013149005}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ae34f89576e17114c97f3cb81dba9ff6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &1013149008
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1013149005}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fa01058878b41024abbd731e7118c543, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
settingInfo:
|
||||
logLevel: 6
|
||||
isDebug: 0
|
||||
bundleMode: 1
|
||||
luaBundleMode: 1
|
||||
isUpdate: 1
|
||||
isSDK: 1
|
||||
isSDKLogin: 1
|
||||
isGuide: 1
|
||||
isOpenGM: 0
|
||||
--- !u!4 &57277738265262265
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3471622135844523394}
|
||||
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: 0}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1362306110787991495
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3471622135844523394}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d7df5c5e5307f460e917e72bf75ec567, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
enableLog: 1
|
||||
networkType: 3
|
||||
tokens:
|
||||
- appid: 90d5c4d37e9142be993cff2aee68aa4f
|
||||
serverUrl: https://thinkingdata.18183g.com
|
||||
mode: 0
|
||||
timeZone: 0
|
||||
timeZoneId:
|
||||
--- !u!1 &3471622135844523394
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 57277738265262265}
|
||||
- component: {fileID: 1362306110787991495}
|
||||
- component: {fileID: 3471622135844523395}
|
||||
- component: {fileID: 3471622135844523396}
|
||||
m_Layer: 0
|
||||
m_Name: SDKConfig
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &3471622135844523395
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3471622135844523394}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 54b4453692b964811aa1c221fd236d88, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
appid: bgsdh87l31909mvu
|
||||
channel: "\u897F\u6E38\u4F0F\u9B54\u7BC7"
|
||||
--- !u!114 &3471622135844523396
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3471622135844523394}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d7bc9cc33d9f7284590ba57b9743fb33, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
appid: 1fc5a543ea
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0e83a7262a8252c46a46058abf77c939
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,362 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!29 &1
|
||||
OcclusionCullingSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_OcclusionBakeSettings:
|
||||
smallestOccluder: 5
|
||||
smallestHole: 0.25
|
||||
backfaceThreshold: 100
|
||||
m_SceneGUID: 00000000000000000000000000000000
|
||||
m_OcclusionCullingData: {fileID: 0}
|
||||
--- !u!1 &2
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 16}
|
||||
- component: {fileID: 42}
|
||||
- component: {fileID: 44}
|
||||
- component: {fileID: 43}
|
||||
- component: {fileID: 5}
|
||||
- component: {fileID: 3}
|
||||
m_Layer: 0
|
||||
m_Name: EventSystem
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &3
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: c7cbe2940276bfc4f946d442c07229d2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!196 &4
|
||||
NavMeshSettings:
|
||||
serializedVersion: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_BuildSettings:
|
||||
serializedVersion: 2
|
||||
agentTypeID: 0
|
||||
agentRadius: 0.5
|
||||
agentHeight: 2
|
||||
agentSlope: 45
|
||||
agentClimb: 0.4
|
||||
ledgeDropHeight: 0
|
||||
maxJumpAcrossDistance: 0
|
||||
minRegionArea: 2
|
||||
manualCellSize: 0
|
||||
cellSize: 0.16666667
|
||||
manualTileSize: 0
|
||||
tileSize: 256
|
||||
accuratePlacement: 0
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!81 &5
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2}
|
||||
m_Enabled: 1
|
||||
--- !u!4 &16
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!104 &22
|
||||
RenderSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 9
|
||||
m_Fog: 0
|
||||
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
|
||||
m_FogMode: 3
|
||||
m_FogDensity: 0.01
|
||||
m_LinearFogStart: 0
|
||||
m_LinearFogEnd: 300
|
||||
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
|
||||
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
|
||||
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
|
||||
m_AmbientIntensity: 1
|
||||
m_AmbientMode: 3
|
||||
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
|
||||
m_SkyboxMaterial: {fileID: 0}
|
||||
m_HaloStrength: 0.5
|
||||
m_FlareStrength: 1
|
||||
m_FlareFadeSpeed: 3
|
||||
m_HaloTexture: {fileID: 0}
|
||||
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_DefaultReflectionMode: 0
|
||||
m_DefaultReflectionResolution: 128
|
||||
m_ReflectionBounces: 1
|
||||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &24
|
||||
LightmapSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 11
|
||||
m_GIWorkflowMode: 1
|
||||
m_GISettings:
|
||||
serializedVersion: 2
|
||||
m_BounceScale: 1
|
||||
m_IndirectOutputScale: 1
|
||||
m_AlbedoBoost: 1
|
||||
m_EnvironmentLightingMode: 0
|
||||
m_EnableBakedLightmaps: 0
|
||||
m_EnableRealtimeLightmaps: 0
|
||||
m_LightmapEditorSettings:
|
||||
serializedVersion: 10
|
||||
m_Resolution: 2
|
||||
m_BakeResolution: 40
|
||||
m_AtlasSize: 1024
|
||||
m_AO: 0
|
||||
m_AOMaxDistance: 1
|
||||
m_CompAOExponent: 1
|
||||
m_CompAOExponentDirect: 0
|
||||
m_Padding: 2
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_LightmapsBakeMode: 1
|
||||
m_TextureCompression: 1
|
||||
m_FinalGather: 0
|
||||
m_FinalGatherFiltering: 1
|
||||
m_FinalGatherRayCount: 256
|
||||
m_ReflectionCompression: 2
|
||||
m_MixedBakeMode: 2
|
||||
m_BakeBackend: 0
|
||||
m_PVRSampling: 1
|
||||
m_PVRDirectSampleCount: 32
|
||||
m_PVRSampleCount: 500
|
||||
m_PVRBounces: 2
|
||||
m_PVRFilterTypeDirect: 0
|
||||
m_PVRFilterTypeIndirect: 0
|
||||
m_PVRFilterTypeAO: 0
|
||||
m_PVRFilteringMode: 1
|
||||
m_PVRCulling: 1
|
||||
m_PVRFilteringGaussRadiusDirect: 1
|
||||
m_PVRFilteringGaussRadiusIndirect: 5
|
||||
m_PVRFilteringGaussRadiusAO: 2
|
||||
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
|
||||
m_PVRFilteringAtrousPositionSigmaIndirect: 2
|
||||
m_PVRFilteringAtrousPositionSigmaAO: 1
|
||||
m_ShowResolutionOverlay: 1
|
||||
m_LightingDataAsset: {fileID: 0}
|
||||
m_UseShadowmask: 1
|
||||
--- !u!114 &42
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_FirstSelected: {fileID: 0}
|
||||
m_sendNavigationEvents: 1
|
||||
m_DragThreshold: 50
|
||||
--- !u!114 &43
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_ForceModuleActive: 0
|
||||
--- !u!114 &44
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalAxis: Horizontal
|
||||
m_VerticalAxis: Vertical
|
||||
m_SubmitButton: Submit
|
||||
m_CancelButton: Cancel
|
||||
m_InputActionsPerSecond: 10
|
||||
m_RepeatDelay: 0.5
|
||||
m_ForceModuleActive: 0
|
||||
--- !u!1 &1013149005
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1013149006}
|
||||
- component: {fileID: 1013149007}
|
||||
- component: {fileID: 1013149008}
|
||||
m_Layer: 0
|
||||
m_Name: GameStart
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1013149006
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1013149005}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0.26726648, y: 0.43754014, z: -0.046788022}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1013149007
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1013149005}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ae34f89576e17114c97f3cb81dba9ff6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &1013149008
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1013149005}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fa01058878b41024abbd731e7118c543, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
settingInfo:
|
||||
logLevel: 6
|
||||
isDebug: 0
|
||||
bundleMode: 1
|
||||
luaBundleMode: 1
|
||||
isUpdate: 1
|
||||
isSDK: 1
|
||||
isSDKLogin: 1
|
||||
isGuide: 1
|
||||
isOpenGM: 0
|
||||
--- !u!4 &57277738265262265
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3471622135844523394}
|
||||
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: 0}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1362306110787991495
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3471622135844523394}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d7df5c5e5307f460e917e72bf75ec567, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
enableLog: 1
|
||||
networkType: 3
|
||||
tokens:
|
||||
- appid: 90d5c4d37e9142be993cff2aee68aa4f
|
||||
serverUrl: https://thinkingdata.18183g.com
|
||||
mode: 0
|
||||
timeZone: 0
|
||||
timeZoneId:
|
||||
--- !u!1 &3471622135844523394
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 57277738265262265}
|
||||
- component: {fileID: 1362306110787991495}
|
||||
- component: {fileID: 3471622135844523395}
|
||||
- component: {fileID: 3471622135844523396}
|
||||
m_Layer: 0
|
||||
m_Name: SDKConfig
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &3471622135844523395
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3471622135844523394}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 54b4453692b964811aa1c221fd236d88, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
appid: bgsdh87l31909mvu
|
||||
channel: "\u5996\u738B\u964D\u4E16"
|
||||
--- !u!114 &3471622135844523396
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3471622135844523394}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d7bc9cc33d9f7284590ba57b9743fb33, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
appid: 1fc5a543ea
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 71c7264b962ad7c45915a2933d6cf447
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
After Width: | Height: | Size: 5.2 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 063058bfcd8740144ae855e56d755855
|
||||
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: b3281f9d64d382a4487d6c1e6fea7022
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ArenaAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
After Width: | Height: | Size: 136 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 5b8ba96f23e958147a367d6003140d48
|
||||
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: 31c4d80cd8354c9419b2896b59bcc045
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: JingJiShiLianAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
After Width: | Height: | Size: 466 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6e2a5f311257d1e4c84545099bf44986
|
||||
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: 1b0d313737e7d544586c663c8f8a11ca
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: JingJiShiLianAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
After Width: | Height: | Size: 188 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6177b49f3b17da84f93658673edd7548
|
||||
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: 403053462ba4cef4b9cfc606b7cdd5a6
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: JingJiShiLianAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
Before Width: | Height: | Size: 75 KiB After Width: | Height: | Size: 284 KiB |
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 23b7c08b43e23454fab20f22d3d36a0c
|
||||
guid: 3c2f9547d00880247b23208b7777f65e
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
|
|
@ -97,7 +97,7 @@ TextureImporter:
|
|||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 76d0c7cc410911a46b08f12b39395311
|
||||
spriteID: 05874bf13bf25fa4d8162f5b1ebebf5e
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 35 KiB |
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 5f3408f17d28a3e499ff4b93c5b47386
|
||||
guid: 5be6ee5837711394b8f2b380c0dc47ce
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
|
|
@ -97,7 +97,7 @@ TextureImporter:
|
|||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 20b86e06a640cfd4ea00ac114f2ce9d0
|
||||
spriteID: 2f93e5a531b895b4aaef2e1cd26e97ef
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
|
|
|||
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 9c6860d55d03ef142851b7a0b52c9703
|
||||
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: 546d9d4e28db4f241b5f0af76a2234de
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: TagButtonAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -902,7 +902,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 1749564513666807311}
|
||||
- component: {fileID: 5862088432759568500}
|
||||
- component: {fileID: 5904280449735229110}
|
||||
- component: {fileID: 6363807631240224676}
|
||||
m_Layer: 5
|
||||
m_Name: deadObj
|
||||
m_TagString: Untagged
|
||||
|
|
@ -926,8 +926,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: 14.285736, y: 19.857117}
|
||||
m_SizeDelta: {x: 67.95, y: 30}
|
||||
m_AnchoredPosition: {x: 50.999996, y: 20.5}
|
||||
m_SizeDelta: {x: 46, y: 76}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5862088432759568500
|
||||
CanvasRenderer:
|
||||
|
|
@ -937,7 +937,7 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2523366928776616017}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &5904280449735229110
|
||||
--- !u!114 &6363807631240224676
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -946,31 +946,26 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 2523366928776616017}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.990566, g: 0.98589355, b: 0.98589355, a: 1}
|
||||
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_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 2
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u9635\u4EA1"
|
||||
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 &2658533052818541386
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3334,7 +3329,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 1546476454649784244}
|
||||
- component: {fileID: 5473746922102607565}
|
||||
- component: {fileID: 3892143291985174656}
|
||||
- component: {fileID: 2251792143694466160}
|
||||
m_Layer: 5
|
||||
m_Name: deadObj
|
||||
m_TagString: Untagged
|
||||
|
|
@ -3358,8 +3353,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: 25.428543, y: 19.857117}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_AnchoredPosition: {x: 50.000008, y: 19.857117}
|
||||
m_SizeDelta: {x: 46, y: 76}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5473746922102607565
|
||||
CanvasRenderer:
|
||||
|
|
@ -3369,7 +3364,7 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7381184559301326831}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3892143291985174656
|
||||
--- !u!114 &2251792143694466160
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -3378,31 +3373,26 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 7381184559301326831}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.990566, g: 0.98589355, b: 0.98589355, a: 1}
|
||||
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_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 2
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u9635\u4EA1"
|
||||
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 &7384883381373111011
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 8a69a0f7d2e606141a48f89076d845f0
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -320,7 +320,6 @@ GameObject:
|
|||
- component: {fileID: 134824311}
|
||||
- component: {fileID: 134824314}
|
||||
- component: {fileID: 2767435939076187884}
|
||||
- component: {fileID: 8562262682098124306}
|
||||
m_Layer: 5
|
||||
m_Name: Root
|
||||
m_TagString: Untagged
|
||||
|
|
@ -388,35 +387,6 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!114 &8562262682098124306
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 134824310}
|
||||
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 &147624192
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -28307,7 +28277,6 @@ GameObject:
|
|||
- component: {fileID: 4381005762452039409}
|
||||
- component: {fileID: 8782233851135989828}
|
||||
- component: {fileID: 1756471361763787702}
|
||||
- component: {fileID: 5158220398415254417}
|
||||
m_Layer: 5
|
||||
m_Name: Root
|
||||
m_TagString: Untagged
|
||||
|
|
@ -28375,35 +28344,6 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!114 &5158220398415254417
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4798530326272507141}
|
||||
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 &4821790168365617154
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -2452,6 +2452,7 @@ FacePanelType = {
|
|||
jianmushenshu = 17, --建木神树
|
||||
silnigshilian = 18, --四灵试炼
|
||||
redTreasure = 19, --红色品质宝物推送礼包
|
||||
jingjishilian = 20
|
||||
}
|
||||
--迷宫寻宝条件类型
|
||||
FindTreasureNeedType = {
|
||||
|
|
|
|||
|
|
@ -439,6 +439,7 @@ UIName = {
|
|||
ArenaTrialPanel = 445,
|
||||
SupremeHeroPopupNew = 448,
|
||||
PremiumRebatePanel = 449,
|
||||
JingjishiLianPatface = 452,
|
||||
}
|
||||
|
||||
SubUIConfig = {
|
||||
|
|
|
|||
|
|
@ -58,6 +58,12 @@ function ArenaTypePanel:BindEvent()
|
|||
end)
|
||||
Util.AddClick(this.btnBack, function()
|
||||
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
||||
if PlayerPrefs.HasKey("ArenaTypePanel"..PlayerManager.uid) then
|
||||
DynamicActivityManager.isopenJingjishilian = false
|
||||
else
|
||||
PlayerPrefs.SetInt("ArenaTypePanel"..PlayerManager.uid,1)
|
||||
DynamicActivityManager.isopenJingjishilian = true
|
||||
end
|
||||
this:ClosePanel()
|
||||
end)
|
||||
|
||||
|
|
|
|||
|
|
@ -857,7 +857,7 @@ end
|
|||
-- 是否解锁跳过功能
|
||||
function this.IsUnlockBattlePass()
|
||||
-- return false
|
||||
return PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.SkipFight), "通关简单3-10或充值任意金额后解锁跳过"
|
||||
return PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.SkipFight), "通关简单3-10或充值6元后解锁跳过"
|
||||
end
|
||||
|
||||
-- 战斗暂停控制
|
||||
|
|
|
|||
|
|
@ -340,6 +340,7 @@ function this.HeadAdapter(head,data,type)
|
|||
local lvText = Util.GetGameObject(head, "lv/Text"):GetComponent("Text")
|
||||
local starRoot = Util.GetGameObject(head, "star")
|
||||
local deadObj = Util.GetGameObject(head, "deadObj")
|
||||
deadObj:GetComponent("Image").sprite=this.spLoader:LoadSprite("r_zhandou_zhenwang_zh")
|
||||
local aa=0
|
||||
|
||||
local frameStr="r_characterbg_goden"
|
||||
|
|
@ -438,11 +439,20 @@ function this.HeadAdapter(head,data,type)
|
|||
icon:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(SpiritAnimal[id].Icon))
|
||||
end
|
||||
if data.isRealDead and (type==1 or type==2 or type==3) then
|
||||
Util.SetGray(icon.gameObject ,true)
|
||||
-- Util.SetGray(icon.gameObject ,true)
|
||||
-- Util.SetGray(frame.gameObject ,true)
|
||||
-- Util.SetGray(protoIcon.gameObject ,true)
|
||||
-- Util.SetGray(starRoot.gameObject ,true)
|
||||
deadObj:SetActive(true)
|
||||
Util.SetGray(head.gameObject ,true)
|
||||
else
|
||||
Util.SetGray(icon.gameObject,false)
|
||||
-- Util.SetGray(icon.gameObject,false)
|
||||
-- Util.SetGray(frame.gameObject ,false)
|
||||
-- Util.SetGray(starRoot.gameObject ,false)
|
||||
-- Util.SetGray(protoIcon.gameObject ,false)
|
||||
deadObj:SetActive(false)
|
||||
Util.SetGray(head.gameObject ,false)
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -138,14 +138,13 @@ function ActivityMainPanel:OnOpen(_activityType,_index,change)
|
|||
this:ClosePanel()
|
||||
end
|
||||
end
|
||||
Log("_CurPageIndex:".._CurPageIndex)
|
||||
end
|
||||
|
||||
-- 打开,重新打开时回调
|
||||
function ActivityMainPanel:OnShow()
|
||||
SoundManager.PlayMusic(SoundConfig.BGM_Main)
|
||||
orginLayer = self.sortingOrder
|
||||
LogGreen("_CurPageIndex OnShow:".._CurPageIndex)
|
||||
Log("_CurPageIndex OnShow:".._CurPageIndex)
|
||||
if _CurPageIndex and (_CurPageIndex > #tabs or _CurPageIndex < 1) then
|
||||
_CurPageIndex = #tabs
|
||||
end
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ this.selectIndex2 = {dataType = 0,goodsId = {}}
|
|||
this.NiuQiIndex = 1
|
||||
this.Index = 0--成长礼包需要的index
|
||||
this.curLevel = 0--当前声望等级
|
||||
|
||||
this.isopenJingjishilian = false
|
||||
this.TaiChuMiJuanData = {}
|
||||
function this.SetTaiChuMiJuanData(msg,fun)
|
||||
local datas
|
||||
|
|
|
|||
|
|
@ -0,0 +1,77 @@
|
|||
require("Base/BasePanel")
|
||||
JingjishiLianPatface = Inherit(BasePanel)
|
||||
|
||||
--初始化组件(用于子类重写)
|
||||
function JingjishiLianPatface:InitComponent()
|
||||
self.spLoader = SpriteLoader.New()
|
||||
self.liveRoot = Util.GetGameObject(self.gameObject,"bg/ren")
|
||||
self.BackBtn = Util.GetGameObject(self.gameObject,"bg/BackBtn")
|
||||
self.BackBtn.gameObject:SetActive(false)
|
||||
self.maskBtn = Util.GetGameObject(self.gameObject,"bg")
|
||||
self.jumpBtn = Util.GetGameObject(self.gameObject,"bg/jumpBtn")
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
function JingjishiLianPatface:BindEvent()
|
||||
Util.AddClick(self.BackBtn, function()
|
||||
self:ClosePanel()
|
||||
end)
|
||||
Util.AddClick(self.maskBtn, function()
|
||||
self:ClosePanel()
|
||||
end)
|
||||
Util.AddClick(self.jumpBtn, function()
|
||||
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.jingjishilian) and ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.jingjishilian)> 0 then
|
||||
UIManager.OpenPanel(UIName.ArenaTrialPanel)
|
||||
self:ClosePanel()
|
||||
else
|
||||
self:ClosePanel()
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
function JingjishiLianPatface:AddListener()
|
||||
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function JingjishiLianPatface:RemoveListener()
|
||||
|
||||
end
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function JingjishiLianPatface:OnOpen(fun)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."JingjishiLianPatface",1)
|
||||
self.fun = fun
|
||||
end
|
||||
|
||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||
function JingjishiLianPatface:OnShow()
|
||||
if self.live then
|
||||
poolManager:UnLoadLive(self.live.gameObject.name, self.live)
|
||||
self.live = nil
|
||||
end
|
||||
local data = ConfigManager.GetConfigDataByKey(ConfigName.HeroConfig,"ReadingName","敖丙")
|
||||
self.live = poolManager:LoadLive(GetResourcePath(data.Live), self.liveRoot.transform,
|
||||
Vector3.one * data.Scale, Vector3.New(data.Position[1], data.Position[2], 0))
|
||||
local SkeletonGraphic = self.live:GetComponent("SkeletonGraphic")
|
||||
SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true)
|
||||
end
|
||||
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function JingjishiLianPatface:OnClose()
|
||||
if self.fun then
|
||||
self.fun()
|
||||
end
|
||||
end
|
||||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
function JingjishiLianPatface:OnDestroy()
|
||||
self.spLoader:Destroy()
|
||||
if self.live then
|
||||
poolManager:UnLoadLive(self.live.gameObject.name, self.live)
|
||||
self.live = nil
|
||||
end
|
||||
end
|
||||
|
||||
return JingjishiLianPatface
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ee8edf7ffe9e3f14493d7e9809ee71f5
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -249,11 +249,17 @@ function this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum)
|
|||
if ActData and PlayerPrefs.GetInt(PlayerManager.uid.."SurpriseBoxPatFaceDay"..ActData.value) == 0 then
|
||||
table.insert(patFaceAllData,v)
|
||||
end
|
||||
-- elseif v.Type == 15 then--特惠神装活动(活动已经移除)
|
||||
-- local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.TeHuiShenZhuang)
|
||||
-- if ActData and PlayerPrefs.GetInt(PlayerManager.uid.."TeHuiShenZhuang"..ActData.activityId) == 0 then
|
||||
-- table.insert(patFaceAllData,v)
|
||||
-- end
|
||||
elseif v.Type == 15 then--特惠神装活动
|
||||
local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.TeHuiShenZhuang)
|
||||
if ActData and PlayerPrefs.GetInt(PlayerManager.uid.."TeHuiShenZhuang"..ActData.activityId) == 0 then
|
||||
table.insert(patFaceAllData,v)
|
||||
end
|
||||
elseif v.Type == 20 then--竞技试炼拍脸
|
||||
if PlayerPrefs.GetInt(PlayerManager.uid.."JingjishiLianPatface") == 0 then
|
||||
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.jingjishilian) and ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.jingjishilian)> 0 then
|
||||
table.insert(patFaceAllData,v)
|
||||
end
|
||||
end
|
||||
else
|
||||
if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then
|
||||
table.insert(patFaceAllData,v)
|
||||
|
|
|
|||
|
|
@ -169,8 +169,10 @@ function PatFacePanel:OnShowPatFaceData()
|
|||
self:OnShowOb8Data()
|
||||
elseif patFaceSingleData.Type == FacePanelType.SurpriseBox then
|
||||
self:OnShowOb9Data()
|
||||
-- elseif patFaceSingleData.Type == FacePanelType.TeHuiShenZhuang then
|
||||
-- self:OnShowOb10Data()
|
||||
elseif patFaceSingleData.Type == FacePanelType.TeHuiShenZhuang then
|
||||
self:OnShowOb10Data()
|
||||
elseif patFaceSingleData.Type == FacePanelType.jingjishilian then
|
||||
UIManager.OpenPanel(UIName.JingjishiLianPatface,function() self:ClosePanel() end)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -181,6 +183,7 @@ function PatFacePanel:OnSortingOrderChange()
|
|||
Util.AddParticleSortLayer( self.effext4, self.sortingOrder - cursortingOrder)
|
||||
cursortingOrder = self.sortingOrder
|
||||
end
|
||||
|
||||
--第一种显示 神兵天降
|
||||
function PatFacePanel:OnShowOb1Data()
|
||||
self.activity1Icon.sprite = self.spLoader:LoadSprite(GetResourcePath(patFaceSingleData.Background))
|
||||
|
|
|
|||
|
|
@ -1108,6 +1108,24 @@ function this.RefreshBattleUpLvTip(isShowUIOpen)
|
|||
JumpManager.GoJump(1011)
|
||||
end)
|
||||
elseif ruleType == 4 then
|
||||
-- 背包 装备
|
||||
this.battleUpLvTip:SetActive(true)
|
||||
this.battleUpLvTipImg.enabled = false
|
||||
this.battleUpLvTipTxt.gameObject:SetActive(false)
|
||||
this.battleLockGo:SetActive(true)
|
||||
Util.AddOnceClick(this.battleUpLvTip, function()
|
||||
JumpManager.GoJump(1007)
|
||||
end)
|
||||
elseif ruleType == 5 then
|
||||
-- 好感度
|
||||
this.battleUpLvTip:SetActive(true)
|
||||
this.battleUpLvTipImg.enabled = false
|
||||
this.battleUpLvTipTxt.gameObject:SetActive(false)
|
||||
this.battleLockGo:SetActive(true)
|
||||
Util.AddOnceClick(this.battleUpLvTip, function()
|
||||
JumpManager.GoJump(40033)
|
||||
end)
|
||||
elseif ruleType == 7 then
|
||||
-- 获取神将
|
||||
this.battleUpLvTip:SetActive(true)
|
||||
this.battleUpLvTipImg.enabled = false
|
||||
|
|
@ -1118,10 +1136,8 @@ function this.RefreshBattleUpLvTip(isShowUIOpen)
|
|||
end)
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
function this.UpdateWordLv()
|
||||
|
|
|
|||
|
|
@ -295,7 +295,7 @@ function this.CheckFightOpenRule(fightId)
|
|||
|
||||
if PlayerManager.level < mainLevelConfig[this.curOpenFight].LevelLimit then
|
||||
local tip = tostring(mainLevelConfig[this.curOpenFight].LevelLimit .. Language[10056])
|
||||
LogRed(tip .. " 当前:"..PlayerManager.level)
|
||||
--LogRed(tip .. " 当前:"..PlayerManager.level)
|
||||
return false, tip, tip
|
||||
end
|
||||
|
||||
|
|
@ -307,7 +307,7 @@ function this.CheckFightOpenRule(fightId)
|
|||
for index, rule in ipairs(openRule) do
|
||||
states[index] = true
|
||||
if not rule[1] or rule[1] == 0 then
|
||||
LogRed("当前:没有限制条件1")
|
||||
--LogRed("当前:没有限制条件1")
|
||||
states[index] = true
|
||||
elseif rule[1] == 1 then
|
||||
local star = FightLevelManager.GetAllChapterStars()
|
||||
|
|
@ -315,15 +315,15 @@ function this.CheckFightOpenRule(fightId)
|
|||
states[index] = false
|
||||
tips[index] = string.format("山河社稷图星数达%s", rule[2])-- 山河社稷图%s星
|
||||
btnTxts[index] = string.format("山河社稷图%s星", rule[2])
|
||||
LogRed(tips[index]..", 当前:"..star)
|
||||
--LogRed(tips[index]..", 当前:"..star)
|
||||
end
|
||||
elseif rule[1] == 2 then
|
||||
local wave = MonsterCampManager.GetMonsterCampCurWave()
|
||||
if wave <= rule[2] then
|
||||
states[index] = false
|
||||
tips[index] = string.format("心魔试炼通关%s层", rule[2])-- 心魔试炼通关999层
|
||||
btnTxts[index] = string.format("心魔试炼通关999层", rule[2])
|
||||
LogRed(tips[index]..", 当前:"..wave)
|
||||
btnTxts[index] = string.format("心魔试炼通关%s层", rule[2])
|
||||
--LogRed(tips[index]..", 当前:"..wave)
|
||||
end
|
||||
elseif rule[1] == 3 then
|
||||
local lv = HarmonyManager.GetSingleAdditions(HarmonyAddType.AddLv)
|
||||
|
|
@ -331,7 +331,7 @@ function this.CheckFightOpenRule(fightId)
|
|||
states[index] = false
|
||||
tips[index] = string.format("鸿蒙阵共鸣等级达%s", rule[2])-- 鸿蒙阵共鸣%s级
|
||||
btnTxts[index] = string.format("鸿蒙阵共鸣%s级", rule[2])
|
||||
LogRed(tips[index]..", 当前:"..lv)
|
||||
--LogRed(tips[index]..", 当前:"..lv)
|
||||
end
|
||||
elseif rule[1] == 4 then
|
||||
-- 指定星级(运算星级)装备数量(初始可用)
|
||||
|
|
@ -341,7 +341,7 @@ function this.CheckFightOpenRule(fightId)
|
|||
states[index] = false
|
||||
tips[index] = string.format("拥有%s个%s%s星装备", rule[3], QualityNameDef[equipStarConfig.Quality], equipStarConfig.Stars)
|
||||
btnTxts[index] = string.format("%s个%s%s星装备", rule[3], QualityNameDef[equipStarConfig.Quality], equipStarConfig.Stars)
|
||||
LogRed(tips[index]..", 当前:"..num)
|
||||
--LogRed(tips[index]..", 当前:"..num)
|
||||
end
|
||||
elseif rule[1] == 5 then
|
||||
local _, tlv, _ = LikabilityManager.GetTotalHeroLikeLv(-1)
|
||||
|
|
@ -349,7 +349,7 @@ function this.CheckFightOpenRule(fightId)
|
|||
states[index] = false
|
||||
tips[index] = string.format("神将总好感度等级达%s", rule[2]) -- 总好感度%s级
|
||||
btnTxts[index] = string.format("总好感度%s级", rule[2])
|
||||
LogRed(tips[index]..", 当前:"..tlv)
|
||||
--LogRed(tips[index]..", 当前:"..tlv)
|
||||
end
|
||||
elseif rule[1] == 6 then
|
||||
-- 逍遥游通关次数
|
||||
|
|
@ -358,7 +358,7 @@ function this.CheckFightOpenRule(fightId)
|
|||
states[index] = false
|
||||
tips[index] = string.format("逍遥游通关%s次", rule[2])
|
||||
btnTxts[index] = string.format("逍遥游通关%s次", rule[2])
|
||||
LogRed(tips[index]..", 当前:"..xyPassTimes)
|
||||
--LogRed(tips[index]..", 当前:"..xyPassTimes)
|
||||
end
|
||||
elseif rule[1] == 7 then
|
||||
local c_lv = rule[2]
|
||||
|
|
@ -368,7 +368,7 @@ function this.CheckFightOpenRule(fightId)
|
|||
states[index] = false
|
||||
tips[index] = string.format("拥有%s个等级%s以上的神将", c_num, c_lv)-- %s个%s级神将
|
||||
btnTxts[index] = string.format("%s个%s级神将", c_num, c_lv)
|
||||
LogRed(tips[index]..", 当前:"..num)
|
||||
--LogRed(tips[index]..", 当前:"..num)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -394,7 +394,7 @@ function this.CheckFightOpenRule(fightId)
|
|||
end
|
||||
return isOk, tip.."解锁", btnTxt, states
|
||||
end
|
||||
LogRed("当前:没有限制条件2")
|
||||
--LogRed("当前:没有限制条件2")
|
||||
return true
|
||||
end
|
||||
|
||||
|
|
@ -663,12 +663,12 @@ end
|
|||
|
||||
-- 获取当前需要显示的描述文字
|
||||
function this.GetCurLevelTips()
|
||||
LogError("GetCurLevelTips")
|
||||
--LogError("GetCurLevelTips")
|
||||
|
||||
for id, config in ConfigPairs(LevelTipsConfig) do
|
||||
LogError(id)
|
||||
--LogError(id)
|
||||
if config.Type == 1 then
|
||||
if this.CarbonIdCompare(this.GetCurFightId(), config.Parameter) < 0 then
|
||||
if this.CarbonIdCompare(this.GetCurFightId(), config.Parameter) <= 0 then
|
||||
return config.Desc -- string.format("通关%s,%s", mainLevelConfig[config.Parameter].Name, config.Desc)
|
||||
end
|
||||
elseif config.Type == 2 then
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ local ArenaTrialPanel = Inherit(BasePanel)
|
|||
function ArenaTrialPanel:InitComponent()
|
||||
self.spLoader = SpriteLoader.New()
|
||||
self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.transform)
|
||||
self.btnBack = Util.GetGameObject(self.gameObject,"bg/BackBtn")
|
||||
self.btnBack = Util.GetGameObject(self.gameObject,"BackBtn")
|
||||
self.liveRoot = Util.GetGameObject(self.gameObject,"bg/ren")
|
||||
self.helpBtn = Util.GetGameObject(self.gameObject, "helpBtn")
|
||||
self.helpPosition = self.helpBtn:GetComponent("RectTransform").localPosition
|
||||
|
|
@ -37,6 +37,7 @@ end
|
|||
--绑定事件(用于子类重写)
|
||||
function ArenaTrialPanel:BindEvent()
|
||||
Util.AddClick(self.btnBack, function()
|
||||
LogError("self.btnBack....")
|
||||
self:ClosePanel()
|
||||
end)
|
||||
|
||||
|
|
@ -62,7 +63,8 @@ function ArenaTrialPanel:RemoveListener()
|
|||
end
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function ArenaTrialPanel:OnOpen()
|
||||
function ArenaTrialPanel:OnOpen(fun)
|
||||
self.fun = fun
|
||||
end
|
||||
|
||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||
|
|
@ -181,6 +183,9 @@ function ArenaTrialPanel:OnClose()
|
|||
poolManager:UnLoadLive(self.live.gameObject.name, self.live)
|
||||
self.live = nil
|
||||
end
|
||||
if self.fun then
|
||||
self.fun()
|
||||
end
|
||||
end
|
||||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ function this.Initialize()
|
|||
Game.GlobalEvent:AddEvent(GameEvent.Mission.OnPassFight,this.OnFightPass)
|
||||
end
|
||||
this.IsFirstOpenHarmonyBei = false
|
||||
this.curId = -1
|
||||
|
||||
function this.EndlessGuideFun()
|
||||
if not AppConst.isGuide then
|
||||
|
|
@ -61,7 +62,7 @@ function this.OnLevelChange()
|
|||
table.insert(_FuncGuideList, 100200)
|
||||
StoryMapManager.isShowStory = 1
|
||||
this.CheckFuncGuide()
|
||||
elseif PlayerManager.level == 22 then
|
||||
elseif PlayerManager.level == 15 then
|
||||
StoryMapManager.isShowStory = 3
|
||||
elseif PlayerManager.level == tonumber(SpecialConfig[89].Value) then
|
||||
table.insert(_FuncGuideList, 103000)
|
||||
|
|
@ -261,11 +262,12 @@ end
|
|||
function this.CheckNextGuideListen(nextId)
|
||||
if GuideConfig[nextId] then
|
||||
local type = GuideConfig[nextId].Type
|
||||
if openDic[type] then
|
||||
-- 主线引导保存下一步id
|
||||
if type == GuideType.Force and openDic[type] then
|
||||
openDic[type] = nextId
|
||||
LogGreen(" GuideConfig[nextId]:"..tostring(GuideConfig[nextId].BehaviorArgs) )
|
||||
this.RefreshTriggerListen(nextId, GuideConfig[nextId].OpenType, GuideConfig[nextId].OpenArgs)
|
||||
end
|
||||
LogGreen(" GuideConfig[nextId]:"..tostring(GuideConfig[nextId].OpenType) )
|
||||
this.RefreshTriggerListen(nextId, GuideConfig[nextId].OpenType, GuideConfig[nextId].OpenArgs)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -794,6 +796,26 @@ function this.RefreshTriggerListen(id, openType, openArgs)
|
|||
end
|
||||
end
|
||||
Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, trigger)
|
||||
-- 十连结果界面触发
|
||||
elseif openType == 37 then
|
||||
local trigger
|
||||
trigger = function(panelType)
|
||||
if panelType == UIName.TenRecruitPanel then
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnOpen, trigger)
|
||||
this.ShowGuide(id)
|
||||
end
|
||||
end
|
||||
Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, trigger)
|
||||
elseif openType == 38 then
|
||||
--战斗失败算
|
||||
local trigger
|
||||
trigger = function(panelType)
|
||||
if panelType == UIName.BattleFailPopup then
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnOpen, trigger)
|
||||
this.ShowGuide(id)
|
||||
end
|
||||
end
|
||||
Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, trigger)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -517,6 +517,20 @@ function this.ExecuteBehavior(beType, beArgs)
|
|||
Util.AddClick(this.button, this.NextGuide)
|
||||
end)
|
||||
this.SetBtnGOPosition(btn.gameObject:GetComponent("RectTransform").position)
|
||||
elseif beType == 20 then -- 进入假战斗
|
||||
this.canvas.enabled=false
|
||||
this.dialogRoot:SetActive(false)
|
||||
this.mask:SetActive(false)
|
||||
this.tipButtomRoot:SetActive(false)
|
||||
|
||||
local fdata, fseed = BattleManager.GetFakeBattleData(tonumber(beArgs))
|
||||
local testFightData = {
|
||||
fightData = fdata,
|
||||
fightSeed = fseed,
|
||||
fightType = 0,
|
||||
maxRound = 20
|
||||
}
|
||||
UIManager.OpenPanel(UIName.BattlePanel, testFightData, BATTLE_TYPE.Test)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -556,6 +570,7 @@ end
|
|||
|
||||
function this.ShowGuide(id)
|
||||
this.id = id
|
||||
this.canvas.enabled = true
|
||||
this.gameObject:GetComponent("Image").raycastTarget = true
|
||||
if GuideConfig[id].Position then
|
||||
this.dialogRoot:SetActive(true)
|
||||
|
|
@ -605,6 +620,7 @@ function this.NextGuide(nextId)
|
|||
end
|
||||
GuideManager.SyncServer(curId)
|
||||
local next = type(nextId) == "number" and nextId or GuideConfig[curId].Next
|
||||
GuideManager.curId = next
|
||||
Log("下一个引导Id = ".. tostring(next))
|
||||
if next ~= 0 and GuideConfig[next].OpenType == 0 then --触发方式为0时,直接跳转
|
||||
GuideManager.ShowGuide(next)
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook)
|
|||
heroData.talismanList = _msgHeroData.especialEquipLevel --法宝等级
|
||||
heroData.sealIdList = _msgHeroData.sealIdList --紫府神印list
|
||||
|
||||
heroData.soulPrintList = this.SetSoulPrint(_msgHeroData.soulPos)
|
||||
heroData.soulPrintList = this.SetSoulPrint(_msgHeroData.soulPos,heroData.dynamicId)
|
||||
heroData.skillIdList = {}
|
||||
--主动技
|
||||
this.UpdateSkillIdList(heroData)
|
||||
|
|
@ -264,8 +264,7 @@ end
|
|||
|
||||
function this.SetSoulPrint(soulPos,did)
|
||||
local soulPrintList = {}
|
||||
if (#soulPos >= 1) then
|
||||
local soulPrintList = {}
|
||||
if (#soulPos > 0) then
|
||||
for i, v in ipairs(soulPos) do
|
||||
local soulPrint = {equipId = v.equipId, position = v.position}
|
||||
SoulPrintManager.AddSoulPrintUpHeroDynamicId(v.equipId, did)
|
||||
|
|
|
|||
|
|
@ -1191,6 +1191,14 @@ function this:OnShow()
|
|||
addUpDateNum = addUpDateNum + 1
|
||||
end
|
||||
YuJianXingManager.MakeRequest()
|
||||
|
||||
-- Timer.New(function()
|
||||
-- if DynamicActivityManager.isopenJingjishilian and ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.jingjishilian) and ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.jingjishilian)> 0 then
|
||||
-- UIManager.OpenPanel(UIName.JingjishiLianPatface)
|
||||
-- DynamicActivityManager.isopenJingjishilian = false
|
||||
-- end
|
||||
-- end,0.5):Start()
|
||||
|
||||
end
|
||||
|
||||
--
|
||||
|
|
@ -1367,6 +1375,15 @@ function this.TimeFormat()
|
|||
else
|
||||
showTab = false
|
||||
end
|
||||
elseif v.ActId == 668 then
|
||||
local actInfo = ActivityGiftManager.GetActivityInfoByType(v.ActiveType)
|
||||
if actInfo and actInfo.value > 0 and (OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328)) then
|
||||
showTab = true
|
||||
-- elseif OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) then
|
||||
-- showTab = true
|
||||
else
|
||||
showTab = false
|
||||
end
|
||||
elseif v.ShowTime == 1 and activityTabs[k].go.gameObject.activeSelf then
|
||||
if v.ActiveType > 0 then
|
||||
local QingLong = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType)
|
||||
|
|
@ -1528,10 +1545,10 @@ function this.RefreshGiftBtnShow()
|
|||
if v.ActiveType == 78 and ishow then
|
||||
local showTab = activityTabs[k].go.gameObject.activeSelf
|
||||
local actInfo = ActivityGiftManager.GetActivityInfoByType(v.ActiveType)
|
||||
if actInfo and actInfo.value > 0 then
|
||||
showTab = true
|
||||
elseif OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) then
|
||||
showTab = true
|
||||
if actInfo and actInfo.value > 0 and (OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328)) then
|
||||
showTab = true
|
||||
-- elseif OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) then
|
||||
-- showTab = true
|
||||
else
|
||||
showTab = false
|
||||
end
|
||||
|
|
@ -1564,12 +1581,12 @@ function this.RefreshActivityBtn(context)
|
|||
showTab = context.status == 1
|
||||
elseif v.ActiveType == 78 then
|
||||
local actInfo = ActivityGiftManager.GetActivityInfoByType(v.ActiveType)
|
||||
if actInfo and actInfo.value > 0 then
|
||||
showTab = true
|
||||
elseif OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) then
|
||||
showTab = true
|
||||
if actInfo and actInfo.value > 0 and (OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328)) then
|
||||
showTab = true
|
||||
-- elseif OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) then
|
||||
-- showTab = true
|
||||
else
|
||||
showTab = false
|
||||
showTab = false
|
||||
end
|
||||
else
|
||||
showTab = context.status == 1
|
||||
|
|
|
|||
|
|
@ -84,10 +84,17 @@ local function _CompareCondition(type, condition, value)
|
|||
elseif type == 3 then -- vip等级解锁
|
||||
value = value or VipManager.GetVipLevel()
|
||||
return value >= condition
|
||||
elseif type == 4 then -- 特殊类型
|
||||
elseif type == 4 then -- 充值解锁(无论多少金额)
|
||||
return true
|
||||
elseif type == 5 then -- 特殊类型
|
||||
return true
|
||||
elseif type == 6 then -- 总好感度等级解锁
|
||||
local _, tlv, _ = LikabilityManager.GetTotalHeroLikeLv(-1)
|
||||
value = value or tlv
|
||||
return value >= condition
|
||||
elseif type == 7 then -- 充值金额解锁
|
||||
value = value or VipManager.GetChargedNum()
|
||||
return value >= condition
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ local idList = {
|
|||
JumpManager.GoJump(26082)
|
||||
end,btnTip = Language[10018],isGet = true},
|
||||
[3] = {id = 35, jumpevent = function()
|
||||
JumpManager.GoJump(36011)
|
||||
JumpManager.GoJump(36012)
|
||||
end,btnTip = Language[10101],isGet = true},
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -69,7 +69,14 @@ function EveryDayGiftNew:InitComponent()
|
|||
end
|
||||
|
||||
function EveryDayGiftNew:BindEvent()
|
||||
|
||||
Util.AddOnceClick(self.btn2,function ()
|
||||
for i = 1, #self.shopData do
|
||||
if self.shopData[i].data.boughtNum > 0 then
|
||||
PopupTipPanel.ShowTip("需要未购买每日礼包时才可使用!")
|
||||
return
|
||||
end
|
||||
end
|
||||
PayManager.Pay(onKeyPackId, function(id)
|
||||
FirstRechargeManager.RefreshAccumRechargeValue(onKeyPackId)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."czlb", 0)
|
||||
|
|
@ -152,12 +159,17 @@ function EveryDayGiftNew:SetGrowGift()
|
|||
--计算当前声望等级
|
||||
if DynamicActivityManager.curLevel == 0 then
|
||||
for i = 1, #growData do
|
||||
if rechargeNum <= growData[i].data.shopItemData.BuyRule[2] then
|
||||
DynamicActivityManager.curLevel = i
|
||||
if DynamicActivityManager.Index == 0 then
|
||||
DynamicActivityManager.Index = DynamicActivityManager.curLevel
|
||||
if rechargeNum < growData[i].data.shopItemData.BuyRule[2] then
|
||||
if rechargeNum ~= 0 then
|
||||
DynamicActivityManager.curLevel = i
|
||||
if DynamicActivityManager.Index == 0 then
|
||||
DynamicActivityManager.Index = DynamicActivityManager.curLevel
|
||||
end
|
||||
break
|
||||
else
|
||||
DynamicActivityManager.curLevel = 1
|
||||
DynamicActivityManager.Index = 1
|
||||
end
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -169,7 +181,7 @@ function EveryDayGiftNew:SetGrowGift()
|
|||
end
|
||||
end
|
||||
|
||||
-- Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index))
|
||||
Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index))
|
||||
--如果有当前声望数据,就显示,没有就显示上一档位
|
||||
local data = not not growData[DynamicActivityManager.Index] and growData[DynamicActivityManager.Index] or growData[DynamicActivityManager.Index-1]
|
||||
self:RefreshReward(data)
|
||||
|
|
@ -198,7 +210,7 @@ function EveryDayGiftNew:RefreshReward(Data)
|
|||
if DynamicActivityManager.Index < 2 then
|
||||
num = growData[2].data.shopItemData.BuyRule[2]
|
||||
elseif DynamicActivityManager.Index + 1 > #growData then
|
||||
text = #growData
|
||||
text = #growData-1
|
||||
num = growData[#growData].data.shopItemData.BuyRule[2]
|
||||
else
|
||||
text = DynamicActivityManager.Index-1
|
||||
|
|
@ -206,10 +218,10 @@ function EveryDayGiftNew:RefreshReward(Data)
|
|||
end
|
||||
if DynamicActivityManager.curLevel <= 2 then
|
||||
self.tip.text = string.format("再充值%s元升至名望1",growData[2].data.shopItemData.BuyRule[2] - rechargeNum)
|
||||
elseif DynamicActivityManager.curLevel + 1 > #growData then
|
||||
elseif DynamicActivityManager.curLevel >= #growData and rechargeNum >= growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] then
|
||||
self.tip.text = ""
|
||||
else
|
||||
self.tip.text = string.format("再充值%s元升至名望%s",growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] - rechargeNum,DynamicActivityManager.curLevel)
|
||||
self.tip.text = string.format("再充值%s元升至名望%s",growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] - rechargeNum,DynamicActivityManager.curLevel-1)
|
||||
end
|
||||
|
||||
local size = rechargeNum/num
|
||||
|
|
@ -258,7 +270,7 @@ function EveryDayGiftNew:RefreshReward(Data)
|
|||
NotEnoughPopup:Show(Data.data.costId)
|
||||
end
|
||||
else
|
||||
PopupTipPanel.ShowTip(Language[11701])
|
||||
PopupTipPanel.ShowTip(string.format("名望等级不足,请升至%s级后才可购买!",DynamicActivityManager.Index-1))
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
|
@ -381,13 +393,6 @@ end
|
|||
--刷新一键购买显示
|
||||
function EveryDayGiftNew:RefreshOneKeyShow()
|
||||
Util.SetGray(self.btn2,false)
|
||||
for i = 1, #self.shopData do
|
||||
if self.shopData[i].data.boughtNum > 0 then
|
||||
Util.SetGray(self.btn2,true)
|
||||
self.btn2:GetComponent("Button").interactable = false
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
local actData = ActivityGiftManager.GetActivityTypeInfo(89)
|
||||
if actData then
|
||||
|
|
@ -398,6 +403,12 @@ function EveryDayGiftNew:RefreshOneKeyShow()
|
|||
Util.SetGray(self.btn2,false)
|
||||
self.btn2:GetComponent("Button").interactable = true
|
||||
self.btn2Text.text = string.format("60元七天特惠")
|
||||
for i = 1, #self.shopData do
|
||||
if self.shopData[i].data.boughtNum > 0 then
|
||||
Util.SetGray(self.btn2,true)
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -76,12 +76,17 @@ function RechargeViewNew:SetGrowGift()
|
|||
--计算当前声望等级
|
||||
if DynamicActivityManager.curLevel == 0 then
|
||||
for i = 1, #growData do
|
||||
if rechargeNum <= growData[i].data.shopItemData.BuyRule[2] then
|
||||
DynamicActivityManager.curLevel = i
|
||||
if DynamicActivityManager.Index == 0 then
|
||||
DynamicActivityManager.Index = DynamicActivityManager.curLevel
|
||||
if rechargeNum < growData[i].data.shopItemData.BuyRule[2] then
|
||||
if rechargeNum ~= 0 then
|
||||
DynamicActivityManager.curLevel = i
|
||||
if DynamicActivityManager.Index == 0 then
|
||||
DynamicActivityManager.Index = DynamicActivityManager.curLevel
|
||||
end
|
||||
break
|
||||
else
|
||||
DynamicActivityManager.curLevel = 1
|
||||
DynamicActivityManager.Index = 1
|
||||
end
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -93,7 +98,7 @@ function RechargeViewNew:SetGrowGift()
|
|||
end
|
||||
end
|
||||
|
||||
-- Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index))
|
||||
Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index))
|
||||
--如果有当前声望数据,就显示,没有就显示上一档位
|
||||
local data = not not growData[DynamicActivityManager.Index] and growData[DynamicActivityManager.Index] or growData[DynamicActivityManager.Index-1]
|
||||
self:RefreshReward(data)
|
||||
|
|
@ -122,7 +127,7 @@ function RechargeViewNew:RefreshReward(Data)
|
|||
if DynamicActivityManager.Index < 2 then
|
||||
num = growData[2].data.shopItemData.BuyRule[2]
|
||||
elseif DynamicActivityManager.Index + 1 > #growData then
|
||||
text = #growData
|
||||
text = #growData-1
|
||||
num = growData[#growData].data.shopItemData.BuyRule[2]
|
||||
else
|
||||
text = DynamicActivityManager.Index-1
|
||||
|
|
@ -130,10 +135,10 @@ function RechargeViewNew:RefreshReward(Data)
|
|||
end
|
||||
if DynamicActivityManager.curLevel <= 2 then
|
||||
self.tip.text = string.format("再充值%s元升至名望1",growData[2].data.shopItemData.BuyRule[2] - rechargeNum)
|
||||
elseif DynamicActivityManager.curLevel + 1 > #growData then
|
||||
elseif DynamicActivityManager.curLevel + 1 >= #growData and rechargeNum >= growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] then
|
||||
self.tip.text = ""
|
||||
else
|
||||
self.tip.text = string.format("再充值%s元升至名望%s",growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] - rechargeNum,DynamicActivityManager.curLevel)
|
||||
self.tip.text = string.format("再充值%s元升至名望%s",growData[DynamicActivityManager.curLevel].data.shopItemData.BuyRule[2] - rechargeNum,DynamicActivityManager.curLevel-1)
|
||||
end
|
||||
|
||||
local size = rechargeNum/num
|
||||
|
|
@ -181,7 +186,7 @@ function RechargeViewNew:RefreshReward(Data)
|
|||
NotEnoughPopup:Show(Data.data.costId)
|
||||
end
|
||||
else
|
||||
PopupTipPanel.ShowTip(Language[11701])
|
||||
PopupTipPanel.ShowTip(string.format("名望等级不足,请升至%s级后才可购买!",DynamicActivityManager.Index-1))
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
|
|
|||
|
|
@ -307,8 +307,10 @@ function RecruitMainPanel:OnOpen(_index)
|
|||
self.CurRecruitId = TableRecruitType.Putong
|
||||
elseif GuideManager.IsInMainGuide() and GuideManager.GetCurId(1) == 1003 then
|
||||
self.CurRecruitId = TableRecruitType.Shenjiang
|
||||
elseif GuideManager.IsFunctionGuideExist() then
|
||||
elseif GuideManager.IsFunctionGuideExist() and GuideManager.curId == 101402 then
|
||||
self.CurRecruitId = TableRecruitType.Siyuanzhen
|
||||
elseif GuideManager.IsFunctionGuideExist() and GuideManager.curId == 103705 then
|
||||
self.CurRecruitId = TableRecruitType.Shenjiang
|
||||
else
|
||||
local data = RecruitManager.GetRecruitData()
|
||||
local isRed = 0
|
||||
|
|
|
|||
|
|
@ -352,7 +352,7 @@ function SingleRecruitPanel:UpdataPanelData(_heroData)
|
|||
this.UI_Effect_appear:SetActive(false)
|
||||
Sound_Recruit3 = SoundManager.PlaySound(SoundConfig.Sound_Recruit3)
|
||||
|
||||
if heroStaticData and testLiveGO then
|
||||
if heroStaticData and not IsNull(testLiveGO) then
|
||||
poolManager:UnLoadLive(GetResourcePath(heroStaticData.Live), testLiveGO)
|
||||
heroStaticData, testLiveGO = nil, nil
|
||||
end
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ function this:InitComponent()
|
|||
[PanelTypeView.MemberPanel] = {node = self.BtnChengYuan, funcId = {23}, rpType = RedPointType.Role, clickFunc = self.OpenChengYuan},
|
||||
[PanelTypeView.BagPanel] = {node = self.BtnCangKu, funcId = {23}, rpType = RedPointType.Bag, clickFunc = self.OpenCangKu},
|
||||
[PanelTypeView.JieLing] = {node = self.BtnJieLing, funcId = {}, rpType = RedPointType.SecretTer, clickFunc = self.OpenJieling},
|
||||
[PanelTypeView.Carbon] = {node = self.BtnCarbon, funcId = {17, 18, 30, 46, 67}, rpType = RedPointType.ExploreMain, clickFunc = self.OpenCarbon},
|
||||
[PanelTypeView.Carbon] = {node = self.BtnCarbon, funcId = {30, 44,46, 64,67,74,107}, rpType = RedPointType.ExploreMain, clickFunc = self.OpenCarbon},
|
||||
[PanelTypeView.GongHui] = {node = self.BtnGongHui, funcId = {4}, rpType = RedPointType.Guild, clickFunc = self.OpenGuild},
|
||||
-- [PanelTypeView.TeQuan] = {node = self.BtnTeQuan, funcId = {}, rpType = RedPointType.VipPrivilege, clickFunc = self.OpenVIP},
|
||||
[PanelTypeView.Practice] = {node = self.BtnPractice, funcId = {108}, rpType = RedPointType.Practice_main, clickFunc = self.OpenPractice},
|
||||
|
|
|
|||