Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
d2dd36101e
|
@ -1879,6 +1879,8 @@ RectTransform:
|
|||
- {fileID: 224496641487165388}
|
||||
- {fileID: 224314219868368952}
|
||||
- {fileID: 224840128425348974}
|
||||
- {fileID: 1726105179464205488}
|
||||
- {fileID: 7623883102458573942}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -5347,6 +5349,80 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 421.8, y: 21}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !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: 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 &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 &4925031386345304769
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -7804,6 +7880,80 @@ MonoBehaviour:
|
|||
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: 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 &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
|
||||
|
|
|
@ -4934,7 +4934,7 @@ ParticleSystem:
|
|||
--- !u!199 &64690113
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -9637,7 +9637,7 @@ ParticleSystem:
|
|||
--- !u!199 &69172534
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -14345,7 +14345,7 @@ ParticleSystem:
|
|||
--- !u!199 &204799297
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -19125,7 +19125,7 @@ ParticleSystem:
|
|||
--- !u!199 &279759104
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -23960,7 +23960,7 @@ ParticleSystem:
|
|||
--- !u!199 &462227806
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -28663,7 +28663,7 @@ ParticleSystem:
|
|||
--- !u!199 &513000431
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -33749,7 +33749,7 @@ ParticleSystem:
|
|||
--- !u!199 &589373448
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -38510,7 +38510,7 @@ ParticleSystem:
|
|||
--- !u!199 &731631312
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -43329,7 +43329,7 @@ ParticleSystem:
|
|||
--- !u!199 &776903912
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -48032,7 +48032,7 @@ ParticleSystem:
|
|||
--- !u!199 &815718708
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -52741,7 +52741,7 @@ ParticleSystem:
|
|||
--- !u!199 &1086905469
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -57502,7 +57502,7 @@ ParticleSystem:
|
|||
--- !u!199 &1145507478
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -62321,7 +62321,7 @@ ParticleSystem:
|
|||
--- !u!199 &1176510546
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -67082,7 +67082,7 @@ ParticleSystem:
|
|||
--- !u!199 &1199557686
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -71843,7 +71843,7 @@ ParticleSystem:
|
|||
--- !u!199 &1261539162
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -76604,7 +76604,7 @@ ParticleSystem:
|
|||
--- !u!199 &1273843583
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -81369,7 +81369,7 @@ ParticleSystem:
|
|||
--- !u!199 &1371557504
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -86130,7 +86130,7 @@ ParticleSystem:
|
|||
--- !u!199 &1408515770
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -90900,7 +90900,7 @@ ParticleSystem:
|
|||
--- !u!199 &1469096893
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -95606,7 +95606,7 @@ ParticleSystem:
|
|||
--- !u!199 &1654140410
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -100511,7 +100511,7 @@ ParticleSystem:
|
|||
--- !u!199 &1822328417
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -105217,7 +105217,7 @@ ParticleSystem:
|
|||
--- !u!199 &1981367497
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -109965,7 +109965,7 @@ ParticleSystem:
|
|||
--- !u!199 &2130572716
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -112013,7 +112013,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 5549884072537957039}
|
||||
m_Father: {fileID: 1593966968479717942}
|
||||
m_RootOrder: 4
|
||||
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}
|
||||
|
@ -112388,7 +112388,7 @@ RectTransform:
|
|||
- {fileID: 5340822025078538718}
|
||||
- {fileID: 6882643634657733322}
|
||||
m_Father: {fileID: 1593966968479717942}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
@ -112435,10 +112435,10 @@ RectTransform:
|
|||
- {fileID: 2013433043837755292}
|
||||
- {fileID: 6481611044557373655}
|
||||
- {fileID: 5568861175177969657}
|
||||
- {fileID: 1221612153605822957}
|
||||
- {fileID: 4878749898380413223}
|
||||
- {fileID: 347420160009930924}
|
||||
- {fileID: 3856169001450030976}
|
||||
- {fileID: 1221612153605822957}
|
||||
- {fileID: 8763056725147773343}
|
||||
m_Father: {fileID: 5873460360470581336}
|
||||
m_RootOrder: 1
|
||||
|
@ -113587,7 +113587,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 6373605657769495589}
|
||||
m_Father: {fileID: 1593966968479717942}
|
||||
m_RootOrder: 6
|
||||
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}
|
||||
|
@ -114149,7 +114149,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1593966968479717942}
|
||||
m_RootOrder: 5
|
||||
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}
|
||||
|
|
|
@ -0,0 +1,79 @@
|
|||
%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: chenghao_mat1
|
||||
m_Shader: {fileID: 4800000, guid: 8b8b2e19260ad614e9bac0ab7bf1e43c, type: 3}
|
||||
m_ShaderKeywords:
|
||||
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}
|
||||
- _MetallicGlossMap:
|
||||
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}
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
- _GlossMapScale: 1
|
||||
- _Glossiness: 0.5
|
||||
- _GlossyReflections: 1
|
||||
- _InvFade: 1
|
||||
- _Metallic: 0
|
||||
- _Mode: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.02
|
||||
- _SmoothnessTextureChannel: 0
|
||||
- _SpecularHighlights: 1
|
||||
- _SrcBlend: 1
|
||||
- _UVSec: 0
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2c75a8c8c4e0e36498f0f80aeb2275f5
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,88 @@
|
|||
%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: chenghao_mat2
|
||||
m_Shader: {fileID: 4800000, guid: 4bb8e7d80962b9547ad00d7ec8809496, type: 3}
|
||||
m_ShaderKeywords:
|
||||
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}
|
||||
- _Mask:
|
||||
m_Texture: {fileID: 0}
|
||||
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}
|
||||
- _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:
|
||||
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
|
||||
- _GlossMapScale: 1
|
||||
- _Glossiness: 0.5
|
||||
- _GlossyReflections: 1
|
||||
- _Metallic: 0
|
||||
- _Mode: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.02
|
||||
- _SmoothnessTextureChannel: 0
|
||||
- _SpecularHighlights: 1
|
||||
- _SrcBlend: 1
|
||||
- _U: 0.2
|
||||
- _UVSec: 0
|
||||
- _V: 0.7
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _Color_wai: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 690377177e4787b46b1a8d22001d52f0
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -288,6 +288,17 @@ function this.StartCountTime()
|
|||
hourText.text = hour
|
||||
|
||||
second = second -1
|
||||
if second <= 0 then
|
||||
if this.parent then
|
||||
this.parent:ClosePanel()
|
||||
else
|
||||
UIManager.OpenPanel(UIName.MainPanel)
|
||||
end
|
||||
if this.TimeCounter then
|
||||
this.TimeCounter:Stop()
|
||||
this.TimeCounter = nil
|
||||
end
|
||||
end
|
||||
end
|
||||
_TimeUpdate()
|
||||
this.TimeCounter = Timer.New(_TimeUpdate, 1, -1, true)
|
||||
|
|
|
@ -42,7 +42,8 @@ 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.UpView = SubUIManager.Open(SubUIConfig.UpView, self.transform, { showType = UpViewOpenType.ShowLeft})
|
||||
end
|
||||
|
@ -248,11 +249,15 @@ function this.RefreshShow(isForceBottom)
|
|||
local particles=this.scrollRoot:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem))
|
||||
for key, value in pairs(particles:ToTable()) do
|
||||
local mat=value:GetComponent(typeof(UnityEngine.Renderer))
|
||||
mat.material.shader=Shader.Find("CGwell FX/Additive Lv1_1")
|
||||
-- mat.material.shader=Shader.Find("CGwell FX/Additive Lv1_1")
|
||||
mat.material.shader=this.shader1
|
||||
--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.shader=Shader.Find("Custom/S_03_UV_alpha_add_1")
|
||||
--value.material= resMgr:LoadAsset("chenghao_mat2")
|
||||
value.material.shader=this.shader2
|
||||
end
|
||||
|
||||
end, _GoToIndex)
|
||||
|
|
|
@ -151,7 +151,7 @@ function RewardItemPopup:OnOpen(...)
|
|||
this.TaSuiLingXiaoShow()
|
||||
end
|
||||
--如果没有掉落就return
|
||||
if #drop.itemlist < 1 and #drop.equipId < 1 and #drop.Hero < 1 and #drop.soulEquip < 1 and #drop.pokemon < 1 then
|
||||
if not drop or (#drop.itemlist < 1 and #drop.equipId < 1 and #drop.Hero < 1 and #drop.soulEquip < 1 and #drop.pokemon < 1) then
|
||||
return
|
||||
end
|
||||
|
||||
|
|
|
@ -114,7 +114,7 @@ local jumpEvnt = {
|
|||
PopupTipPanel.ShowTip(Language[11531])
|
||||
end,
|
||||
[3] = function ()
|
||||
JumpManager.GoJump(36004)
|
||||
JumpManager.GoJump(36005)
|
||||
end,
|
||||
}
|
||||
|
||||
|
@ -157,9 +157,10 @@ function SupremeHeroPopup:BindEvent()
|
|||
--各任务前往按钮
|
||||
for i = 1, #this.rewardBtn do
|
||||
Util.AddClick(this.rewardBtn[i],function()
|
||||
if this.GetMissionState(i) == 0 then
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceClear)
|
||||
if this.GetMissionState(i) == 0 then
|
||||
LogGreen("jfdksljfklsdjf")
|
||||
jumpEvnt[i]()
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceClear)
|
||||
self:ClosePanel()
|
||||
end
|
||||
end)
|
||||
|
@ -197,7 +198,7 @@ function this.InitShowPanel()
|
|||
this.effectTime = nil
|
||||
this.effectTime = Timer.New(function ()
|
||||
canClose = true
|
||||
end, 1.2)
|
||||
end, 5)
|
||||
this.effectTime:Start()
|
||||
end
|
||||
|
||||
|
|
|
@ -255,6 +255,8 @@ function this:StartTimeCount()
|
|||
local refreshTime = ShopManager.GetShopRefreshLeftTime(localSelf.ShopType)
|
||||
if refreshTime >= 0 then
|
||||
localSelf.refreshTime:GetComponent("Text").text = TimeToHMS(refreshTime)
|
||||
elseif refreshTime < 0 and localSelf.ShopType == SHOP_TYPE.ARENA_SHOP then
|
||||
JumpManager.GoJump(20003)
|
||||
end
|
||||
end
|
||||
-- 关闭时间
|
||||
|
|
|
@ -375,7 +375,7 @@ function SingleFightPlayerView:RoleMove(pathList)
|
|||
self.roleCurPos = data
|
||||
local speed = 0.5
|
||||
self.gameObject.transform:DOLocalMove(Vector3(v3.x, v3.y, v3.z - 10), speed, false):OnStart(function () end):OnUpdate(function() --TODO:测试速度
|
||||
if self.isSelf then
|
||||
if self.isSelf and not self.isclose then
|
||||
self:PlayStepSound()
|
||||
local v4 = self.gameObject.transform.localPosition
|
||||
v4.z = TileMapView.ViewCameraPos.z
|
||||
|
|
|
@ -12,6 +12,7 @@ namespace GameEditor.Core.DataConfig
|
|||
public class ConfigExportWindow:EditorWindow
|
||||
{
|
||||
static string m_ExcelPath;
|
||||
static string m_BattleConfigPath;
|
||||
static string m_Bench;
|
||||
static string[] m_Files;
|
||||
static bool[] m_Choose;
|
||||
|
@ -21,6 +22,7 @@ namespace GameEditor.Core.DataConfig
|
|||
private static void ShowConfigWin()
|
||||
{
|
||||
m_ExcelPath = EditorPrefs.GetString("m_ExcelPath");
|
||||
m_BattleConfigPath = EditorPrefs.GetString("m_BattleConfigPath");
|
||||
m_Bench = EditorPrefs.GetString("m_Bench");
|
||||
|
||||
LoadDic();
|
||||
|
@ -64,6 +66,7 @@ namespace GameEditor.Core.DataConfig
|
|||
}
|
||||
// 保存数据
|
||||
EditorPrefs.SetString("m_ExcelPath", m_ExcelPath);
|
||||
EditorPrefs.SetString("m_BattleConfigPath", m_BattleConfigPath);
|
||||
EditorPrefs.SetString("m_Bench", m_Bench);
|
||||
}
|
||||
|
||||
|
@ -111,6 +114,10 @@ namespace GameEditor.Core.DataConfig
|
|||
p.Close();
|
||||
}
|
||||
|
||||
private string[] battleConfigList = new string[]
|
||||
{
|
||||
"PassiveSkillLogicConfig"
|
||||
};
|
||||
|
||||
private void OnGUI()
|
||||
{
|
||||
|
@ -159,7 +166,24 @@ namespace GameEditor.Core.DataConfig
|
|||
// 导表
|
||||
DataConfigWindow.excelALLConfig(true, m_Bench + "/base_data");
|
||||
}
|
||||
|
||||
|
||||
EditorGUILayout.LabelField("战斗数据表同步路径:");
|
||||
m_BattleConfigPath = EditorGUILayout.TextField("", m_BattleConfigPath);
|
||||
if (GUILayout.Button("同步战斗数据表", GUILayout.Height(40f)))
|
||||
{
|
||||
string sourcePath = Application.dataPath + "/ManagedResources/~lua/Config/Data/";
|
||||
for(int i = 0; i < battleConfigList.Length; i++)
|
||||
{
|
||||
string luaFile = sourcePath + battleConfigList[i] + ".lua";
|
||||
string targetPath = m_BattleConfigPath +"/"+ battleConfigList[i] + ".lua";
|
||||
UnityEngine.Debug.Log(battleConfigList[i]);
|
||||
File.Copy(luaFile, targetPath, true);
|
||||
}
|
||||
// 同步
|
||||
UnityEngine.Debug.Log("同步成功");
|
||||
// 保存数据
|
||||
SaveLocalConfig();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue