Merge branch 'china/dev' into 0功能/好感度
# Conflicts: # Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.luadev_chengFeng
commit
a62e656d7b
Binary file not shown.
|
Before Width: | Height: | Size: 4.0 MiB After Width: | Height: | Size: 247 KiB |
|
|
@ -6,7 +6,7 @@ TextureImporter:
|
||||||
serializedVersion: 9
|
serializedVersion: 9
|
||||||
mipmaps:
|
mipmaps:
|
||||||
mipMapMode: 0
|
mipMapMode: 0
|
||||||
enableMipMap: 1
|
enableMipMap: 0
|
||||||
sRGBTexture: 1
|
sRGBTexture: 1
|
||||||
linearTexture: 0
|
linearTexture: 0
|
||||||
fadeOut: 0
|
fadeOut: 0
|
||||||
|
|
@ -31,7 +31,7 @@ TextureImporter:
|
||||||
maxTextureSize: 2048
|
maxTextureSize: 2048
|
||||||
textureSettings:
|
textureSettings:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
filterMode: -1
|
filterMode: 2
|
||||||
aniso: -1
|
aniso: -1
|
||||||
mipBias: -100
|
mipBias: -100
|
||||||
wrapU: 1
|
wrapU: 1
|
||||||
|
|
@ -49,7 +49,7 @@ TextureImporter:
|
||||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
alphaUsage: 1
|
alphaUsage: 1
|
||||||
alphaIsTransparency: 0
|
alphaIsTransparency: 1
|
||||||
spriteTessellationDetail: -1
|
spriteTessellationDetail: -1
|
||||||
textureType: 0
|
textureType: 0
|
||||||
textureShape: 1
|
textureShape: 1
|
||||||
|
|
@ -80,9 +80,51 @@ TextureImporter:
|
||||||
allowsAlphaSplitting: 0
|
allowsAlphaSplitting: 0
|
||||||
overridden: 0
|
overridden: 0
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
|
- 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: 55
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites:
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: 0714
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 2048
|
||||||
|
height: 1189
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: -1
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
|
|
|
||||||
|
|
@ -673,10 +673,13 @@ RectTransform:
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 100}
|
m_LocalPosition: {x: 0, y: 0, z: 100}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
|
- {fileID: 9213157735004145819}
|
||||||
|
- {fileID: 9116253799622680408}
|
||||||
- {fileID: 2703596499720766253}
|
- {fileID: 2703596499720766253}
|
||||||
- {fileID: 6867791576146055993}
|
- {fileID: 6867791576146055993}
|
||||||
- {fileID: 535106102971884104}
|
- {fileID: 535106102971884104}
|
||||||
- {fileID: 8418905276674744645}
|
- {fileID: 8418905276674744645}
|
||||||
|
- {fileID: 8897687230212040710}
|
||||||
- {fileID: 9187756740145594409}
|
- {fileID: 9187756740145594409}
|
||||||
m_Father: {fileID: 9069877756853441092}
|
m_Father: {fileID: 9069877756853441092}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 4
|
||||||
|
|
@ -1399,11 +1402,11 @@ RectTransform:
|
||||||
- {fileID: 6946039974967129058}
|
- {fileID: 6946039974967129058}
|
||||||
- {fileID: 2408581268303862332}
|
- {fileID: 2408581268303862332}
|
||||||
m_Father: {fileID: 7314005397260952399}
|
m_Father: {fileID: 7314005397260952399}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 4
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 348.7, y: -48.25}
|
m_AnchoredPosition: {x: 263.1, y: -48.25}
|
||||||
m_SizeDelta: {x: 70, y: 70}
|
m_SizeDelta: {x: 70, y: 70}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1094175050622003316
|
--- !u!222 &1094175050622003316
|
||||||
|
|
@ -3337,6 +3340,85 @@ Canvas:
|
||||||
m_SortingLayerID: 0
|
m_SortingLayerID: 0
|
||||||
m_SortingOrder: 0
|
m_SortingOrder: 0
|
||||||
m_TargetDisplay: 0
|
m_TargetDisplay: 0
|
||||||
|
--- !u!1 &1363825239516740849
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 8897687230212040710}
|
||||||
|
- component: {fileID: 3457153588315577125}
|
||||||
|
- component: {fileID: 83756667759806789}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Item5
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &8897687230212040710
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1363825239516740849}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: -200}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 7125336083616203922}
|
||||||
|
- {fileID: 5672529229672813806}
|
||||||
|
- {fileID: 3808929499083569121}
|
||||||
|
- {fileID: 4702144976160767787}
|
||||||
|
- {fileID: 3946148852711363548}
|
||||||
|
m_Father: {fileID: 7314005397260952399}
|
||||||
|
m_RootOrder: 6
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
|
m_AnchoredPosition: {x: 513.2, y: -48.25}
|
||||||
|
m_SizeDelta: {x: 70, y: 70}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &3457153588315577125
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1363825239516740849}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &83756667759806789
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1363825239516740849}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_Sprite: {fileID: 21300000, guid: 7efa6164f9401b541abdc2b3250f8b75, type: 3}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
--- !u!1 &1377174657496081364
|
--- !u!1 &1377174657496081364
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -4076,6 +4158,80 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 164.9, y: 215.4}
|
m_SizeDelta: {x: 164.9, y: 215.4}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!1 &1555971272466139851
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 3946148852711363548}
|
||||||
|
- component: {fileID: 9100992007161101778}
|
||||||
|
- component: {fileID: 4621653894427881873}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: yiLingQu
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 0
|
||||||
|
--- !u!224 &3946148852711363548
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1555971272466139851}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 8897687230212040710}
|
||||||
|
m_RootOrder: 4
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 1, y: 1}
|
||||||
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
m_AnchoredPosition: {x: -34.43, y: -40}
|
||||||
|
m_SizeDelta: {x: 190, y: 116}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &9100992007161101778
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1555971272466139851}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &4621653894427881873
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1555971272466139851}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 0
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_Sprite: {fileID: 21300000, guid: 9cb4aa53aa218974fa09913ff23f3fd5, type: 3}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
--- !u!1 &1575397090572456564
|
--- !u!1 &1575397090572456564
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -4134,7 +4290,7 @@ MonoBehaviour:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_Color: {r: 0, g: 0, b: 0, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_RaycastTarget: 0
|
m_RaycastTarget: 0
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
|
|
@ -4151,8 +4307,8 @@ MonoBehaviour:
|
||||||
m_Alignment: 4
|
m_Alignment: 4
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: 100
|
m_Text: 100
|
||||||
--- !u!1 &1592411414755474800
|
--- !u!1 &1592411414755474800
|
||||||
|
|
@ -5161,6 +5317,80 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!1 &1862798775891656551
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 9213157735004145819}
|
||||||
|
- component: {fileID: 5833209082560353151}
|
||||||
|
- component: {fileID: 6944391844265064278}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Image
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &9213157735004145819
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1862798775891656551}
|
||||||
|
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: 7314005397260952399}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: -118.6, y: -71.350006}
|
||||||
|
m_SizeDelta: {x: 1448.9, y: 46.2}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &5833209082560353151
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1862798775891656551}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &6944391844265064278
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1862798775891656551}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_Sprite: {fileID: 21300000, guid: 7f7ef0b74ef147c4e82b3f037352d751, type: 3}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
--- !u!1 &1873045748007000881
|
--- !u!1 &1873045748007000881
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -6062,7 +6292,6 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 785609513879069793}
|
- {fileID: 785609513879069793}
|
||||||
- {fileID: 9116253799622680408}
|
|
||||||
- {fileID: 8176710355221368703}
|
- {fileID: 8176710355221368703}
|
||||||
m_Father: {fileID: 9069877756853441092}
|
m_Father: {fileID: 9069877756853441092}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
|
|
@ -6109,6 +6338,81 @@ MonoBehaviour:
|
||||||
m_FillClockwise: 1
|
m_FillClockwise: 1
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!1 &2141652263591069636
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 4702144976160767787}
|
||||||
|
- component: {fileID: 214011911305054927}
|
||||||
|
- component: {fileID: 4971729933672302555}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Num
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &4702144976160767787
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2141652263591069636}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 2830679919303924558}
|
||||||
|
m_Father: {fileID: 8897687230212040710}
|
||||||
|
m_RootOrder: 3
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: 20, y: -20}
|
||||||
|
m_SizeDelta: {x: 40, y: 40}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &214011911305054927
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2141652263591069636}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &4971729933672302555
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2141652263591069636}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 0
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_Sprite: {fileID: 21300000, guid: 26cf5937463456649b3cb3cecadbf79e, type: 3}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
--- !u!1 &2147912371065236731
|
--- !u!1 &2147912371065236731
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -6522,6 +6826,143 @@ MonoBehaviour:
|
||||||
m_FillClockwise: 1
|
m_FillClockwise: 1
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!1 &2365973688173959876
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 7125336083616203922}
|
||||||
|
- component: {fileID: 1507481964228730687}
|
||||||
|
- component: {fileID: 8611042635365652689}
|
||||||
|
- component: {fileID: 1991164009004363249}
|
||||||
|
- component: {fileID: 2684659091499362129}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: BG
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &7125336083616203922
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2365973688173959876}
|
||||||
|
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: 8897687230212040710}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 80, y: 80}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &1507481964228730687
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2365973688173959876}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &8611042635365652689
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2365973688173959876}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_Sprite: {fileID: 21300000, guid: 70db171292de9c94d8ce491d40f2590b, type: 3}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!114 &1991164009004363249
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2365973688173959876}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Navigation:
|
||||||
|
m_Mode: 3
|
||||||
|
m_SelectOnUp: {fileID: 0}
|
||||||
|
m_SelectOnDown: {fileID: 0}
|
||||||
|
m_SelectOnLeft: {fileID: 0}
|
||||||
|
m_SelectOnRight: {fileID: 0}
|
||||||
|
m_Transition: 3
|
||||||
|
m_Colors:
|
||||||
|
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||||
|
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||||
|
m_ColorMultiplier: 1
|
||||||
|
m_FadeDuration: 0.1
|
||||||
|
m_SpriteState:
|
||||||
|
m_HighlightedSprite: {fileID: 0}
|
||||||
|
m_PressedSprite: {fileID: 0}
|
||||||
|
m_DisabledSprite: {fileID: 0}
|
||||||
|
m_AnimationTriggers:
|
||||||
|
m_NormalTrigger: Normal
|
||||||
|
m_HighlightedTrigger: Highlighted
|
||||||
|
m_PressedTrigger: Pressed
|
||||||
|
m_DisabledTrigger: Disabled
|
||||||
|
m_Interactable: 1
|
||||||
|
m_TargetGraphic: {fileID: 5747118711132359175}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
|
Culture=neutral, PublicKeyToken=null
|
||||||
|
--- !u!95 &2684659091499362129
|
||||||
|
Animator:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2365973688173959876}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_Avatar: {fileID: 0}
|
||||||
|
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||||
|
m_CullingMode: 0
|
||||||
|
m_UpdateMode: 0
|
||||||
|
m_ApplyRootMotion: 0
|
||||||
|
m_LinearVelocityBlending: 0
|
||||||
|
m_WarningMessage:
|
||||||
|
m_HasTransformHierarchy: 1
|
||||||
|
m_AllowConstantClipSamplingOptimization: 1
|
||||||
|
m_KeepAnimatorControllerStateOnDisable: 0
|
||||||
--- !u!1 &2369752748626615734
|
--- !u!1 &2369752748626615734
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -6781,11 +7222,11 @@ RectTransform:
|
||||||
- {fileID: 322471593265771002}
|
- {fileID: 322471593265771002}
|
||||||
- {fileID: 3276396561316616318}
|
- {fileID: 3276396561316616318}
|
||||||
m_Father: {fileID: 7314005397260952399}
|
m_Father: {fileID: 7314005397260952399}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 211.9, y: -48.25}
|
m_AnchoredPosition: {x: 152.4, y: -48.25}
|
||||||
m_SizeDelta: {x: 70, y: 70}
|
m_SizeDelta: {x: 70, y: 70}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3998893083954564390
|
--- !u!222 &3998893083954564390
|
||||||
|
|
@ -8750,7 +9191,7 @@ MonoBehaviour:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_Color: {r: 0, g: 0, b: 0, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_RaycastTarget: 0
|
m_RaycastTarget: 0
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
|
|
@ -8767,8 +9208,8 @@ MonoBehaviour:
|
||||||
m_Alignment: 4
|
m_Alignment: 4
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: 100
|
m_Text: 100
|
||||||
--- !u!1 &3259419321350118019
|
--- !u!1 &3259419321350118019
|
||||||
|
|
@ -10958,7 +11399,7 @@ GameObject:
|
||||||
- component: {fileID: 7466180072303487813}
|
- component: {fileID: 7466180072303487813}
|
||||||
- component: {fileID: 6310679873838020870}
|
- component: {fileID: 6310679873838020870}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: Item5
|
m_Name: Item6
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
|
|
@ -10981,7 +11422,7 @@ RectTransform:
|
||||||
- {fileID: 4643541344365118740}
|
- {fileID: 4643541344365118740}
|
||||||
- {fileID: 1711949614215707712}
|
- {fileID: 1711949614215707712}
|
||||||
m_Father: {fileID: 7314005397260952399}
|
m_Father: {fileID: 7314005397260952399}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 7
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
|
|
@ -11198,7 +11639,7 @@ MonoBehaviour:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_Color: {r: 0, g: 0, b: 0, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_RaycastTarget: 0
|
m_RaycastTarget: 0
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
|
|
@ -11215,8 +11656,8 @@ MonoBehaviour:
|
||||||
m_Alignment: 4
|
m_Alignment: 4
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: 100
|
m_Text: 100
|
||||||
--- !u!1 &4191012829911007976
|
--- !u!1 &4191012829911007976
|
||||||
|
|
@ -13443,6 +13884,86 @@ MonoBehaviour:
|
||||||
m_FillClockwise: 1
|
m_FillClockwise: 1
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!1 &5123812507581552202
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 2830679919303924558}
|
||||||
|
- component: {fileID: 789326292571303750}
|
||||||
|
- component: {fileID: 2593717930613799149}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Text
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &2830679919303924558
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5123812507581552202}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1}
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 4702144976160767787}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &789326292571303750
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5123812507581552202}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &2593717930613799149
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5123812507581552202}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
|
m_FontSize: 30
|
||||||
|
m_FontStyle: 0
|
||||||
|
m_BestFit: 0
|
||||||
|
m_MinSize: 0
|
||||||
|
m_MaxSize: 40
|
||||||
|
m_Alignment: 4
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 1
|
||||||
|
m_VerticalOverflow: 1
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text: 1
|
||||||
|
LanguageIndex: 0
|
||||||
--- !u!1 &5178443401299748396
|
--- !u!1 &5178443401299748396
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -13591,6 +14112,85 @@ MonoBehaviour:
|
||||||
m_FillClockwise: 1
|
m_FillClockwise: 1
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!1 &5239556463672363221
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 5672529229672813806}
|
||||||
|
- component: {fileID: 5568294327986600685}
|
||||||
|
- component: {fileID: 8699847559907665630}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Value
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &5672529229672813806
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5239556463672363221}
|
||||||
|
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: 8897687230212040710}
|
||||||
|
m_RootOrder: 1
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
m_AnchoredPosition: {x: 0, y: -72.999985}
|
||||||
|
m_SizeDelta: {x: 0, y: -5.96}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &5568294327986600685
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5239556463672363221}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &8699847559907665630
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5239556463672363221}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 0
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_FontData:
|
||||||
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
|
m_FontSize: 30
|
||||||
|
m_FontStyle: 0
|
||||||
|
m_BestFit: 0
|
||||||
|
m_MinSize: 3
|
||||||
|
m_MaxSize: 40
|
||||||
|
m_Alignment: 4
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 1
|
||||||
|
m_VerticalOverflow: 1
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text: 100
|
||||||
--- !u!1 &5292185084997226513
|
--- !u!1 &5292185084997226513
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -14283,11 +14883,11 @@ RectTransform:
|
||||||
- {fileID: 2445718243079068566}
|
- {fileID: 2445718243079068566}
|
||||||
- {fileID: 5468297957613121618}
|
- {fileID: 5468297957613121618}
|
||||||
m_Father: {fileID: 7314005397260952399}
|
m_Father: {fileID: 7314005397260952399}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 5
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 486.3, y: -48.25}
|
m_AnchoredPosition: {x: 380.2, y: -48.25}
|
||||||
m_SizeDelta: {x: 70, y: 70}
|
m_SizeDelta: {x: 70, y: 70}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1971624645931632882
|
--- !u!222 &1971624645931632882
|
||||||
|
|
@ -16139,11 +16739,11 @@ RectTransform:
|
||||||
- {fileID: 2815350693209256519}
|
- {fileID: 2815350693209256519}
|
||||||
- {fileID: 5646022398931614192}
|
- {fileID: 5646022398931614192}
|
||||||
m_Father: {fileID: 7314005397260952399}
|
m_Father: {fileID: 7314005397260952399}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 74.3, y: -48.25}
|
m_AnchoredPosition: {x: 53.8, y: -48.25}
|
||||||
m_SizeDelta: {x: 70, y: 70}
|
m_SizeDelta: {x: 70, y: 70}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3084928154104648526
|
--- !u!222 &3084928154104648526
|
||||||
|
|
@ -17186,7 +17786,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 490947241662890785}
|
m_Father: {fileID: 490947241662890785}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
|
@ -18408,7 +19008,7 @@ MonoBehaviour:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_Color: {r: 0, g: 0, b: 0, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_RaycastTarget: 0
|
m_RaycastTarget: 0
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
|
|
@ -18425,8 +19025,8 @@ MonoBehaviour:
|
||||||
m_Alignment: 4
|
m_Alignment: 4
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: 100
|
m_Text: 100
|
||||||
--- !u!1 &7486134157078696524
|
--- !u!1 &7486134157078696524
|
||||||
|
|
@ -18731,6 +19331,80 @@ MonoBehaviour:
|
||||||
m_FillClockwise: 1
|
m_FillClockwise: 1
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!1 &7608371885141799910
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 3808929499083569121}
|
||||||
|
- component: {fileID: 4342481466955132558}
|
||||||
|
- component: {fileID: 6184253827783645619}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: redPoint
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 0
|
||||||
|
--- !u!224 &3808929499083569121
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7608371885141799910}
|
||||||
|
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: 8897687230212040710}
|
||||||
|
m_RootOrder: 2
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 1, y: 1}
|
||||||
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
m_AnchoredPosition: {x: -10, y: -10}
|
||||||
|
m_SizeDelta: {x: 26, y: 26}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &4342481466955132558
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7608371885141799910}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &6184253827783645619
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7608371885141799910}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 0
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
--- !u!1 &7615282104518691456
|
--- !u!1 &7615282104518691456
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -18945,16 +19619,16 @@ RectTransform:
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 7695585487591950889}
|
m_GameObject: {fileID: 7695585487591950889}
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 490947241662890785}
|
m_Father: {fileID: 7314005397260952399}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 32.41, y: -74}
|
m_AnchoredPosition: {x: -386.67996, y: -73.14994}
|
||||||
m_SizeDelta: {x: 118.09, y: 41.56}
|
m_SizeDelta: {x: 118.09, y: 41.56}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1601100138612422470
|
--- !u!222 &1601100138612422470
|
||||||
|
|
@ -18978,7 +19652,7 @@ MonoBehaviour:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_Color: {r: 0, g: 0, b: 0, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_RaycastTarget: 1
|
m_RaycastTarget: 1
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
|
|
@ -18998,7 +19672,7 @@ MonoBehaviour:
|
||||||
m_HorizontalOverflow: 1
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 1
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u5916\u5708\u91CD\u7F6E\u6B21\u6570"
|
m_Text: "\u62BD\u53D6\u6B21\u6570"
|
||||||
LanguageIndex: 0
|
LanguageIndex: 0
|
||||||
--- !u!1 &7717770047067538035
|
--- !u!1 &7717770047067538035
|
||||||
GameObject:
|
GameObject:
|
||||||
|
|
@ -19662,7 +20336,7 @@ MonoBehaviour:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_Color: {r: 0, g: 0, b: 0, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_RaycastTarget: 0
|
m_RaycastTarget: 0
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
|
|
@ -19679,8 +20353,8 @@ MonoBehaviour:
|
||||||
m_Alignment: 4
|
m_Alignment: 4
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: 100
|
m_Text: 100
|
||||||
--- !u!1 &8053234215049060840
|
--- !u!1 &8053234215049060840
|
||||||
|
|
|
||||||
|
|
@ -111,15 +111,15 @@ function this.GetHeroPower(dId, formationId, NoFuncProp)
|
||||||
local allPower = this.CalPower(heroData, propList)
|
local allPower = this.CalPower(heroData, propList)
|
||||||
-- 旧战斗力
|
-- 旧战斗力
|
||||||
if HeroPropManager.IsDebug() and not NoFuncProp then
|
if HeroPropManager.IsDebug() and not NoFuncProp then
|
||||||
local curHeroData = HeroManager.GetSingleHeroData(dId)
|
-- local curHeroData = HeroManager.GetSingleHeroData(dId)
|
||||||
local oldProp = HeroManager.CalculateHeroAllProValList(1, dId, false, nil, nil, nil, nil,nil, formationId)
|
-- local oldProp = HeroManager.CalculateHeroAllProValList(1, dId, false, nil, nil, nil, nil,nil, formationId)
|
||||||
local power = oldProp[HeroProType.WarPower]
|
-- local power = oldProp[HeroProType.WarPower]
|
||||||
if power ~= allPower then
|
-- if power ~= allPower then
|
||||||
LogGreenTable(REMOVE_ZERO_PROP(oldProp))
|
-- LogGreenTable(REMOVE_ZERO_PROP(oldProp))
|
||||||
LogRed("GetHeroPower OldPower:"..tostring(power))
|
-- LogRed("GetHeroPower OldPower:"..tostring(power))
|
||||||
LogGreenTable(REMOVE_ZERO_PROP(propList))
|
LogGreenTable(REMOVE_ZERO_PROP(propList))
|
||||||
LogRed("GetHeroPower NewPower:"..allPower)
|
LogRed("GetHeroPower NewPower:"..allPower)
|
||||||
end
|
-- end
|
||||||
end
|
end
|
||||||
LogYellow_Prop("++++++++++++++++++++++++++++++++++")
|
LogYellow_Prop("++++++++++++++++++++++++++++++++++")
|
||||||
if formationId then
|
if formationId then
|
||||||
|
|
|
||||||
|
|
@ -464,7 +464,7 @@ function this.GetFriendHelpHeros(trailType,func)
|
||||||
tempdata.player = v
|
tempdata.player = v
|
||||||
tempdata.hero = this.UpdateHeroDatas(v.hero,v)
|
tempdata.hero = this.UpdateHeroDatas(v.hero,v)
|
||||||
table.insert(this.friendHelpHeros[v.trailType],tempdata)
|
table.insert(this.friendHelpHeros[v.trailType],tempdata)
|
||||||
local power = HeroPowerManager.GetHeroPower(tempdata.hero)
|
local power = HeroPowerManager.GetHeroPower(tempdata.hero.dynamicId)
|
||||||
-- local allAddProVal = HeroManager.CalculateHeroAllProValList(1, tempdata.hero, false)
|
-- local allAddProVal = HeroManager.CalculateHeroAllProValList(1, tempdata.hero, false)
|
||||||
tempdata.hero.warPower = power--allAddProVal[HeroProType.WarPower]
|
tempdata.hero.warPower = power--allAddProVal[HeroProType.WarPower]
|
||||||
end
|
end
|
||||||
|
|
@ -558,7 +558,7 @@ function this.SetFriendHelpHero(helpFightList,trailType)
|
||||||
this.friendHelpHero[trailType].player = helpFightList
|
this.friendHelpHero[trailType].player = helpFightList
|
||||||
this.friendHelpHero[trailType].hero = this.UpdateHeroDatas(helpFightList.hero,helpFightList)
|
this.friendHelpHero[trailType].hero = this.UpdateHeroDatas(helpFightList.hero,helpFightList)
|
||||||
-- local allAddProVal = HeroManager.CalculateHeroAllProValList(1, this.friendHelpHero[trailType].hero, false)
|
-- local allAddProVal = HeroManager.CalculateHeroAllProValList(1, this.friendHelpHero[trailType].hero, false)
|
||||||
local power = HeroPowerManager.GetHeroPower(helpFightList.hero.dynamicId)
|
local power = HeroPowerManager.GetHeroPower(helpFightList.hero.id)
|
||||||
this.friendHelpHero[trailType].hero.warPower = power -- allAddProVal[HeroProType.WarPower]
|
this.friendHelpHero[trailType].hero.warPower = power -- allAddProVal[HeroProType.WarPower]
|
||||||
else
|
else
|
||||||
this.friendHelpHero[trailType] = nil
|
this.friendHelpHero[trailType] = nil
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,7 @@ function this.ShowBattleResultByMapFight()
|
||||||
if m_battlePanel then
|
if m_battlePanel then
|
||||||
m_battlePanel:ClosePanel()
|
m_battlePanel:ClosePanel()
|
||||||
end
|
end
|
||||||
self:ClosePanel()
|
this:ClosePanel()
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold)
|
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold)
|
||||||
end, 0, true, true)
|
end, 0, true, true)
|
||||||
end)
|
end)
|
||||||
|
|
|
||||||
|
|
@ -160,15 +160,15 @@ function GeneralPopup:OnShow()
|
||||||
end
|
end
|
||||||
|
|
||||||
function GeneralPopup:OnClose()
|
function GeneralPopup:OnClose()
|
||||||
for i = 1, #contentScripts do
|
for key, value in pairs(contentScripts) do
|
||||||
contentScripts[i].view:OnClose()
|
value.view:OnClose()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function GeneralPopup:OnDestroy()
|
function GeneralPopup:OnDestroy()
|
||||||
this.spLoader:Destroy()
|
this.spLoader:Destroy()
|
||||||
for i = 1, #contentScripts do
|
for key, value in pairs(contentScripts) do
|
||||||
contentScripts[i].view:OnDestroy()
|
value.view:OnDestroy()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -490,6 +490,9 @@ end
|
||||||
function this.HeroCalculateFourQuaWarForce(_professionId)
|
function this.HeroCalculateFourQuaWarForce(_professionId)
|
||||||
local addAllProVal={}
|
local addAllProVal={}
|
||||||
local professionInfo=this.FourQuadrantData[_professionId]
|
local professionInfo=this.FourQuadrantData[_professionId]
|
||||||
|
if not professionInfo then
|
||||||
|
return addAllProVal
|
||||||
|
end
|
||||||
if professionInfo.propertyList then
|
if professionInfo.propertyList then
|
||||||
---计算强化属性
|
---计算强化属性
|
||||||
for i = 1, #professionInfo.propertyList do
|
for i = 1, #professionInfo.propertyList do
|
||||||
|
|
|
||||||
|
|
@ -97,7 +97,7 @@ function this.RefreshShow(data)
|
||||||
if data[config.MapID]~=nil then
|
if data[config.MapID]~=nil then
|
||||||
_progress=data[config.MapID].process
|
_progress=data[config.MapID].process
|
||||||
if data[config.MapID].first==1 then
|
if data[config.MapID].first==1 then
|
||||||
showReward = ConfigManager.GetConfigData(ConfigName.RewardGroup,config.FinalReward).ShowItem
|
showReward = ConfigManager.GetConfigData(ConfigName.RewardGroup,config.FinalReward[1]).ShowItem
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -95,7 +95,6 @@ function this.QiMenDunJiaDrawRequest(id,num,func)
|
||||||
-- for i = 1,#msg.idList do
|
-- for i = 1,#msg.idList do
|
||||||
-- LogGreen("msg.idList:"..msg.idList[i])
|
-- LogGreen("msg.idList:"..msg.idList[i])
|
||||||
-- end
|
-- end
|
||||||
this.SetDataListState(msg.idList)
|
|
||||||
if func then
|
if func then
|
||||||
func(msg.idList,msg.drop)
|
func(msg.idList,msg.drop)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -24,11 +24,12 @@ local actconfigs
|
||||||
local itemWidth,interval = 0,0
|
local itemWidth,interval = 0,0
|
||||||
|
|
||||||
local position = {
|
local position = {
|
||||||
[1] = 74.3,
|
[1] = 53.8,
|
||||||
[2] = 211.9,
|
[2] = 152.4,
|
||||||
[3] = 348.7,
|
[3] = 263.1,
|
||||||
[4] = 486.3,
|
[4] = 380.2,
|
||||||
[5] = 654.25,
|
[5] = 513.2,
|
||||||
|
[6] = 654.25,
|
||||||
}
|
}
|
||||||
---初始化组件(用于子类重写)
|
---初始化组件(用于子类重写)
|
||||||
function LingLongBaoJingPanel:InitComponent(gameObject)
|
function LingLongBaoJingPanel:InitComponent(gameObject)
|
||||||
|
|
@ -101,7 +102,7 @@ function LingLongBaoJingPanel:InitComponent(gameObject)
|
||||||
self.rewardBox=Util.GetGameObject(self.slider,"RewardBox")
|
self.rewardBox=Util.GetGameObject(self.slider,"RewardBox")
|
||||||
self.itemRewardList = {}
|
self.itemRewardList = {}
|
||||||
local bg1 = Util.GetGameObject(self.slider, "BG")
|
local bg1 = Util.GetGameObject(self.slider, "BG")
|
||||||
for i=1,5 do
|
for i=1,6 do
|
||||||
if not self.itemRewardList[i] then
|
if not self.itemRewardList[i] then
|
||||||
self.itemRewardList[i] = SubUIManager.Open(SubUIConfig.ItemView,bg1.transform)
|
self.itemRewardList[i] = SubUIManager.Open(SubUIConfig.ItemView,bg1.transform)
|
||||||
end
|
end
|
||||||
|
|
@ -177,34 +178,34 @@ function LingLongBaoJingPanel:BindEvent()
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
drop = _drop
|
drop = _drop
|
||||||
|
local isGetBigReward = false
|
||||||
CheckRedPointStatus(RedPointType.linglongBaojing)
|
CheckRedPointStatus(RedPointType.linglongBaojing)
|
||||||
self:DelayMaskWithBool(true)
|
self:DelayMaskWithBool(true)
|
||||||
self.fx_linglongbaojing_kaiqi.gameObject:SetActive(true)
|
self.fx_linglongbaojing_kaiqi.gameObject:SetActive(true)
|
||||||
SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_kaiqi_002)
|
SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_kaiqi_002)
|
||||||
LingLongBaoJingManager.SetDataListState(idList)
|
for i = 1,#idList do
|
||||||
local isAllGet = false
|
local config = ConfigManager.GetConfigData(ConfigName.LingLongPool,idList[i])
|
||||||
if idList[2] and idList[2] > 0 then
|
if config.Position == 1 then
|
||||||
if LingLongBaoJingManager.IsAllGet() then
|
isGetBigReward = true
|
||||||
isAllGet = true
|
|
||||||
LingLongBaoJingManager.SetDataListState(nil,1)
|
|
||||||
end
|
end
|
||||||
LingLongBaoJingManager.SetDataListState(nil,2)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
local x = function(isGetBigReward)
|
local x = function()
|
||||||
local tempData = {}
|
local tempData = {}
|
||||||
for i = 1,#idList do
|
for i = 1,#idList do
|
||||||
table.insert(tempData,data[idList[i]])
|
table.insert(tempData,data[idList[i]])
|
||||||
end
|
end
|
||||||
self:RefreshTreasureTypeState(0,tempData)
|
|
||||||
if drop then
|
if drop then
|
||||||
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function()
|
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function()
|
||||||
drop = nil
|
drop = nil
|
||||||
if isGetBigReward then
|
NetManager.QiMenDunJiaHitListRequest(self.actId,function(msg)
|
||||||
if isAllGet then
|
LingLongBaoJingManager.SetDataListState(nil,1)
|
||||||
self:RefreshTreasureTypeState(1)
|
LingLongBaoJingManager.SetDataListState(nil,2)
|
||||||
end
|
LingLongBaoJingManager.SetDataListState(msg.hitList)
|
||||||
|
self:RefreshTreasureTypeState(1)
|
||||||
self:RefreshTreasureTypeState(2)
|
self:RefreshTreasureTypeState(2)
|
||||||
|
end)
|
||||||
|
if isGetBigReward then
|
||||||
if not isClose then
|
if not isClose then
|
||||||
self.itemList[1][data[idList[2]].address].selectKuang.gameObject:SetActive(false)
|
self.itemList[1][data[idList[2]].address].selectKuang.gameObject:SetActive(false)
|
||||||
self.itemList[2][data[idList[1]].address].selectKuang.gameObject:SetActive(false)
|
self.itemList[2][data[idList[1]].address].selectKuang.gameObject:SetActive(false)
|
||||||
|
|
@ -231,11 +232,11 @@ function LingLongBaoJingPanel:BindEvent()
|
||||||
end
|
end
|
||||||
curTurnPos = 1
|
curTurnPos = 1
|
||||||
if skip == 1 then
|
if skip == 1 then
|
||||||
x(idList[2] and idList[2] > 0)
|
x()
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
self:SetTableTurnEffect(TableTurnType.Expedite,2,data[idList[1]].address,function()
|
self:SetTableTurnEffect(TableTurnType.Expedite,2,data[idList[1]].address,function()
|
||||||
if idList[2] and idList[2] > 0 then
|
if isGetBigReward then
|
||||||
--PopupTipPanel.ShowTip("播放一些开门的特效")
|
--PopupTipPanel.ShowTip("播放一些开门的特效")
|
||||||
SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_longmengezi_004)
|
SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_longmengezi_004)
|
||||||
self.Btncoroutine = coroutine.start(function()
|
self.Btncoroutine = coroutine.start(function()
|
||||||
|
|
@ -260,12 +261,12 @@ function LingLongBaoJingPanel:BindEvent()
|
||||||
curTurnPos = 1
|
curTurnPos = 1
|
||||||
self:SetTableTurnEffect(TableTurnType.Expedite,1,data[idList[2]].address,function()
|
self:SetTableTurnEffect(TableTurnType.Expedite,1,data[idList[2]].address,function()
|
||||||
self:RefreshTreasureMaskByType(1,true)
|
self:RefreshTreasureMaskByType(1,true)
|
||||||
x(true)
|
x()
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
else
|
else
|
||||||
x(false)
|
x()
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
|
|
@ -566,13 +567,13 @@ function LingLongBaoJingPanel:RefreshLuckyValue()
|
||||||
end
|
end
|
||||||
table.sort(list,function(a,b) return a < b end)
|
table.sort(list,function(a,b) return a < b end)
|
||||||
--local pos = self:CalutePos2(self.rewardBox,list)
|
--local pos = self:CalutePos2(self.rewardBox,list)
|
||||||
for i = 1,5 do
|
for i = 1,#self.rewardBoxList do
|
||||||
local v3 = self.rewardBoxList[i].go:GetComponent("RectTransform").anchoredPosition3D
|
local v3 = self.rewardBoxList[i].go:GetComponent("RectTransform").anchoredPosition3D
|
||||||
v3.x = position[i]
|
v3.x = position[i]
|
||||||
self.rewardBoxList[i].go:GetComponent("RectTransform").anchoredPosition3D = v3
|
self.rewardBoxList[i].go:GetComponent("RectTransform").anchoredPosition3D = v3
|
||||||
self.rewardBoxList[i].value.text = configs[i].Values[1][1].."次"
|
self.rewardBoxList[i].value.text = configs[i].Values[1][1].."次"
|
||||||
self.rewardBoxList[i].redPoint.gameObject:SetActive(false)
|
self.rewardBoxList[i].redPoint.gameObject:SetActive(false)
|
||||||
if i < 5 then
|
if i < 6 then
|
||||||
self.rewardBoxList[i].Num.text = configs[i].Reward[1][2]
|
self.rewardBoxList[i].Num.text = configs[i].Reward[1][2]
|
||||||
self.rewardBoxList[i].icon.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(configs[i].Reward[1][1]))
|
self.rewardBoxList[i].icon.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(configs[i].Reward[1][1]))
|
||||||
end
|
end
|
||||||
|
|
@ -656,18 +657,20 @@ function LingLongBaoJingPanel:CalculateInterval(count)
|
||||||
configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",self.actId)
|
configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",self.actId)
|
||||||
end
|
end
|
||||||
local interval = 0
|
local interval = 0
|
||||||
if count >= configs[5].Values[1][1] then
|
if count >= configs[6].Values[1][1] then
|
||||||
interval = 1
|
interval = 1
|
||||||
|
elseif count >= configs[5].Values[1][1] then
|
||||||
|
interval = position[5]/position[#position] + ((count - configs[5].Values[1][1]) * (position[6] - position[5]) / (configs[6].Values[1][1] - configs[5].Values[1][1]))/position[#position]
|
||||||
elseif count >= configs[4].Values[1][1] then
|
elseif count >= configs[4].Values[1][1] then
|
||||||
interval = position[4]/position[5] + ((count - configs[4].Values[1][1]) * (position[5] - position[4]) / (configs[5].Values[1][1] - configs[4].Values[1][1]))/position[5]
|
interval = position[4]/position[#position] + ((count - configs[4].Values[1][1]) * (position[5] - position[4]) / (configs[5].Values[1][1] - configs[4].Values[1][1]))/position[#position]
|
||||||
elseif count >= configs[3].Values[1][1] then
|
elseif count >= configs[3].Values[1][1] then
|
||||||
interval = position[3]/position[5] + ((count - configs[3].Values[1][1]) * (position[5] - position[4]) / (configs[4].Values[1][1] - configs[3].Values[1][1]))/position[5]
|
interval = position[3]/position[#position] + ((count - configs[3].Values[1][1]) * (position[4] - position[3]) / (configs[4].Values[1][1] - configs[3].Values[1][1]))/position[#position]
|
||||||
elseif count >= configs[2].Values[1][1] then
|
elseif count >= configs[2].Values[1][1] then
|
||||||
interval = position[2]/position[5] + ((count - configs[2].Values[1][1]) * (position[5] - position[4]) / (configs[3].Values[1][1] - configs[2].Values[1][1]))/position[5]
|
interval = position[2]/position[#position] + ((count - configs[2].Values[1][1]) * (position[3] - position[2]) / (configs[3].Values[1][1] - configs[2].Values[1][1]))/position[#position]
|
||||||
elseif count >= configs[1].Values[1][1] then
|
elseif count >= configs[1].Values[1][1] then
|
||||||
interval = position[1]/position[5] + ((count - configs[1].Values[1][1]) * (position[5] - position[4]) / (configs[2].Values[1][1] - configs[1].Values[1][1]))/position[5]
|
interval = position[1]/position[#position] + ((count - configs[1].Values[1][1]) * (position[2] - position[1]) / (configs[2].Values[1][1] - configs[1].Values[1][1]))/position[#position]
|
||||||
else
|
else
|
||||||
interval = count / configs[1].Values[1][1]
|
interval = 0 + ((count ) * (position[1] - 0) / (configs[1].Values[1][1] - 0))/position[#position]
|
||||||
end
|
end
|
||||||
return interval
|
return interval
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -343,6 +343,251 @@ namespace LJ_OptTools
|
||||||
GameEditor.CustomImportSettings.enabled = false;
|
GameEditor.CustomImportSettings.enabled = false;
|
||||||
EditorUtility.ClearProgressBar();
|
EditorUtility.ClearProgressBar();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#region 图片压缩
|
||||||
|
[MenuItem("Assets/图片压缩/UITextue")]
|
||||||
|
public static void UITexture()
|
||||||
|
{
|
||||||
|
DoCompress(0);
|
||||||
|
}
|
||||||
|
[MenuItem("Assets/图片压缩/BGSingle")]
|
||||||
|
public static void BGSingle()
|
||||||
|
{
|
||||||
|
DoCompress(1);
|
||||||
|
}
|
||||||
|
[MenuItem("Assets/图片压缩/BGMultiple")]
|
||||||
|
public static void BGMultiple()
|
||||||
|
{
|
||||||
|
DoCompress(2);
|
||||||
|
}
|
||||||
|
[MenuItem("Assets/图片压缩/SpineTexture")]
|
||||||
|
public static void SpineTexture()
|
||||||
|
{
|
||||||
|
DoCompress(3);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public static void DoCompress(int cType)
|
||||||
|
{
|
||||||
|
var guids = Selection.assetGUIDs;
|
||||||
|
var filePaths = new List<string>();
|
||||||
|
foreach (var id in guids)
|
||||||
|
{
|
||||||
|
var path = AssetDatabase.GUIDToAssetPath(id);
|
||||||
|
if (File.Exists(path))
|
||||||
|
{
|
||||||
|
if (!filePaths.Contains(path))
|
||||||
|
filePaths.Add(path);
|
||||||
|
}
|
||||||
|
else if (Directory.Exists(path))
|
||||||
|
{
|
||||||
|
var subFileGuids = AssetDatabase.FindAssets("t:Texture", new string[] { path });
|
||||||
|
if (subFileGuids != null && subFileGuids.Length > 0)
|
||||||
|
{
|
||||||
|
foreach (var subId in subFileGuids)
|
||||||
|
{
|
||||||
|
var subPath = AssetDatabase.GUIDToAssetPath(subId);
|
||||||
|
if (!filePaths.Contains(subPath))
|
||||||
|
filePaths.Add(subPath);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (filePaths.Count < 1) return;
|
||||||
|
for (int i = 0; i < filePaths.Count; i++)
|
||||||
|
{
|
||||||
|
string path = filePaths[i];
|
||||||
|
EditorUtility.DisplayProgressBar(string.Format("Opt UI Texture({0}/{1})", i, filePaths.Count), path, i * 1f / filePaths.Count);
|
||||||
|
TextureImporter ti = (TextureImporter)TextureImporter.GetAtPath(path);
|
||||||
|
switch (cType)
|
||||||
|
{
|
||||||
|
case 0:
|
||||||
|
SetUITexture(ti);
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
SetBGSingle(ti);
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
SetBGMultiple(ti);
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
SetSpineTexture(ti);
|
||||||
|
break;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
AssetDatabase.ImportAsset(path);
|
||||||
|
}
|
||||||
|
EditorUtility.ClearProgressBar();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 设置UI图片自动图集名称,与图片格式
|
||||||
|
/// </summary>
|
||||||
|
///
|
||||||
|
public static string GetAtlasName(string assetPath)
|
||||||
|
{
|
||||||
|
int index = assetPath.IndexOf("/Atlas/");
|
||||||
|
string atlasName = assetPath.Substring(index + 7);
|
||||||
|
index = atlasName.IndexOf("/");
|
||||||
|
if (index != -1)
|
||||||
|
{
|
||||||
|
atlasName = atlasName.Substring(0, index);
|
||||||
|
}
|
||||||
|
return atlasName;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void SetUITexture(TextureImporter importer)
|
||||||
|
{
|
||||||
|
importer.spritePackingTag = GetAtlasName(importer.assetPath);
|
||||||
|
|
||||||
|
TextureImporterSettings importerSettings = new TextureImporterSettings();
|
||||||
|
importer.ReadTextureSettings(importerSettings);
|
||||||
|
importerSettings.npotScale = TextureImporterNPOTScale.None;
|
||||||
|
importerSettings.spriteMode = 1;//Single
|
||||||
|
importerSettings.spritePixelsPerUnit = GameLogic.AppConst.PIXELTOWORLD;
|
||||||
|
importerSettings.mipmapEnabled = false;
|
||||||
|
importerSettings.wrapMode = TextureWrapMode.Clamp;
|
||||||
|
importerSettings.filterMode = FilterMode.Trilinear;
|
||||||
|
importerSettings.alphaIsTransparency = true;
|
||||||
|
importer.SetTextureSettings(importerSettings);
|
||||||
|
|
||||||
|
//Android
|
||||||
|
TextureImporterPlatformSettings s_Android = new TextureImporterPlatformSettings();
|
||||||
|
s_Android.name = "Android";
|
||||||
|
s_Android.maxTextureSize = 2048;
|
||||||
|
s_Android.format = TextureImporterFormat.ETC2_RGBA8Crunched;
|
||||||
|
s_Android.compressionQuality = 50;
|
||||||
|
s_Android.allowsAlphaSplitting = false;
|
||||||
|
s_Android.overridden = true;
|
||||||
|
importer.SetPlatformTextureSettings(s_Android);
|
||||||
|
|
||||||
|
//IOS
|
||||||
|
TextureImporterPlatformSettings s_IOS = new TextureImporterPlatformSettings();
|
||||||
|
s_IOS.name = "iPhone";
|
||||||
|
s_IOS.maxTextureSize = 2048;
|
||||||
|
s_IOS.format = TextureImporterFormat.PVRTC_RGBA4;
|
||||||
|
s_IOS.compressionQuality = 50;
|
||||||
|
s_IOS.allowsAlphaSplitting = false;
|
||||||
|
s_IOS.overridden = true;
|
||||||
|
importer.SetPlatformTextureSettings(s_IOS);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void SetBGSingle(TextureImporter importer)
|
||||||
|
{
|
||||||
|
importer.spritePackingTag = string.Empty;
|
||||||
|
|
||||||
|
TextureImporterSettings importerSettings = new TextureImporterSettings();
|
||||||
|
importer.ReadTextureSettings(importerSettings);
|
||||||
|
importerSettings.npotScale = TextureImporterNPOTScale.None;
|
||||||
|
importerSettings.spriteMode = 1;//Single
|
||||||
|
importerSettings.spritePixelsPerUnit = GameLogic.AppConst.PIXELTOWORLD;
|
||||||
|
importerSettings.mipmapEnabled = false;
|
||||||
|
importerSettings.wrapMode = TextureWrapMode.Clamp;
|
||||||
|
importerSettings.filterMode = FilterMode.Trilinear;
|
||||||
|
importerSettings.alphaIsTransparency = true;
|
||||||
|
importer.SetTextureSettings(importerSettings);
|
||||||
|
|
||||||
|
//Android
|
||||||
|
TextureImporterPlatformSettings s_Android = new TextureImporterPlatformSettings();
|
||||||
|
s_Android.name = "Android";
|
||||||
|
s_Android.maxTextureSize = 2048;
|
||||||
|
s_Android.format = TextureImporterFormat.ETC2_RGBA8Crunched;
|
||||||
|
s_Android.compressionQuality = 50;
|
||||||
|
s_Android.allowsAlphaSplitting = false;
|
||||||
|
s_Android.overridden = true;
|
||||||
|
importer.SetPlatformTextureSettings(s_Android);
|
||||||
|
|
||||||
|
//IOS
|
||||||
|
TextureImporterPlatformSettings s_IOS = new TextureImporterPlatformSettings();
|
||||||
|
s_IOS.name = "iPhone";
|
||||||
|
s_IOS.maxTextureSize = 2048;
|
||||||
|
s_IOS.format = TextureImporterFormat.ASTC_RGBA_8x8;
|
||||||
|
s_IOS.compressionQuality = 50;
|
||||||
|
s_IOS.allowsAlphaSplitting = false;
|
||||||
|
s_IOS.overridden = true;
|
||||||
|
importer.SetPlatformTextureSettings(s_IOS);
|
||||||
|
}
|
||||||
|
static void SetBGMultiple(TextureImporter importer)
|
||||||
|
{
|
||||||
|
importer.spritePackingTag = string.Empty;
|
||||||
|
|
||||||
|
TextureImporterSettings importerSettings = new TextureImporterSettings();
|
||||||
|
importer.ReadTextureSettings(importerSettings);
|
||||||
|
importerSettings.npotScale = TextureImporterNPOTScale.None;
|
||||||
|
importerSettings.spriteMode = 2;//Multiple
|
||||||
|
importerSettings.spritePixelsPerUnit = GameLogic.AppConst.PIXELTOWORLD;
|
||||||
|
importerSettings.mipmapEnabled = false;
|
||||||
|
importerSettings.wrapMode = TextureWrapMode.Clamp;
|
||||||
|
importerSettings.filterMode = FilterMode.Trilinear;
|
||||||
|
importerSettings.alphaIsTransparency = true;
|
||||||
|
importer.SetTextureSettings(importerSettings);
|
||||||
|
|
||||||
|
//Android
|
||||||
|
TextureImporterPlatformSettings s_Android = new TextureImporterPlatformSettings();
|
||||||
|
s_Android.name = "Android";
|
||||||
|
s_Android.maxTextureSize = 2048;
|
||||||
|
s_Android.format = TextureImporterFormat.ETC2_RGBA8Crunched;
|
||||||
|
s_Android.compressionQuality = 50;
|
||||||
|
s_Android.allowsAlphaSplitting = false;
|
||||||
|
s_Android.overridden = true;
|
||||||
|
importer.SetPlatformTextureSettings(s_Android);
|
||||||
|
|
||||||
|
//IOS
|
||||||
|
TextureImporterPlatformSettings s_IOS = new TextureImporterPlatformSettings();
|
||||||
|
s_IOS.name = "iPhone";
|
||||||
|
s_IOS.maxTextureSize = 2048;
|
||||||
|
s_IOS.format = TextureImporterFormat.ASTC_RGBA_8x8;
|
||||||
|
s_IOS.compressionQuality = 50;
|
||||||
|
s_IOS.allowsAlphaSplitting = false;
|
||||||
|
s_IOS.overridden = true;
|
||||||
|
importer.SetPlatformTextureSettings(s_IOS);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void SetSpineTexture(TextureImporter importer)
|
||||||
|
{
|
||||||
|
importer.spritePackingTag = string.Empty;
|
||||||
|
|
||||||
|
TextureImporterSettings importerSettings = new TextureImporterSettings();
|
||||||
|
importer.ReadTextureSettings(importerSettings);
|
||||||
|
importerSettings.npotScale = TextureImporterNPOTScale.None;
|
||||||
|
importerSettings.spriteMode = 1;//Single
|
||||||
|
importerSettings.spritePixelsPerUnit = GameLogic.AppConst.PIXELTOWORLD;
|
||||||
|
importerSettings.mipmapEnabled = false;
|
||||||
|
importerSettings.wrapMode = TextureWrapMode.Clamp;
|
||||||
|
importerSettings.filterMode = FilterMode.Trilinear;
|
||||||
|
importerSettings.alphaIsTransparency = true;
|
||||||
|
importer.SetTextureSettings(importerSettings);
|
||||||
|
|
||||||
|
//Android
|
||||||
|
TextureImporterPlatformSettings s_Android = new TextureImporterPlatformSettings();
|
||||||
|
s_Android.name = "Android";
|
||||||
|
s_Android.maxTextureSize = 2048;
|
||||||
|
s_Android.format = TextureImporterFormat.ASTC_RGBA_5x5;
|
||||||
|
s_Android.compressionQuality = 50;
|
||||||
|
s_Android.allowsAlphaSplitting = false;
|
||||||
|
s_Android.overridden = true;
|
||||||
|
importer.SetPlatformTextureSettings(s_Android);
|
||||||
|
|
||||||
|
//IOS
|
||||||
|
TextureImporterPlatformSettings s_IOS = new TextureImporterPlatformSettings();
|
||||||
|
s_IOS.name = "iPhone";
|
||||||
|
s_IOS.maxTextureSize = 2048;
|
||||||
|
s_IOS.format = TextureImporterFormat.ASTC_RGBA_5x5;
|
||||||
|
s_IOS.compressionQuality = 50;
|
||||||
|
s_IOS.allowsAlphaSplitting = false;
|
||||||
|
s_IOS.overridden = true;
|
||||||
|
importer.SetPlatformTextureSettings(s_IOS);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue