Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
0a2b584ab0
Binary file not shown.
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 602242cdb8bb5dc4695fe4fe7a5fef87
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 02bf9e2d63ffcd14ebf7f94c8b93ea9c
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0dd8c47602f28924c9332ced8bd838ea
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 16e77c4edec8d344f81d7fc27b346481
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: cae1f663f143fc44e9ffac14b84d5510
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -1876,13 +1876,6 @@ RectTransform:
|
|||
- {fileID: 224555731055104148}
|
||||
- {fileID: 224890995552760338}
|
||||
- {fileID: 224840128425348974}
|
||||
- {fileID: 1726105179464205488}
|
||||
- {fileID: 7623883102458573942}
|
||||
- {fileID: 7297077785714495003}
|
||||
- {fileID: 7997087281471367570}
|
||||
- {fileID: 3647602766939651864}
|
||||
- {fileID: 4251482320623462343}
|
||||
- {fileID: 5256010807519282371}
|
||||
- {fileID: 1201038047322019283}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
|
@ -3421,80 +3414,6 @@ Animator:
|
|||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &1444049958555565931
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7297077785714495003}
|
||||
- component: {fileID: 7348271144433504799}
|
||||
- component: {fileID: 817604448106051919}
|
||||
m_Layer: 5
|
||||
m_Name: Image2
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7297077785714495003
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1444049958555565931}
|
||||
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: 224197152332357120}
|
||||
m_RootOrder: 5
|
||||
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: 1630.5, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7348271144433504799
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1444049958555565931}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &817604448106051919
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1444049958555565931}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 3ef83ebb8fef9034b81e06089cc66755, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &1563839245620898994
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -5500,154 +5419,6 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 421.8, y: 21}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &2968913769949588523
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4251482320623462343}
|
||||
- component: {fileID: 396523335348675184}
|
||||
- component: {fileID: 6755521635152402434}
|
||||
m_Layer: 5
|
||||
m_Name: Image5
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4251482320623462343
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2968913769949588523}
|
||||
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: 224197152332357120}
|
||||
m_RootOrder: 8
|
||||
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: 1630.5, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &396523335348675184
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2968913769949588523}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6755521635152402434
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2968913769949588523}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 65eaefa111e97b942b724745752addaa, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &4035182006869693072
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7623883102458573942}
|
||||
- component: {fileID: 3050821877368694045}
|
||||
- component: {fileID: 7172016855107129751}
|
||||
m_Layer: 5
|
||||
m_Name: Image1
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7623883102458573942
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4035182006869693072}
|
||||
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: 224197152332357120}
|
||||
m_RootOrder: 4
|
||||
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: 1630.5, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3050821877368694045
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4035182006869693072}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7172016855107129751
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4035182006869693072}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 690377177e4787b46b1a8d22001d52f0, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &4602574600601858769
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -5683,7 +5454,7 @@ RectTransform:
|
|||
- {fileID: 224496641487165388}
|
||||
- {fileID: 5870792082446133048}
|
||||
m_Father: {fileID: 224197152332357120}
|
||||
m_RootOrder: 10
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
@ -8185,228 +7956,6 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &6641536271704471498
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3647602766939651864}
|
||||
- component: {fileID: 204806767338362460}
|
||||
- component: {fileID: 3714588034260378868}
|
||||
m_Layer: 5
|
||||
m_Name: Image4
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3647602766939651864
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6641536271704471498}
|
||||
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: 224197152332357120}
|
||||
m_RootOrder: 7
|
||||
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: 1630.5, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &204806767338362460
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6641536271704471498}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3714588034260378868
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6641536271704471498}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 082f88e7467737940a149691190f6d63, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &6882448877779831183
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7997087281471367570}
|
||||
- component: {fileID: 6653313540993183070}
|
||||
- component: {fileID: 1881013015697137719}
|
||||
m_Layer: 5
|
||||
m_Name: Image3
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7997087281471367570
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6882448877779831183}
|
||||
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: 224197152332357120}
|
||||
m_RootOrder: 6
|
||||
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: 1630.5, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6653313540993183070
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6882448877779831183}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1881013015697137719
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6882448877779831183}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 5a3d90e3268013e489e4d13baae99fed, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &6932840096574000735
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1726105179464205488}
|
||||
- component: {fileID: 2423732021818712883}
|
||||
- component: {fileID: 1883381040914973284}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1726105179464205488
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6932840096574000735}
|
||||
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: 224197152332357120}
|
||||
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: 1630.5, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2423732021818712883
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6932840096574000735}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1883381040914973284
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6932840096574000735}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 2c75a8c8c4e0e36498f0f80aeb2275f5, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &8174434967246760697
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -8629,77 +8178,3 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &9049746957381451038
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5256010807519282371}
|
||||
- component: {fileID: 1862722206355547538}
|
||||
- component: {fileID: 104447596863284600}
|
||||
m_Layer: 5
|
||||
m_Name: Image6
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5256010807519282371
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9049746957381451038}
|
||||
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: 224197152332357120}
|
||||
m_RootOrder: 9
|
||||
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: 1630.5, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1862722206355547538
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9049746957381451038}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &104447596863284600
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9049746957381451038}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: 2035d90d06f71f74ba5e3d1b85fbb571, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
|
|
|
@ -46,13 +46,13 @@ function ChatPanel:InitComponent()
|
|||
this.playerPower = Util.GetGameObject(this.playerBg, "power"):GetComponent("Text")
|
||||
this.playerInvite = Util.GetGameObject(this.playerBg, "btnInvite")
|
||||
this.playerFriend = Util.GetGameObject(this.playerBg, "btnFriend")
|
||||
this.shader1 = Util.GetGameObject(self.gameObject, "Image"):GetComponent("Image").material.shader
|
||||
this.shader2 = Util.GetGameObject(self.gameObject, "Image1"):GetComponent("Image").material.shader
|
||||
this.shader3 = Util.GetGameObject(self.gameObject, "Image2"):GetComponent("Image").material.shader
|
||||
this.shader4 = Util.GetGameObject(self.gameObject, "Image3"):GetComponent("Image").material.shader
|
||||
this.shader5 = Util.GetGameObject(self.gameObject, "Image4"):GetComponent("Image").material.shader
|
||||
this.shader6 = Util.GetGameObject(self.gameObject, "Image5"):GetComponent("Image").material.shader
|
||||
this.shader7 = Util.GetGameObject(self.gameObject, "Image6"):GetComponent("Image").material.shader
|
||||
-- this.shader1 = Util.GetGameObject(self.gameObject, "Image"):GetComponent("Image").material.shader
|
||||
-- this.shader2 = Util.GetGameObject(self.gameObject, "Image1"):GetComponent("Image").material.shader
|
||||
-- this.shader3 = Util.GetGameObject(self.gameObject, "Image2"):GetComponent("Image").material.shader
|
||||
-- this.shader4 = Util.GetGameObject(self.gameObject, "Image3"):GetComponent("Image").material.shader
|
||||
-- this.shader5 = Util.GetGameObject(self.gameObject, "Image4"):GetComponent("Image").material.shader
|
||||
-- this.shader6 = Util.GetGameObject(self.gameObject, "Image5"):GetComponent("Image").material.shader
|
||||
-- this.shader7 = Util.GetGameObject(self.gameObject, "Image6"):GetComponent("Image").material.shader
|
||||
-- 上部货币显示
|
||||
this.UpView = SubUIManager.Open(SubUIConfig.UpView, Util.GetGameObject(self.gameObject, "frame").transform, { showType = UpViewOpenType.ShowLeft})
|
||||
end
|
||||
|
@ -275,32 +275,32 @@ function this.RefreshShow(isForceBottom)
|
|||
else
|
||||
this.ChatItemAdapter(go, data, isShowTime)
|
||||
end
|
||||
local particles=this.scrollRoot:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem))
|
||||
for key, value in pairs(particles:ToTable()) do
|
||||
local mat=value:GetComponent(typeof(UnityEngine.Renderer))
|
||||
if mat.material.shader.name=="CGwell FX/Additive Lv1" then
|
||||
mat.material.shader=this.shader1
|
||||
elseif mat.material.shader.name=="Shader Forge/shuibowen" then
|
||||
mat.material.shader=this.shader4
|
||||
elseif mat.material.shader.name=="MagesBox/UVPanner_Add" then
|
||||
mat.material.shader=this.shader5
|
||||
elseif mat.material.shader.name=="CGwell FX/Add Lv4" then
|
||||
mat.material.shader=this.shader3
|
||||
elseif mat.material.shader.name=="Shader Forge/shuibowen_Alpha Blend" then
|
||||
mat.material.shader=this.shader6
|
||||
elseif mat.material.shader.name=="CGwell FX/Alpha Blend Lv4" then
|
||||
mat.material.shader=this.shader7
|
||||
end
|
||||
-- local particles=this.scrollRoot:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem))
|
||||
-- for key, value in pairs(particles:ToTable()) do
|
||||
-- local mat=value:GetComponent(typeof(UnityEngine.Renderer))
|
||||
-- if mat.material.shader.name=="CGwell FX/Additive Lv1" then
|
||||
-- mat.material.shader=this.shader1
|
||||
-- elseif mat.material.shader.name=="Shader Forge/shuibowen" then
|
||||
-- mat.material.shader=this.shader4
|
||||
-- elseif mat.material.shader.name=="MagesBox/UVPanner_Add" then
|
||||
-- mat.material.shader=this.shader5
|
||||
-- elseif mat.material.shader.name=="CGwell FX/Add Lv4" then
|
||||
-- mat.material.shader=this.shader3
|
||||
-- elseif mat.material.shader.name=="Shader Forge/shuibowen_Alpha Blend" then
|
||||
-- mat.material.shader=this.shader6
|
||||
-- elseif mat.material.shader.name=="CGwell FX/Alpha Blend Lv4" then
|
||||
-- mat.material.shader=this.shader7
|
||||
-- end
|
||||
|
||||
-- mat.material.shader=Shader.Find("CGwell FX/Additive Lv1_1")
|
||||
--mat.material= resMgr:LoadAsset("chenghao_mat1")
|
||||
end
|
||||
local meshs=this.scrollRoot:GetComponentsInChildren(typeof(UnityEngine.MeshRenderer))
|
||||
for key, value in pairs(meshs:ToTable()) do
|
||||
-- value.material.shader=Shader.Find("Custom/S_03_UV_alpha_add_1")
|
||||
--value.material= resMgr:LoadAsset("chenghao_mat2")
|
||||
value.material.shader=this.shader2
|
||||
end
|
||||
-- -- mat.material.shader=Shader.Find("CGwell FX/Additive Lv1_1")
|
||||
-- --mat.material= resMgr:LoadAsset("chenghao_mat1")
|
||||
-- end
|
||||
-- local meshs=this.scrollRoot:GetComponentsInChildren(typeof(UnityEngine.MeshRenderer))
|
||||
-- for key, value in pairs(meshs:ToTable()) do
|
||||
-- -- value.material.shader=Shader.Find("Custom/S_03_UV_alpha_add_1")
|
||||
-- --value.material= resMgr:LoadAsset("chenghao_mat2")
|
||||
-- value.material.shader=this.shader2
|
||||
-- end
|
||||
|
||||
end, _GoToIndex)
|
||||
|
||||
|
|
|
@ -89,98 +89,86 @@ function this:BindEvent()
|
|||
end
|
||||
UIManager.OpenPanel(UIName.MainShopPanel, SHOP_TYPE.SOUL_CONTRACT_SHOP)
|
||||
end)
|
||||
|
||||
--放生按钮
|
||||
Util.AddClick(this.confirmBtn,function()
|
||||
if isPokemon and tonumber(LengthOfTable(selectHeroData))==0 then
|
||||
PopupTipPanel.ShowTip(Language[11746])
|
||||
return
|
||||
--放生按钮
|
||||
Util.AddClick(this.confirmBtn,function()
|
||||
if isPokemon and tonumber(LengthOfTable(selectHeroData))==0 then
|
||||
PopupTipPanel.ShowTip(Language[11746])
|
||||
return
|
||||
end
|
||||
if not isPokemon and (selectChipId==0 or selectChipNum==0) then
|
||||
PopupTipPanel.ShowTip(Language[11746])
|
||||
return
|
||||
end
|
||||
--奖励物品
|
||||
--所有材料
|
||||
local allMaterials={}
|
||||
local pokemonIds={}
|
||||
--灵兽
|
||||
if isPokemon then
|
||||
local allCoin=0
|
||||
for key, value in pairs(selectHeroData) do
|
||||
--升级消耗
|
||||
table.insert(pokemonIds,key)
|
||||
local lvConfig=ConfigManager.GetConfigDataByDoubleKey(ConfigName.SpiritAnimalLevel,"Level",value.lv,"Quality",value.quality)
|
||||
if lvConfig then
|
||||
local matrs=lvConfig.SumConsume
|
||||
if matrs then
|
||||
for i = 1, #matrs do
|
||||
local mat=matrs[i]
|
||||
table.insert(allMaterials,{mat[1],mat[2]})
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if not isPokemon and (selectChipId==0 or selectChipNum==0) then
|
||||
PopupTipPanel.ShowTip(Language[11746])
|
||||
return
|
||||
--升星消耗
|
||||
local lingshouConfig=ConfigManager.GetConfigData(ConfigName.SpiritAnimal,value.id)
|
||||
local haveNum=0
|
||||
if value.star>0 then
|
||||
local starConfig=ConfigManager.GetConfigDataByDoubleKey(ConfigName.SpiritAnimalStar,"Star",value.star,"Quality",value.quality)
|
||||
if starConfig then
|
||||
haveNum=starConfig.SumItemNum
|
||||
local starMatrs=starConfig.SumConsume
|
||||
--消耗材料
|
||||
if starMatrs then
|
||||
for i = 1, #starMatrs do
|
||||
local starm=starMatrs[i]
|
||||
table.insert(allMaterials,{starm[1],starm[2]})
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
--消耗本体数量,分解成碎片
|
||||
allCoin=allCoin+lingshouConfig.CoinReturn[2]*(haveNum+1)
|
||||
end
|
||||
--加上所有的分解币
|
||||
table.insert(allMaterials,{1205,allCoin})
|
||||
else--灵兽碎片
|
||||
local itemConfig=ConfigManager.GetConfigData(ConfigName.ItemConfig,selectChipId)
|
||||
if itemConfig then
|
||||
local groupId=itemConfig.RewardGroup[1]
|
||||
local groupConfig=ConfigManager.GetConfigData(ConfigName.RewardGroup,groupId)
|
||||
if groupConfig then
|
||||
LogError("掉落组显示:"..groupConfig.ShowItem[1][1])
|
||||
local pokemon=ConfigManager.GetConfigData(ConfigName.SpiritAnimal,groupConfig.ShowItem[1][1])
|
||||
if pokemon then
|
||||
table.insert(allMaterials,{pokemon.PiecesCoinReturn[1],pokemon.PiecesCoinReturn[2]*selectChipNum})
|
||||
end
|
||||
|
||||
--奖励物品
|
||||
--所有材料
|
||||
local allMaterials={}
|
||||
local pokemonIds={}
|
||||
--灵兽
|
||||
if isPokemon then
|
||||
local allCoin=0
|
||||
for key, value in pairs(selectHeroData) do
|
||||
--升级消耗
|
||||
table.insert(pokemonIds,key)
|
||||
local lvConfig=ConfigManager.GetConfigDataByDoubleKey(ConfigName.SpiritAnimalLevel,"Level",value.lv,"Quality",value.quality)
|
||||
if lvConfig then
|
||||
local matrs=lvConfig.SumConsume
|
||||
if matrs then
|
||||
for i = 1, #matrs do
|
||||
local mat=matrs[i]
|
||||
table.insert(allMaterials,{mat[1],mat[2]})
|
||||
end
|
||||
end
|
||||
end
|
||||
--升星消耗
|
||||
local lingshouConfig=ConfigManager.GetConfigData(ConfigName.SpiritAnimal,value.id)
|
||||
local haveNum=0
|
||||
|
||||
if value.star>0 then
|
||||
local starConfig=ConfigManager.GetConfigDataByDoubleKey(ConfigName.SpiritAnimalStar,"Star",value.star,"Quality",value.quality)
|
||||
if starConfig then
|
||||
haveNum=starConfig.SumItemNum
|
||||
local starMatrs=starConfig.SumConsume
|
||||
--消耗材料
|
||||
if starMatrs then
|
||||
for i = 1, #starMatrs do
|
||||
local starm=starMatrs[i]
|
||||
table.insert(allMaterials,{starm[1],starm[2]})
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
--消耗本体数量,分解成碎片
|
||||
allCoin=allCoin+lingshouConfig.CoinReturn[2]*(haveNum+1)
|
||||
end
|
||||
--加上所有的分解币
|
||||
table.insert(allMaterials,{1205,allCoin})
|
||||
else--灵兽碎片
|
||||
local itemConfig=ConfigManager.GetConfigData(ConfigName.ItemConfig,selectChipId)
|
||||
if itemConfig then
|
||||
local groupId=itemConfig.RewardGroup[1]
|
||||
local groupConfig=ConfigManager.GetConfigData(ConfigName.RewardGroup,groupId)
|
||||
if groupConfig then
|
||||
LogError("掉落组显示:"..groupConfig.ShowItem[1][1])
|
||||
local pokemon=ConfigManager.GetConfigData(ConfigName.SpiritAnimal,groupConfig.ShowItem[1][1])
|
||||
if pokemon then
|
||||
table.insert(allMaterials,{pokemon.PiecesCoinReturn[1],pokemon.PiecesCoinReturn[2]*selectChipNum})
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
--显示分解界面
|
||||
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.PokemonRestore,allMaterials,function()
|
||||
LogError("灵兽长度 "..#pokemonIds.."碎片id "..selectChipId.." num"..selectChipNum)
|
||||
NetManager.PokemonFreeRequest(pokemonIds,selectChipId,selectChipNum,function(msg)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function()
|
||||
|
||||
end)
|
||||
if pokemonIds and #pokemonIds>0 then
|
||||
PokemonManager.RemovePokemonData(pokemonIds)
|
||||
-- else
|
||||
-- LogError("分解前数量"..BagManager.GetItemCountById(selectChipId))
|
||||
-- BagManager.HeroLvUpUpdateItemsNum(selectChipId,selectChipNum)
|
||||
-- LogError("分解后数量"..BagManager.GetItemCountById(selectChipId))
|
||||
end
|
||||
this.SortTypeClick(sortingOrder)
|
||||
end
|
||||
--显示分解界面
|
||||
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.PokemonRestore,allMaterials,function()
|
||||
LogError("灵兽长度 "..#pokemonIds.."碎片id "..selectChipId.." num"..selectChipNum)
|
||||
NetManager.PokemonFreeRequest(pokemonIds,selectChipId,selectChipNum,function(msg)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1)
|
||||
if pokemonIds and #pokemonIds>0 then
|
||||
PokemonManager.RemovePokemonData(pokemonIds)
|
||||
end
|
||||
this.SortTypeClick(sortingOrder)
|
||||
this.chipObj:SetActive(false)
|
||||
this.selectText.gameObject:SetActive(true)
|
||||
end)
|
||||
|
||||
end)
|
||||
|
||||
end)
|
||||
|
||||
end)
|
||||
end)
|
||||
end
|
||||
|
||||
function this:AddListener()
|
||||
|
@ -210,16 +198,16 @@ function this.SortTypeClick(_sortType,isTop,isAni)
|
|||
hero.star=v.star
|
||||
hero.lv=v.lv
|
||||
hero.dynamicId=v.dynamicId
|
||||
hero.ischip=0
|
||||
hero.icon= GetResourcePath(heroConfig.Icon)
|
||||
hero.ischip=0
|
||||
hero.icon= GetResourcePath(heroConfig.Icon)
|
||||
hero.id=v.id
|
||||
hero.quality=heroConfig.Quality
|
||||
hero.name=heroConfig.Name
|
||||
hero.name=heroConfig.Name
|
||||
hero.returnCoin=heroConfig.CoinReturn
|
||||
hero.frame=GetHeroQuantityImageByquality(heroConfig.Quality)
|
||||
hero.num=1
|
||||
table.insert(items,hero)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -254,12 +242,6 @@ function this.SortTypeClick(_sortType,isTop,isAni)
|
|||
this.ScrollView:SetData(heroDatas, function (index, go)
|
||||
this.SingleHeroDataShow(go, heroDatas[index],false)
|
||||
end,isTop,isAni)
|
||||
-- this.ScrollView:ForeachItemGO(function(index, go)
|
||||
-- Timer.New(function()
|
||||
-- go.gameObject:SetActive(true)
|
||||
-- PlayUIAnim(go.gameObject)
|
||||
-- end, 0.001 * (index - 1)):Start()
|
||||
-- end)
|
||||
end
|
||||
|
||||
--英雄单个数据展示
|
||||
|
@ -371,8 +353,7 @@ function this.SingleHeroDataShow(go,_heroData,isGray)
|
|||
this.selectText.gameObject:SetActive(true)
|
||||
this.chipObj:SetActive(false)
|
||||
isPokemon = true
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
||||
|
@ -380,7 +361,6 @@ function this.SingleHeroDataShow(go,_heroData,isGray)
|
|||
Util.AddOnceClick(formationMask, function()
|
||||
PopupTipPanel.ShowTip(Language[11748])
|
||||
end)
|
||||
|
||||
end
|
||||
--英雄排序
|
||||
function this.SortHeroDatas(_heroDatas)
|
||||
|
@ -406,8 +386,6 @@ function this.SortHeroDatas(_heroDatas)
|
|||
else
|
||||
return a.ischip<b.ischip
|
||||
end
|
||||
|
||||
|
||||
end)
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue