Merge branch 'china/dev' into china/dev-c
commit
6b70f85740
|
|
@ -15,12 +15,14 @@ public class AutoPack : EditorWindow
|
|||
new string[]{ "灵动专服-正式", "Logo_gn_zf_release", "MHT_GN_ZF_RELEASE" , "china/zf_test"},
|
||||
new string[]{ "喜扑", "Logo_cn_xipu", "MHT_CN_XIPU", "china/zf_test"},
|
||||
new string[]{ "草花", "Logo_cn_caohua", "MHT_CN_MIDDLE_WARE" , "china/zf_test"},
|
||||
new string[]{ "Quick", "Logo_cn_quick", "MHT_CN_QUICK" , "china/local"},
|
||||
|
||||
// 灵动商务
|
||||
new string[]{ "灵动商务", "Logo_mht_sw", "MHT_GN_SW" , "china/mht_sw"},
|
||||
|
||||
|
||||
//先遣
|
||||
new string[]{ "先遣-测试", "LogoChinaXQCS", "MHT_GN_XQ_TEST", "china/test"},
|
||||
new string[]{ "先遣", "LogoChinaXQ", "MHT_GN_XQ", "china/test"},
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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: 4
|
||||
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: be60c9cab3a34bec96ba900d4dc4f470
|
||||
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: o9k4oaqyenwz7hin
|
||||
channel: "\u592A\u521D\u884Cquick"
|
||||
--- !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,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: fe663e112ad52f54aa79b14a2f7eb28c
|
||||
timeCreated: 1496386600
|
||||
licenseType: Pro
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 8.0 MiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 78146d0f3acbb8a4bb03edb82f7103c8
|
||||
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: -1
|
||||
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: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 100
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 12c071fcc561e2e4e9c27cc698ceca2b
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 5.2 MiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 991f9c9f706428f458fe1a0d7ecd44fd
|
||||
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: -1
|
||||
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: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 100
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5ba80d7b3b110014da6b2541a8aeeb4a
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 246 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ede61ad7530ff1e4ea4a1f78ae0540a9
|
||||
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: -1
|
||||
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: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 100
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 0a68df33e0b770c428513dc4207fd636
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 5.0 KiB |
|
|
@ -5050,7 +5050,7 @@ ParticleSystem:
|
|||
--- !u!199 &689865173
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -5817,7 +5817,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: 158, y: 0}
|
||||
m_AnchoredPosition: {x: 159, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 68.95}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1240811747
|
||||
|
|
@ -5855,7 +5855,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.909804, g: 0.70980394, b: 0.27450982, a: 1}
|
||||
m_Color: {r: 0.86274517, g: 0.6901961, b: 0.48235297, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
@ -6066,7 +6066,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: 300.5, y: 0}
|
||||
m_AnchoredPosition: {x: 301.5, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 68.95}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1596169479
|
||||
|
|
@ -11335,7 +11335,7 @@ ParticleSystem:
|
|||
--- !u!199 &53865032735354669
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -16186,7 +16186,7 @@ ParticleSystem:
|
|||
--- !u!199 &53865032903479894
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -20921,7 +20921,7 @@ ParticleSystem:
|
|||
--- !u!199 &53865033217178009
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -25534,7 +25534,7 @@ ParticleSystem:
|
|||
--- !u!199 &53865033315684810
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -31185,7 +31185,7 @@ ParticleSystem:
|
|||
--- !u!199 &4590674014730051834
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -36527,7 +36527,7 @@ ParticleSystem:
|
|||
--- !u!199 &345244862577150605
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -41439,7 +41439,7 @@ ParticleSystem:
|
|||
--- !u!199 &1269342248769744005
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -46308,7 +46308,7 @@ ParticleSystem:
|
|||
--- !u!199 &1269342248929065148
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -51705,7 +51705,7 @@ ParticleSystem:
|
|||
--- !u!199 &3340559361339608959
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -57868,7 +57868,7 @@ ParticleSystem:
|
|||
--- !u!199 &4461638917069206421
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -58748,7 +58748,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: 354, y: 0}
|
||||
m_AnchoredPosition: {x: 355, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 69.49}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2929175774323599367
|
||||
|
|
@ -65029,7 +65029,7 @@ ParticleSystem:
|
|||
--- !u!199 &8153914426121884216
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -70206,7 +70206,7 @@ ParticleSystem:
|
|||
--- !u!199 &4571234231691897658
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -76619,7 +76619,7 @@ ParticleSystem:
|
|||
--- !u!199 &6988990775388982249
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -82665,7 +82665,7 @@ ParticleSystem:
|
|||
--- !u!199 &1454073279585546898
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -87562,7 +87562,7 @@ ParticleSystem:
|
|||
--- !u!199 &6133679773105218358
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -92456,7 +92456,7 @@ ParticleSystem:
|
|||
--- !u!199 &6133679773792227019
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -97122,7 +97122,7 @@ ParticleSystem:
|
|||
--- !u!199 &6133679774607836274
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -104480,7 +104480,7 @@ ParticleSystem:
|
|||
--- !u!199 &4325216380872068964
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -110039,7 +110039,7 @@ ParticleSystem:
|
|||
--- !u!199 &5429492888628637653
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -114816,7 +114816,7 @@ ParticleSystem:
|
|||
--- !u!199 &8548423836369118796
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -119699,7 +119699,7 @@ ParticleSystem:
|
|||
--- !u!199 &8548423836683259267
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -124534,7 +124534,7 @@ ParticleSystem:
|
|||
--- !u!199 &8548423837075803679
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -129254,7 +129254,7 @@ ParticleSystem:
|
|||
--- !u!199 &8548423837924684024
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -91244,7 +91244,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.909804, g: 0.70980394, b: 0.27450982, a: 1}
|
||||
m_Color: {r: 0.8627451, g: 0.6901961, b: 0.48235294, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
|
|||
|
|
@ -6140,7 +6140,7 @@ ParticleSystem:
|
|||
--- !u!199 &199678057150230830
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -10790,7 +10790,7 @@ ParticleSystem:
|
|||
--- !u!199 &199183534652431558
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -16637,7 +16637,7 @@ ParticleSystem:
|
|||
--- !u!199 &6121824411910985413
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -21891,7 +21891,7 @@ ParticleSystem:
|
|||
--- !u!199 &1859792028664134497
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -26663,7 +26663,7 @@ ParticleSystem:
|
|||
--- !u!199 &5653487957444314079
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -31471,7 +31471,7 @@ ParticleSystem:
|
|||
--- !u!199 &5322675852388844486
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -36339,7 +36339,7 @@ ParticleSystem:
|
|||
--- !u!199 &1989098124910706582
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -42294,7 +42294,7 @@ ParticleSystem:
|
|||
--- !u!199 &8746374249705677081
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -47184,7 +47184,7 @@ ParticleSystem:
|
|||
--- !u!199 &8823971680245043867
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -52000,7 +52000,7 @@ ParticleSystem:
|
|||
--- !u!199 &8430471708784069297
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -57315,7 +57315,7 @@ ParticleSystem:
|
|||
--- !u!199 &7962120996366852011
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -62325,7 +62325,7 @@ ParticleSystem:
|
|||
--- !u!199 &2541572793355743759
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -69466,7 +69466,7 @@ ParticleSystem:
|
|||
--- !u!199 &1560116421555167131
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -74691,7 +74691,7 @@ ParticleSystem:
|
|||
--- !u!199 &6019895091589445860
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -79447,7 +79447,7 @@ ParticleSystem:
|
|||
--- !u!199 &6020120546775422180
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -84145,7 +84145,7 @@ ParticleSystem:
|
|||
--- !u!199 &6020477104265238278
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -88879,7 +88879,7 @@ ParticleSystem:
|
|||
--- !u!199 &6019664593993108532
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -93527,7 +93527,7 @@ ParticleSystem:
|
|||
--- !u!199 &6019812380086944594
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -98334,7 +98334,7 @@ ParticleSystem:
|
|||
--- !u!199 &6019339336154760656
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -104494,7 +104494,7 @@ ParticleSystem:
|
|||
--- !u!199 &4720626719302079074
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -109550,7 +109550,7 @@ ParticleSystem:
|
|||
--- !u!199 &5535316913343579795
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -111199,7 +111199,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 0.83137256, b: 0.64705884, a: 1}
|
||||
m_Color: {r: 0.8627451, g: 0.6901961, b: 0.48235294, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
@ -116436,7 +116436,7 @@ ParticleSystem:
|
|||
--- !u!199 &629998129000523010
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -36,6 +36,12 @@ function PackageManager.GetPackageID()
|
|||
return this.StreamConfig.PackID
|
||||
end
|
||||
end
|
||||
-- 获取子渠道包公告配置
|
||||
function PackageManager.GetSubNoticeID()
|
||||
if this.StreamConfig then
|
||||
return this.StreamConfig.SubNoticeID
|
||||
end
|
||||
end
|
||||
-- 获取包名
|
||||
function PackageManager.GetPackageName()
|
||||
return this.PackageName
|
||||
|
|
|
|||
|
|
@ -1200,16 +1200,16 @@ function this.CheckYunYouManRedPoint()
|
|||
if id and id > 0 then
|
||||
local str = PlayerPrefs.GetInt(PlayerManager.uid.."CommonActPage"..ActivityTypeDef.YunYouShangRen)
|
||||
if str == 1 then
|
||||
LogGreen("云游商人红点返回:false")
|
||||
-- LogGreen("云游商人红点返回:false")
|
||||
return false
|
||||
else
|
||||
LogGreen("云游商人红点返回:true")
|
||||
-- LogGreen("云游商人红点返回:true")
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
--超凡入圣红点检查
|
||||
function this.CheckRedPointChaofanRuSheng()
|
||||
if not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.ChaoFanRuSheng) then
|
||||
return false
|
||||
|
|
@ -1224,4 +1224,38 @@ function this.CheckRedPointChaofanRuSheng()
|
|||
end
|
||||
return false
|
||||
end
|
||||
|
||||
--右侧伸缩条大小检测
|
||||
function this.CheckRightUpArenaSize()
|
||||
local num = 0
|
||||
--首充检测
|
||||
local act1 = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FirstRecharge)
|
||||
if act1 then
|
||||
num = num + 1
|
||||
end
|
||||
--每日豪礼检测
|
||||
local act2 = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DailyRecharge)
|
||||
if act2 then
|
||||
num = num + 1
|
||||
end
|
||||
--限时折扣检测
|
||||
local actGroup = ConfigManager.GetConfig(ConfigName.ActivityGroups)
|
||||
local shopData = actGroup[13].ShopData
|
||||
local giftList = OperatingManager.GetInfoList(shopData)
|
||||
if #giftList > 0 then
|
||||
local time = giftList[1].endTime - GetTimeStamp()
|
||||
if time > 1 then
|
||||
num = num + 1
|
||||
end
|
||||
end
|
||||
local y = 0
|
||||
if num == 1 then
|
||||
y = 512
|
||||
elseif num == 2 then
|
||||
y = 663
|
||||
elseif num == 3 then
|
||||
y = 814
|
||||
end
|
||||
return y
|
||||
end
|
||||
return this
|
||||
|
|
@ -77,7 +77,9 @@ function XiangYaoDuoBao:BindEvent()
|
|||
self.btn:SetActive(false)
|
||||
coroutine.wait(2.5)
|
||||
RoleLiveGOGraphic.AnimationState:SetAnimation(0, "idle", true)
|
||||
self.btn:SetActive(true)
|
||||
if self.btn then
|
||||
self.btn:SetActive(true)
|
||||
end
|
||||
end)
|
||||
end)
|
||||
end
|
||||
|
|
@ -368,6 +370,7 @@ function XiangYaoDuoBao:OnDestroy()
|
|||
poolManager:UnLoadLive(bgName, Live)
|
||||
end
|
||||
Live = nil
|
||||
self.btn = nil
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
|
|
|
|||
|
|
@ -281,9 +281,9 @@ function this.ShowNotice()
|
|||
RequestPanel.Show(Language[11137])
|
||||
--LogError("LoginRoot_NoticeChannel=="..LoginRoot_NoticeChannel)
|
||||
-- 如果有渠道包配置的id则加上
|
||||
local packId = PackageManager.GetPackageID()
|
||||
if packId then
|
||||
LoginRoot_NoticeChannel = LoginRoot_NoticeChannel.. packId
|
||||
local subNoticeID = PackageManager.GetSubNoticeID()
|
||||
if subNoticeID then
|
||||
LoginRoot_NoticeChannel = LoginRoot_NoticeChannel.. subNoticeID
|
||||
end
|
||||
networkMgr:SendGetHttp(LoginRoot_Url .. "jl_loginserver/getNotice?timestamp="..timeStamp.."&sign=".. timeSign.."&packageName="..LoginRoot_NoticeChannel,function (str)
|
||||
UIManager.OpenPanel(UIName.NoticePopup,str)
|
||||
|
|
|
|||
|
|
@ -253,7 +253,7 @@ function this:InitComponent()
|
|||
this.RightUp2btn = Util.GetGameObject(this.RightUp2,"BG/Button")
|
||||
this.RightUp2btnImg = Util.GetGameObject(this.RightUp2,"BG/Button"):GetComponent("RectTransform")
|
||||
this.RightUp2rectSize = Util.GetGameObject(this.RightUp2,"Ract2D"):GetComponent("RectTransform")
|
||||
this.RightUp2gridSize = this.RightUp2Grid :GetComponent("RectTransform")
|
||||
this.RightUp2gridSize = this.RightUp2Grid:GetComponent("RectTransform")
|
||||
|
||||
this.jiantouObj=Util.GetGameObject(self.gameObject, "jiantouObj")
|
||||
end
|
||||
|
|
@ -729,7 +729,6 @@ end
|
|||
function this:OnOpen()
|
||||
activitys = DynamicActivityManager.GetActivityTableDataByPageInde(0)
|
||||
this.CreatActivity()
|
||||
|
||||
FixedUpdateBeat:Add(this.OnUpdate, self)--长按方法注册
|
||||
end
|
||||
|
||||
|
|
@ -804,15 +803,15 @@ end
|
|||
--设置右侧条
|
||||
function this.SetRightBarSize()
|
||||
this.RightUp2:SetActive(PlayerManager.level >= 5)
|
||||
|
||||
local str = PlayerPrefs.GetInt(PlayerManager.uid.."MainRightBarSetting")
|
||||
if not str or str == 0 then
|
||||
this.RightUp2bgSize.sizeDelta = Vector3.New(180,320,0)
|
||||
this.RightUp2rectSize.sizeDelta = Vector3.New(180,220,0)
|
||||
this.RightUp2btnImg.rotation = Quaternion.Euler(Vector3.New(0,0,-90))
|
||||
else
|
||||
this.RightUp2bgSize.sizeDelta = this.RightUp2gridSize.sizeDelta + Vector3.New(0,100,0)
|
||||
this.RightUp2rectSize.sizeDelta = this.RightUp2gridSize.sizeDelta
|
||||
local y = ActivityGiftManager.CheckRightUpArenaSize()
|
||||
this.RightUp2bgSize.sizeDelta =Vector3.New(180,y,0)
|
||||
this.RightUp2rectSize.sizeDelta = Vector3.New(180,y,0)
|
||||
this.RightUp2btnImg.rotation = Quaternion.Euler(Vector3.New(0,0,90))
|
||||
end
|
||||
Util.AddOnceClick(this.RightUp2btn.gameObject,function()
|
||||
|
|
|
|||
|
|
@ -208,7 +208,9 @@ function GrowthGiftPage:OnBtnInvestClicked()
|
|||
end
|
||||
function GrowthGiftPage:RequestBuy()
|
||||
local giftGoodsInfo = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, self.curGiftsId)
|
||||
PayManager.Pay(giftGoodsInfo.goodsId, function(id)
|
||||
PayManager.Pay(giftGoodsInfo.goodsId, function(id)
|
||||
-- 检测月卡激活是否需要拍脸
|
||||
OperatingManager.CheckMonthCardPatFace()
|
||||
self:RefreshStatus()
|
||||
end)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -230,7 +230,7 @@ function this.GetGrowthRedPointState()
|
|||
local hasGift = OperatingManager.HasGoodsByShowType(4)
|
||||
if not hasGift then return false end
|
||||
local giftGoodsInfo = OperatingManager.IsGrowthGiftGoodsAvailable(GoodsTypeDef.GrowthReward)
|
||||
if giftGoodsInfo then return false end
|
||||
if not giftGoodsInfo then return false end
|
||||
local openId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.GrowthReward)
|
||||
if openId then
|
||||
local actRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig)
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ end
|
|||
--绑定事件(用于子类重写)
|
||||
function UpStarPre:BindEvent()
|
||||
Util.AddOnceClick(self.btnBuy.gameObject, function()
|
||||
LogGreen("self.data.state:"..self.data.state)
|
||||
if self.data.state == 0 then
|
||||
PopupTipPanel.ShowTip("神将达指定星级后解锁")
|
||||
return
|
||||
|
|
@ -51,46 +50,6 @@ function UpStarPre:BindEvent()
|
|||
end)
|
||||
end
|
||||
|
||||
--购买点击事件
|
||||
function UpStarPre:BuyAction(costId, costNum, shopType, itemId)
|
||||
local haveNum = BagManager.GetItemCountById(costId)
|
||||
local costName = ConfigManager.GetConfigData(ConfigName.ItemConfig, costId).Name
|
||||
--Log("需要消耗的道具ID" .. costId)
|
||||
if haveNum < costNum then
|
||||
NotEnoughPopup:Show(costId)
|
||||
else
|
||||
local func = function(shopType, itemId)
|
||||
ShopManager.RequestBuyShopItem(shopType, itemId, 1, function()
|
||||
self.parent:RefreshData(nil,false,false)
|
||||
CheckRedPointStatus(RedPointType.DailyGift)
|
||||
CheckRedPointStatus(RedPointType.GrowthPackage)
|
||||
if shopType==20 and (itemId==1107 or itemId==1110 or itemId==1111 or itemId==1108 )then
|
||||
PlayerPrefs.SetString(PlayerManager.uid..PlayerManager.serverInfo.server_id.."supermeMan",666)
|
||||
end
|
||||
end)
|
||||
end
|
||||
local isPopUp = RedPointManager.PlayerPrefsGetStr(PlayerManager.uid .. shopType)
|
||||
local currentTime = os.date("%Y%m%d", PlayerManager.serverTime)
|
||||
if (isPopUp ~= currentTime and costNum ~= 0) then
|
||||
local str = string.format(Language[11360], costNum, costName)
|
||||
MsgPanel.ShowTwo(str, function()
|
||||
end, function(isShow)
|
||||
if (isShow) then
|
||||
local currentTime = os.date("%Y%m%d", PlayerManager.serverTime)
|
||||
RedPointManager.PlayerPrefsSetStr(PlayerManager.uid .. shopType, currentTime)
|
||||
end
|
||||
func(shopType, itemId)
|
||||
end,
|
||||
Language[10731],
|
||||
Language[10732],
|
||||
nil,
|
||||
true)
|
||||
else
|
||||
func(shopType, itemId)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
function UpStarPre:AddListener()
|
||||
end
|
||||
|
|
@ -180,7 +139,7 @@ function UpStarPre:SetBtn()
|
|||
|
||||
self.price.text = MoneyUtil.GetMoneyUnitNameWithMoney(self.data.giftConfig.Price)
|
||||
self.buyInfo.text = string.format("限购%s次",self.data.giftConfig.Limit)
|
||||
if self.data.giftData.buyTimes > 0 then
|
||||
if self.data.giftData and self.data.giftData.buyTimes > 0 then
|
||||
self.buyInfo.text = ""
|
||||
self.price.text = "已购买"
|
||||
self.btnBuy.enabled = false
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ function PlayerTitle:SetEffectScale(effectScale)
|
|||
-- 处理喜扑老包称号显示异常的问题,喜扑第一个版本的包在底层删除了缩放节点,这里要处理下针对此包不再进行缩放还原
|
||||
if AppConst.isSDK then
|
||||
local vc = AndroidDeviceInfo.Instance:GetVersionCode()
|
||||
if settingValue and vc == Androidtonumber(settingValue) then
|
||||
if settingValue and vc == tonumber(settingValue) then
|
||||
isScaleActive = false
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,129 +1,260 @@
|
|||
using System.Collections;
|
||||
using LitJson;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEditor;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using GameEditor.Core;
|
||||
using GameEditor.GameEditor.PlayerBuilder;
|
||||
using GameLogic;
|
||||
using System.Diagnostics;
|
||||
using ResUpdate;
|
||||
using System.Threading;
|
||||
using System.Text;
|
||||
using UnityEditor;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Networking;
|
||||
|
||||
namespace GameEditor.FrameTool {
|
||||
public class ConfigWindow : EditorWindow
|
||||
namespace GameEditor.FrameTool
|
||||
{
|
||||
public class ConfigWindowNew : EditorWindow
|
||||
{
|
||||
|
||||
string m_ExcelPath;
|
||||
private void OnEnable()
|
||||
{
|
||||
m_ExcelPath = EditorPrefs.GetString("m_ExcelPath");
|
||||
}
|
||||
|
||||
string tempConfigPath;
|
||||
string configPath;
|
||||
string previous;
|
||||
Dictionary<string, object> dic;
|
||||
Dictionary<string, object> curDic;
|
||||
bool isFinish;
|
||||
string addKey;
|
||||
string targetPath;
|
||||
// Add menu named "My Window" to the Window menu
|
||||
[MenuItem("Build/Config")]
|
||||
static void Init()
|
||||
{
|
||||
|
||||
// Get existing open window or if none, make a new one:
|
||||
ConfigWindow window = (ConfigWindow)EditorWindow.GetWindow(typeof(ConfigWindow));
|
||||
window.Show();
|
||||
ConfigWindowNew window = (ConfigWindowNew)EditorWindow.GetWindow(typeof(ConfigWindowNew));
|
||||
window.InitWindow();
|
||||
|
||||
}
|
||||
|
||||
void InitWindow()
|
||||
{
|
||||
InitSize();
|
||||
InitGames();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 初始化大小
|
||||
/// </summary>
|
||||
void InitSize()
|
||||
{
|
||||
minSize = new Vector2(300, 400);
|
||||
maxSize = new Vector2(300, 650);
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 初始化游戏
|
||||
/// </summary>
|
||||
void InitGames()
|
||||
{
|
||||
window.Show();
|
||||
}
|
||||
|
||||
void OnGUI()
|
||||
{
|
||||
|
||||
|
||||
EditorGUILayout.BeginVertical();
|
||||
EditorGUILayout.Space();
|
||||
EditorGUILayout.LabelField("Config文件路径:");
|
||||
if (GUILayout.Button("加载config模板", GUILayout.ExpandWidth(false)))
|
||||
{
|
||||
dic.Clear();
|
||||
tempConfigPath = EditorUtility.OpenFilePanel("Resource path", tempConfigPath,"*.*");
|
||||
EditorPrefs.SetString("IMPORTCCONFIG_SOURCESFOLDERPATH", tempConfigPath);
|
||||
StreamReader sr = File.OpenText(tempConfigPath);
|
||||
SetConfigData(sr.ReadToEnd());
|
||||
}
|
||||
if (GUILayout.Button("下载config模板", GUILayout.ExpandWidth(false)))
|
||||
{
|
||||
isFinish = false;
|
||||
dic.Clear();
|
||||
string path = "http://60.1.1.12/assetbundles/config.txt";
|
||||
EditorCoroutineRunner.StartEditorCoroutine(DownLoadTempComfig(path));
|
||||
}
|
||||
if (dic != null && dic.Count > 0)
|
||||
{
|
||||
RefreshWindowShow();
|
||||
}
|
||||
if (isFinish)
|
||||
{
|
||||
if (curDic != null && curDic.Count > 0)
|
||||
{
|
||||
RefreshWindowShow1();
|
||||
}
|
||||
}
|
||||
EditorGUILayout.BeginHorizontal();
|
||||
targetPath = GUILayout.TextArea(targetPath);
|
||||
if (GUILayout.Button("Brown", GUILayout.ExpandWidth(false)))
|
||||
{
|
||||
targetPath = EditorUtility.OpenFilePanel("Resource path", targetPath, "*.*");
|
||||
EditorPrefs.SetString("IMPORTCCONFIG_TARGETFOLDERPATH", targetPath);
|
||||
}
|
||||
if (GUILayout.Button("保存数据", GUILayout.ExpandWidth(false)))
|
||||
{
|
||||
JsonData jsonData = new JsonData();
|
||||
SetDicToJsonData(jsonData,dic);
|
||||
string json = JsonMapper.ToJson(jsonData);
|
||||
Debug.Log("jsonData:" + json);
|
||||
File.WriteAllText(targetPath, json, Encoding.UTF8);
|
||||
}
|
||||
EditorGUILayout.EndHorizontal();
|
||||
EditorGUILayout.EndVertical();
|
||||
}
|
||||
IEnumerator DownLoadTempComfig(string path)
|
||||
{
|
||||
UnityWebRequest request0 = UnityWebRequest.Get(path);
|
||||
request0.downloadHandler = new DownloadHandlerBuffer();
|
||||
yield return request0.SendWebRequest();
|
||||
while (!request0.isDone)
|
||||
{
|
||||
yield return 1;
|
||||
}
|
||||
if (request0.isNetworkError || request0.isHttpError)
|
||||
{
|
||||
Debug.Log(request0.error);
|
||||
}
|
||||
else
|
||||
{
|
||||
SetConfigData(request0.downloadHandler.text);
|
||||
}
|
||||
}
|
||||
|
||||
void InitWindow()
|
||||
{
|
||||
isFinish = true;
|
||||
addKey = "";
|
||||
dic = new Dictionary<string, object>();
|
||||
tempConfigPath = EditorPrefs.GetString("IMPORTCCONFIG_SOURCESFOLDERPATH");
|
||||
targetPath = EditorPrefs.GetString("IMPORTCCONFIG_TARGETFOLDERPATH");
|
||||
configPath = EditorPrefs.GetString("IMPORTCCONFIG_DATAFOLDERPATH");
|
||||
}
|
||||
|
||||
void SetJsonDataToDic(IDictionary data,Dictionary<string,object> dicc)
|
||||
{
|
||||
foreach (var item in data.Keys)
|
||||
{
|
||||
string key = item.ToString();
|
||||
//Debug.Log(string.Format("{0}", item));
|
||||
try
|
||||
{
|
||||
IDictionary localData = data[item] as IDictionary;
|
||||
if (!dicc.ContainsKey(key))
|
||||
{
|
||||
dicc.Add(key, new Dictionary<string, object>());
|
||||
}
|
||||
SetJsonDataToDic(localData, dicc[key] as Dictionary<string, object>);
|
||||
}
|
||||
catch
|
||||
{
|
||||
if (dicc.ContainsKey(key))
|
||||
{
|
||||
dicc.Remove(key);
|
||||
}
|
||||
dicc.Add(key, data[item]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void SetDicToJsonData(JsonData jsonData, Dictionary<string, object> dicc)
|
||||
{
|
||||
foreach (KeyValuePair<string, object> keyValue in dicc)
|
||||
{
|
||||
Debug.Log(string.Format("{0}", keyValue.Key));
|
||||
try
|
||||
{
|
||||
Dictionary<string, object> localData = keyValue.Value as Dictionary<string, object>;
|
||||
string key = keyValue.Key;
|
||||
jsonData[keyValue.Key] = new JsonData();
|
||||
SetDicToJsonData(jsonData[keyValue.Key], localData);
|
||||
}
|
||||
catch
|
||||
{
|
||||
Debug.Log(string.Format("{0}-{1}", keyValue.Key, keyValue.Value.ToString()));
|
||||
jsonData[keyValue.Key] = keyValue.Value.ToString();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void GetDicData(Dictionary<string, object> dicc)
|
||||
{
|
||||
foreach (KeyValuePair<string, object> keyValue in dicc)
|
||||
{
|
||||
Debug.Log(string.Format("{0}", keyValue.Key));
|
||||
try
|
||||
{
|
||||
Dictionary<string, object> localData = keyValue.Value as Dictionary<string, object>;
|
||||
GetDicData(localData);
|
||||
}
|
||||
catch
|
||||
{
|
||||
Debug.Log(string.Format("{0}-{1}", keyValue.Key, keyValue.Value.ToString()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void SetConfigData(string strinfo)
|
||||
{
|
||||
Debug.Log(strinfo);
|
||||
JsonData modeInfo = JsonMapper.ToObject(strinfo);
|
||||
IDictionary data = modeInfo;
|
||||
SetJsonDataToDic(data,dic);
|
||||
isFinish = true;
|
||||
//GetDicData(dic);
|
||||
}
|
||||
|
||||
void RefreshWindowShow()
|
||||
{
|
||||
EditorGUILayout.BeginVertical();
|
||||
|
||||
EditorGUILayout.BeginHorizontal();
|
||||
m_ExcelPath = EditorGUILayout.TextField("", m_ExcelPath);
|
||||
if (GUILayout.Button("加载", GUILayout.Width(60f)))
|
||||
GUILayout.Label("加载数据");
|
||||
configPath = GUILayout.TextArea(configPath);
|
||||
if (GUILayout.Button("Brown", GUILayout.ExpandWidth(false)))
|
||||
{
|
||||
configPath = EditorUtility.OpenFilePanel("Resource path", configPath, "*.*");
|
||||
EditorPrefs.SetString("IMPORTCCONFIG_DATAFOLDERPATH", configPath);
|
||||
StreamReader sr = File.OpenText(configPath);
|
||||
SetConfigData(sr.ReadToEnd());
|
||||
}
|
||||
if (GUILayout.Button("打开目录", GUILayout.Width(60f)))
|
||||
{
|
||||
OpenDirectory(m_ExcelPath);
|
||||
}
|
||||
EditorGUILayout.EndHorizontal();
|
||||
|
||||
|
||||
//if (excelArr != null && excelArr.Length > 0)
|
||||
//{
|
||||
// excelIndex = EditorGUILayout.Popup("选择excel文件:", excelIndex, excelArr);
|
||||
//}
|
||||
|
||||
}
|
||||
|
||||
static string shellPath;
|
||||
public static void OpenDirectory(string path)
|
||||
{
|
||||
if (string.IsNullOrEmpty(path)) return;
|
||||
|
||||
if (!Directory.Exists(path))
|
||||
EditorGUILayout.BeginHorizontal();
|
||||
foreach (string key in dic.Keys)
|
||||
{
|
||||
UnityEngine.Debug.LogError("No Directory: " + path);
|
||||
return;
|
||||
if (GUILayout.Button(key, GUILayout.ExpandWidth(false)))
|
||||
{
|
||||
curDic = dic[key] as Dictionary<string, object>;
|
||||
}
|
||||
}
|
||||
|
||||
//Application.dataPath 只能在主线程中获取
|
||||
int lastIndex = Application.dataPath.LastIndexOf("/");
|
||||
shellPath = Application.dataPath.Substring(0, lastIndex) + "/Shell/";
|
||||
|
||||
// 新开线程防止锁死
|
||||
Thread newThread = new Thread(new ParameterizedThreadStart(CmdOpenDirectory));
|
||||
newThread.Start(path);
|
||||
if (isFinish)
|
||||
{
|
||||
if (curDic != null && curDic.Count > 0)
|
||||
{
|
||||
addKey = GUILayout.TextField(addKey);
|
||||
if (GUILayout.Button("添加key", GUILayout.ExpandWidth(false)))
|
||||
{
|
||||
curDic.Add(addKey, new Dictionary<string, object>());
|
||||
}
|
||||
}
|
||||
}
|
||||
EditorGUILayout.EndHorizontal();
|
||||
EditorGUILayout.EndVertical();
|
||||
}
|
||||
private static void CmdOpenDirectory(object obj)
|
||||
{
|
||||
Process p = new Process();
|
||||
#if UNITY_EDITOR_WIN
|
||||
p.StartInfo.FileName = "cmd.exe";
|
||||
p.StartInfo.Arguments = "/c start " + obj.ToString();
|
||||
#elif UNITY_EDITOR_OSX
|
||||
p.StartInfo.FileName = "bash";
|
||||
string shPath = shellPath + "openDir.sh";
|
||||
p.StartInfo.Arguments = shPath + " " + obj.ToString();
|
||||
#endif
|
||||
//UnityEngine.Debug.Log(p.StartInfo.Arguments);
|
||||
p.StartInfo.UseShellExecute = false;
|
||||
p.StartInfo.RedirectStandardInput = true;
|
||||
p.StartInfo.RedirectStandardOutput = true;
|
||||
p.StartInfo.RedirectStandardError = true;
|
||||
p.StartInfo.CreateNoWindow = true;
|
||||
p.Start();
|
||||
|
||||
p.WaitForExit();
|
||||
p.Close();
|
||||
void RefreshWindowShow1()
|
||||
{
|
||||
EditorGUILayout.BeginVertical();
|
||||
|
||||
for (int i = 0; i < curDic.Count; i++)
|
||||
{
|
||||
EditorGUILayout.BeginHorizontal();
|
||||
GUILayout.Space(30);
|
||||
var item = curDic.ElementAt(i);
|
||||
var item1 = (curDic[item.Key] as Dictionary<string, object>);
|
||||
GUILayout.Label(item.Key);
|
||||
addKey = GUILayout.TextField(addKey);
|
||||
if (GUILayout.Button("添加key", GUILayout.ExpandWidth(false)))
|
||||
{
|
||||
item1.Add(addKey, "");
|
||||
}
|
||||
if (GUILayout.Button("删除", GUILayout.ExpandWidth(false)))
|
||||
{
|
||||
curDic.Remove(item.Key);
|
||||
}
|
||||
EditorGUILayout.EndHorizontal();
|
||||
|
||||
for (int j = 0; j < item1.Count; j++)
|
||||
{
|
||||
EditorGUILayout.BeginHorizontal();
|
||||
GUILayout.Space(60);
|
||||
var item2 = item1.ElementAt(j);
|
||||
GUILayout.Label(item2.Key);
|
||||
item1[item2.Key] = GUILayout.TextField(item1[item2.Key].ToString());
|
||||
if (GUILayout.Button("删除", GUILayout.ExpandWidth(false)))
|
||||
{
|
||||
item1.Remove(item2.Key);
|
||||
}
|
||||
EditorGUILayout.EndHorizontal();
|
||||
}
|
||||
}
|
||||
EditorGUILayout.EndVertical();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,126 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEditor;
|
||||
|
||||
namespace GameEditor.FrameTool
|
||||
{
|
||||
public class EditorCoroutine : IEnumerator
|
||||
{
|
||||
private Stack<IEnumerator> executionStack;
|
||||
|
||||
public EditorCoroutine(IEnumerator iterator)
|
||||
{
|
||||
this.executionStack = new Stack<IEnumerator>();
|
||||
this.executionStack.Push(iterator);
|
||||
}
|
||||
|
||||
public bool MoveNext()
|
||||
{
|
||||
IEnumerator i = this.executionStack.Peek();
|
||||
|
||||
if (i.MoveNext())
|
||||
{
|
||||
object result = i.Current;
|
||||
if (result != null && result is IEnumerator)
|
||||
{
|
||||
this.executionStack.Push((IEnumerator)result);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (this.executionStack.Count > 1)
|
||||
{
|
||||
this.executionStack.Pop();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public void Reset()
|
||||
{
|
||||
throw new System.NotSupportedException("This Operation Is Not Supported.");
|
||||
}
|
||||
|
||||
public object Current
|
||||
{
|
||||
get { return this.executionStack.Peek().Current; }
|
||||
}
|
||||
|
||||
public bool Find(IEnumerator iterator)
|
||||
{
|
||||
return this.executionStack.Contains(iterator);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
public static class EditorCoroutineRunner
|
||||
{
|
||||
private static List<EditorCoroutine> editorCoroutineList;
|
||||
private static List<IEnumerator> buffer;
|
||||
|
||||
public static IEnumerator StartEditorCoroutine(IEnumerator iterator)
|
||||
{
|
||||
if (editorCoroutineList == null)
|
||||
{
|
||||
editorCoroutineList = new List<EditorCoroutine>();
|
||||
}
|
||||
if (buffer == null)
|
||||
{
|
||||
buffer = new List<IEnumerator>();
|
||||
}
|
||||
if (editorCoroutineList.Count == 0)
|
||||
{
|
||||
EditorApplication.update += Update;
|
||||
}
|
||||
|
||||
buffer.Add(iterator);
|
||||
|
||||
return iterator;
|
||||
}
|
||||
|
||||
private static bool Find(IEnumerator iterator)
|
||||
{
|
||||
foreach (EditorCoroutine editorCoroutine in editorCoroutineList)
|
||||
{
|
||||
if (editorCoroutine.Find(iterator))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private static void Update()
|
||||
{
|
||||
editorCoroutineList.RemoveAll
|
||||
(
|
||||
coroutine => { return coroutine.MoveNext() == false; }
|
||||
);
|
||||
|
||||
|
||||
if (buffer.Count > 0)
|
||||
{
|
||||
foreach (IEnumerator iterator in buffer)
|
||||
{
|
||||
if (!Find(iterator))
|
||||
{
|
||||
editorCoroutineList.Add(new EditorCoroutine(iterator));
|
||||
}
|
||||
}
|
||||
|
||||
buffer.Clear();
|
||||
}
|
||||
|
||||
if (editorCoroutineList.Count == 0)
|
||||
{
|
||||
EditorApplication.update -= Update;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a901a51b0e61d1644aa7f3a58a8226da
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -380,7 +380,7 @@ namespace GameEditor.FrameTool
|
|||
static Dictionary<string, HotFixConfig> _HotFixConfigDic = new Dictionary<string, HotFixConfig>();
|
||||
static string benchName = "";
|
||||
public static string _HotFixProjectPath;
|
||||
static string _Password = "tcx123";
|
||||
static string _Password = "";
|
||||
static bool _IsUpdateCDN = false;
|
||||
static bool _IsGitPull = false;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue