Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
23d3fa42fd
|
@ -0,0 +1,29 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: H_lizi_06_01_mat
|
||||
m_Shader: {fileID: 4800000, guid: 0653531e9143c8540af8123534d7158f, type: 3}
|
||||
m_ShaderKeywords:
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: 455be313358097e4282d283353cb4dbb, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _InvFade: 1
|
||||
m_Colors:
|
||||
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c9fe724728534654e8c400d857c5aa4a
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,111 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Tex_Object_Sword_2_mat
|
||||
m_Shader: {fileID: 4800000, guid: 9bf210b14320ae34d9ff653eca237efb, type: 3}
|
||||
m_ShaderKeywords: _MASK_1ON_ON _MASK_1_RA_ON _MASK_2ON_ON _MASK_2_RA_ON
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _BumpMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailAlbedoMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailMask:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailNormalMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _EmissionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _Main_Tex:
|
||||
m_Texture: {fileID: 2800000, guid: e7f68f9ca39036c4689a6b6be67680a2, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _Mask_1:
|
||||
m_Texture: {fileID: 2800000, guid: 95c4a48c019e33c4a8802fe9405afa9a, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _Mask_2:
|
||||
m_Texture: {fileID: 2800000, guid: e7f68f9ca39036c4689a6b6be67680a2, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _Noise_Tex:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _OcclusionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ParallaxMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _Tex_Gain:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
- _Gain_RA: 0
|
||||
- _Gain_U_Speed: 1
|
||||
- _Gain_V_Speed: 1
|
||||
- _GlossMapScale: 1
|
||||
- _Glossiness: 0.5
|
||||
- _GlossyReflections: 1
|
||||
- _Main_Tex_RA: 0
|
||||
- _Mask_1On: 1
|
||||
- _Mask_1_RA: 1
|
||||
- _Mask_2On: 1
|
||||
- _Mask_2_RA: 1
|
||||
- _Metallic: 0
|
||||
- _Mode: 0
|
||||
- _Noise_On: 0
|
||||
- _Noise_Power: 0
|
||||
- _Noise_Speed_U: 0
|
||||
- _Noise_Speed_V: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.02
|
||||
- _RA: 0
|
||||
- _SmoothnessTextureChannel: 0
|
||||
- _SpecularHighlights: 1
|
||||
- _SrcBlend: 1
|
||||
- _UVSec: 0
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _Color: {r: 1.216786, g: 1.216786, b: 1.216786, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _Gain_Color: {r: 1, g: 1, b: 1, a: 1}
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2d50c41595f04d14abefd3a29755fba7
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,29 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: keji_12_mat
|
||||
m_Shader: {fileID: 4800000, guid: 3a92c06211adfa942b6870142815465b, type: 3}
|
||||
m_ShaderKeywords:
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: e9387f8fe0a60054b814c42d4113ccb9, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _InvFade: 1
|
||||
m_Colors:
|
||||
- _TintColor: {r: 1, g: 1, b: 1, a: 0.5019608}
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e07c808cceb498648ae44c3d1254eea9
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,29 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: keji_14_mat
|
||||
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_ShaderKeywords:
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: 3001
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: c396158f7c3958346b75c109223fb5ad, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _InvFade: 1
|
||||
m_Colors:
|
||||
- _TintColor: {r: 1, g: 1, b: 1, a: 0.5}
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e18cf9283fd324d41a57fbc6c4ba5f27
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -6,7 +6,7 @@ AnimatorController:
|
|||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: waixuan_UI_anim
|
||||
m_Name: waixuan_UI_ctr
|
||||
serializedVersion: 5
|
||||
m_AnimatorParameters: []
|
||||
m_AnimatorLayers:
|
||||
|
|
|
@ -6,7 +6,7 @@ AnimationClip:
|
|||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: UI_effect_SupremeHeroPopup_jian
|
||||
m_Name: UI_effect_SupremeHeroPopup_jian_anim
|
||||
serializedVersion: 6
|
||||
m_Legacy: 0
|
||||
m_Compressed: 0
|
||||
|
|
|
@ -6,7 +6,7 @@ AnimationClip:
|
|||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: UI_effect_SupremeHeroPopup_wenzi
|
||||
m_Name: UI_effect_SupremeHeroPopup_wenzi_anim
|
||||
serializedVersion: 6
|
||||
m_Legacy: 0
|
||||
m_Compressed: 0
|
||||
|
|
|
@ -10150,7 +10150,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 60.2, y: -45.1}
|
||||
m_AnchoredPosition: {x: 60.199997, y: -45.1}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1445320564638215019
|
||||
|
@ -24313,13 +24313,13 @@ RectTransform:
|
|||
- {fileID: 8460419526808086132}
|
||||
- {fileID: 335761262040917005}
|
||||
- {fileID: 7037522940098548935}
|
||||
m_Father: {fileID: 1470640894515440942}
|
||||
m_RootOrder: 1
|
||||
m_Father: {fileID: 1080492301643067761}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 83, y: 64}
|
||||
m_SizeDelta: {x: 127, y: 128}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4367344497533921501
|
||||
CanvasRenderer:
|
||||
|
@ -44805,8 +44805,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 9158673223480268760}
|
||||
- {fileID: 3958316192645827337}
|
||||
- {fileID: 6379532960330795117}
|
||||
- {fileID: 1080492301643067761}
|
||||
m_Father: {fileID: 986452627335843391}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -61073,6 +61072,42 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &4892231996317496096
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6921984787054832038}
|
||||
m_Layer: 5
|
||||
m_Name: GameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6921984787054832038
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4892231996317496096}
|
||||
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: 6379532960330795117}
|
||||
m_Father: {fileID: 1080492301643067761}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &4940234156816609357
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -70750,16 +70785,16 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6901911044717125155}
|
||||
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_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1470640894515440942}
|
||||
m_RootOrder: 2
|
||||
m_Father: {fileID: 6921984787054832038}
|
||||
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: -45, y: -329}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 98, y: -71}
|
||||
m_SizeDelta: {x: 197, y: 252}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5090937801259970180
|
||||
|
@ -77209,6 +77244,68 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 0, y: -160}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &7802222163529057803
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1080492301643067761}
|
||||
- component: {fileID: 6454860829896586398}
|
||||
m_Layer: 5
|
||||
m_Name: GameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1080492301643067761
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7802222163529057803}
|
||||
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: 3958316192645827337}
|
||||
- {fileID: 6921984787054832038}
|
||||
m_Father: {fileID: 1470640894515440942}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -102, y: -118}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &6454860829896586398
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7802222163529057803}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_StartCorner: 0
|
||||
m_StartAxis: 0
|
||||
m_CellSize: {x: 128, y: 128}
|
||||
m_Spacing: {x: 0, y: 50}
|
||||
m_Constraint: 0
|
||||
m_ConstraintCount: 2
|
||||
--- !u!1 &7861569015652279171
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -87,7 +87,7 @@ function this:InitComponent()
|
|||
effectAdapte(Util.GetGameObject(this.sgEffect[2], "ziti mask (1)"))
|
||||
|
||||
--十五日登录
|
||||
this.fgBtn=Util.GetGameObject(self.gameObject,"LeftUp/FifteenDayGift")
|
||||
this.fgBtn=Util.GetGameObject(self.gameObject,"LeftUp/GameObject/FifteenDayGift")
|
||||
this.rpFifteenDayGift = Util.GetGameObject(this.fgBtn,"redPoint")
|
||||
this.rpFifteenDayEffect = Util.GetGameObject(this.fgBtn,"UI_Effect_DengLu15Day_YuanKuang")
|
||||
|
||||
|
@ -117,7 +117,7 @@ function this:InitComponent()
|
|||
this.HongMengRedPoint = Util.GetGameObject(this.btnHongMeng,"redPoint")
|
||||
|
||||
--六星前往
|
||||
this.btnSixStarGo=Util.GetGameObject(self.gameObject,"LeftUp/sixStarHero")
|
||||
this.btnSixStarGo=Util.GetGameObject(self.gameObject,"LeftUp/GameObject/GameObject/sixStarHero")
|
||||
|
||||
-------------------场景中的按钮------------------------
|
||||
-- 按钮
|
||||
|
@ -672,7 +672,7 @@ end
|
|||
|
||||
function this.CreatActivity()
|
||||
for k,v in ipairs(activitys) do
|
||||
if not activityTabs[k] then
|
||||
if not activityTabs[k] then
|
||||
activityTabs[k] = {}
|
||||
activityTabs[k].go = newObjToParent(this.activityTabPrefab,this.RightUp)
|
||||
activityTabs[k].img = Util.GetGameObject(activityTabs[k].go, "icon"):GetComponent("Image")
|
||||
|
@ -1000,11 +1000,11 @@ function this.TimeFormat()
|
|||
end
|
||||
elseif v.ActId == 668 then
|
||||
-- 加入对月卡的判断
|
||||
local isMonthCardActive = OperatingManager.IsMonthCardActive()
|
||||
-- local isMonthCardActive = OperatingManager.IsMonthCardActive()
|
||||
local isOpen_128 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128)
|
||||
local isOpen_328 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328)
|
||||
activityTabs[k].go.gameObject:SetActive(isMonthCardActive and (isOpen_128 or isOpen_328))
|
||||
if isMonthCardActive then
|
||||
activityTabs[k].go.gameObject:SetActive( (isOpen_128 or isOpen_328))--isMonthCardActive and
|
||||
-- if isMonthCardActive then
|
||||
local cardType = nil
|
||||
if isOpen_328 then
|
||||
cardType = GoodsTypeDef.MONTHCARD_328
|
||||
|
@ -1030,7 +1030,7 @@ function this.TimeFormat()
|
|||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
-- end
|
||||
elseif v.ActId == 667 then
|
||||
local limitSkinGift = OperatingManager.GetTimeLimitSkinInfoList()
|
||||
if not limitSkinGift then
|
||||
|
@ -1200,10 +1200,10 @@ function this.RefreshGiftBtnShow()
|
|||
local ishow = DynamicActivityManager.IsQualifiled(v.Id)
|
||||
if v.ActId == 668 and ishow then
|
||||
-- 加入对月卡的判断
|
||||
local isMonthCardActive = OperatingManager.IsMonthCardActive()
|
||||
-- local isMonthCardActive = OperatingManager.IsMonthCardActive()
|
||||
local isOpen_128 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128)
|
||||
local isOpen_328 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328)
|
||||
activityTabs[k].go.gameObject:SetActive(isMonthCardActive and (isOpen_128 or isOpen_328))
|
||||
activityTabs[k].go.gameObject:SetActive( (isOpen_128 or isOpen_328))--isMonthCardActive and
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -1275,11 +1275,11 @@ function this.RefreshActivityShow()
|
|||
elseif v.ActId == 668 then
|
||||
--超值基金
|
||||
-- 加入对月卡的判断
|
||||
local isMonthCardActive = OperatingManager.IsMonthCardActive()
|
||||
-- local isMonthCardActive = OperatingManager.IsMonthCardActive()
|
||||
local isOpen_128 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128)
|
||||
local isOpen_328 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328)
|
||||
activityTabs[k].go.gameObject:SetActive(isMonthCardActive and (isOpen_128 or isOpen_328))
|
||||
if isMonthCardActive then
|
||||
activityTabs[k].go.gameObject:SetActive( (isOpen_128 or isOpen_328))--isMonthCardActive and
|
||||
-- if isMonthCardActive then
|
||||
local cardType = nil
|
||||
if isOpen_328 then
|
||||
cardType = GoodsTypeDef.MONTHCARD_328
|
||||
|
@ -1298,7 +1298,7 @@ function this.RefreshActivityShow()
|
|||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
-- end
|
||||
end
|
||||
elseif v.ActiveType > 0 then
|
||||
local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType)
|
||||
|
|
|
@ -77,17 +77,17 @@ function UpperMonthCard:BindEvent()
|
|||
end)
|
||||
|
||||
Util.AddOnceClick(self.btnBuy, function()
|
||||
local isActive = VipManager.GetMonthCardOpenState()
|
||||
if not isActive then
|
||||
MsgPanel.ShowTwo(Language[11387], function()
|
||||
end, function(isShow)
|
||||
JumpManager.GoJump(36004)
|
||||
end, Language[10731], Language[10019],nil, false)
|
||||
else
|
||||
-- local isActive = VipManager.GetMonthCardOpenState()
|
||||
-- if not isActive then
|
||||
-- MsgPanel.ShowTwo(Language[11387], function()
|
||||
-- end, function(isShow)
|
||||
-- JumpManager.GoJump(36004)
|
||||
-- end, Language[10731], Language[10019],nil, false)
|
||||
-- else
|
||||
PayManager.Pay(self.baseType, function(id)
|
||||
self:RechargeSuccessFunc(id)
|
||||
end)
|
||||
end
|
||||
-- end
|
||||
end)
|
||||
end
|
||||
|
||||
|
@ -169,14 +169,15 @@ end
|
|||
|
||||
--- 根据是否购买了显示信息
|
||||
function UpperMonthCard:SetBuyState()
|
||||
local isActive = VipManager.GetMonthCardOpenState()
|
||||
-- local isActive = VipManager.GetMonthCardOpenState()
|
||||
-- local isBought = OperatingManager.IsBaseBuy(self.chargerBaseType)
|
||||
local canBuyNum = OperatingManager.GetLeftBuyTime(self.chargerBaseType, self.baseType)
|
||||
local isBought = canBuyNum and canBuyNum <= 0
|
||||
self.boughtPanel:SetActive(isBought)
|
||||
self.buyPanel:SetActive(not isBought)
|
||||
Util.SetGray(self.btnBuy, not isActive)
|
||||
self.textBuy.text = isActive and (string.format(MoneyUtil.GetMoneyUnitName(),MoneyUtil.GetMoney(chargeConfig[self.baseType].Price))) or (string.format(MoneyUtil.GetMoneyUnitName(),MoneyUtil.GetMoney(chargeConfig[self.baseType].Price)))-- .. MoneyUtil.GetMoneyUnitName())
|
||||
-- Util.SetGray(self.btnBuy, not isActive)
|
||||
--isActive and
|
||||
self.textBuy.text = (string.format(MoneyUtil.GetMoneyUnitName(),MoneyUtil.GetMoney(chargeConfig[self.baseType].Price))) or (string.format(MoneyUtil.GetMoneyUnitName(),MoneyUtil.GetMoney(chargeConfig[self.baseType].Price)))-- .. MoneyUtil.GetMoneyUnitName())
|
||||
|
||||
self.actLeftTime.gameObject:SetActive(false)
|
||||
if not isBought then
|
||||
|
|
|
@ -131,7 +131,7 @@ function GiftPre:BuyAction(costId, costNum, shopType, itemId)
|
|||
self.parent:RefreshData(nil,false,false)
|
||||
CheckRedPointStatus(RedPointType.DailyGift)
|
||||
CheckRedPointStatus(RedPointType.GrowthPackage)
|
||||
if shopType==20 and itemId==1107 then
|
||||
if shopType==20 and (itemId==1107 or itemId==1110 or itemId==1111 or itemId==1112 )then
|
||||
PlayerPrefs.SetString(PlayerManager.uid..PlayerManager.serverInfo.server_id.."supermeMan",666)
|
||||
end
|
||||
end)
|
||||
|
|
|
@ -158,13 +158,15 @@ function this.SetLive2dState(setData, isNeedLoad, resPath, live2dRoot, effectRoo
|
|||
-- 立绘的位置大小
|
||||
local scale = 0
|
||||
local position = Vector3.New(0,0,0)
|
||||
scale = setData.Scale
|
||||
position = Vector3(setData.Position[1], setData.Position[2], 0)
|
||||
|
||||
if resPath == this.bitchRes then
|
||||
position = Vector3.New(0, -250, 0)
|
||||
scale = 0.5
|
||||
setData = dialogueSetData[5402]
|
||||
-- position = Vector3.New(0, -250, 0)
|
||||
-- scale = 0.5
|
||||
end
|
||||
if not setData then return end
|
||||
scale = setData.Scale
|
||||
position = Vector3(setData.Position[1], setData.Position[2], 0)
|
||||
|
||||
-- 设置立绘最终大小位置
|
||||
local go
|
||||
|
|
Loading…
Reference in New Issue