Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop
commit
f2df1887b8
|
@ -2838,7 +2838,7 @@ MonoBehaviour:
|
||||||
m_Top: 0
|
m_Top: 0
|
||||||
m_Bottom: 0
|
m_Bottom: 0
|
||||||
m_ChildAlignment: 5
|
m_ChildAlignment: 5
|
||||||
m_Spacing: 0
|
m_Spacing: 30
|
||||||
m_ChildForceExpandWidth: 0
|
m_ChildForceExpandWidth: 0
|
||||||
m_ChildForceExpandHeight: 0
|
m_ChildForceExpandHeight: 0
|
||||||
m_ChildControlWidth: 1
|
m_ChildControlWidth: 1
|
||||||
|
@ -10464,6 +10464,11 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 244206589150588327}
|
m_TransformParent: {fileID: 244206589150588327}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: saoguang-lingmai
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 590977968937641174, guid: 1d457c772e4a1b24eaa011cd8aaffef9,
|
- target: {fileID: 590977968937641174, guid: 1d457c772e4a1b24eaa011cd8aaffef9,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -10569,11 +10574,6 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0.5
|
value: 0.5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: saoguang-lingmai
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3}
|
||||||
--- !u!224 &304627812812909889 stripped
|
--- !u!224 &304627812812909889 stripped
|
||||||
|
@ -10589,6 +10589,11 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 700173074565294965}
|
m_TransformParent: {fileID: 700173074565294965}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 1083836935691712642, guid: 60d9930f7168aa844b98df506ce1707b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: ui-tianmen-huang
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712645, guid: 60d9930f7168aa844b98df506ce1707b,
|
- target: {fileID: 1083836935691712645, guid: 60d9930f7168aa844b98df506ce1707b,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -10694,11 +10699,6 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0.5
|
value: 0.5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712642, guid: 60d9930f7168aa844b98df506ce1707b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: ui-tianmen-huang
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 60d9930f7168aa844b98df506ce1707b, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 60d9930f7168aa844b98df506ce1707b, type: 3}
|
||||||
--- !u!224 &234066804788468945 stripped
|
--- !u!224 &234066804788468945 stripped
|
||||||
|
@ -10714,6 +10714,11 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 7234225016545137519}
|
m_TransformParent: {fileID: 7234225016545137519}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 1083836935691712642, guid: aab31648dd1d85c4391bd8220e3bb242,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: ui-tianmen-lan
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242,
|
- target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -10819,11 +10824,6 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0.5
|
value: 0.5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712642, guid: aab31648dd1d85c4391bd8220e3bb242,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: ui-tianmen-lan
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3}
|
||||||
--- !u!224 &1972959484734254725 stripped
|
--- !u!224 &1972959484734254725 stripped
|
||||||
|
@ -10964,6 +10964,11 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 7306400500366346521}
|
m_TransformParent: {fileID: 7306400500366346521}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 1083836935691712642, guid: 7733885d3e1a93b47a74dba9ec64227c,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: ui-tianmen-zi
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712645, guid: 7733885d3e1a93b47a74dba9ec64227c,
|
- target: {fileID: 1083836935691712645, guid: 7733885d3e1a93b47a74dba9ec64227c,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -11069,11 +11074,6 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0.5
|
value: 0.5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712642, guid: 7733885d3e1a93b47a74dba9ec64227c,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: ui-tianmen-zi
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 7733885d3e1a93b47a74dba9ec64227c, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 7733885d3e1a93b47a74dba9ec64227c, type: 3}
|
||||||
--- !u!224 &1712908599432746563 stripped
|
--- !u!224 &1712908599432746563 stripped
|
||||||
|
@ -11089,6 +11089,11 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 7234225016545137519}
|
m_TransformParent: {fileID: 7234225016545137519}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 1083836935691712642, guid: 7733885d3e1a93b47a74dba9ec64227c,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: ui-tianmen-zi
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712645, guid: 7733885d3e1a93b47a74dba9ec64227c,
|
- target: {fileID: 1083836935691712645, guid: 7733885d3e1a93b47a74dba9ec64227c,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -11194,11 +11199,6 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0.5
|
value: 0.5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712642, guid: 7733885d3e1a93b47a74dba9ec64227c,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: ui-tianmen-zi
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 7733885d3e1a93b47a74dba9ec64227c, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 7733885d3e1a93b47a74dba9ec64227c, type: 3}
|
||||||
--- !u!224 &1455950645390051810 stripped
|
--- !u!224 &1455950645390051810 stripped
|
||||||
|
@ -11214,6 +11214,11 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 7306400500366346521}
|
m_TransformParent: {fileID: 7306400500366346521}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 1083836935691712642, guid: aab31648dd1d85c4391bd8220e3bb242,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: ui-tianmen-lan
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242,
|
- target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -11319,11 +11324,6 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0.5
|
value: 0.5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712642, guid: aab31648dd1d85c4391bd8220e3bb242,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: ui-tianmen-lan
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3}
|
||||||
--- !u!224 &1356994937208134561 stripped
|
--- !u!224 &1356994937208134561 stripped
|
||||||
|
@ -11339,6 +11339,11 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 4932177533375895365}
|
m_TransformParent: {fileID: 4932177533375895365}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: saoguang-lingmai
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 590977968937641174, guid: 1d457c772e4a1b24eaa011cd8aaffef9,
|
- target: {fileID: 590977968937641174, guid: 1d457c772e4a1b24eaa011cd8aaffef9,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -11444,11 +11449,6 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0.5
|
value: 0.5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: saoguang-lingmai
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3}
|
||||||
--- !u!224 &1598171261750241261 stripped
|
--- !u!224 &1598171261750241261 stripped
|
||||||
|
@ -11589,6 +11589,11 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 700173074565294965}
|
m_TransformParent: {fileID: 700173074565294965}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 1083836935691712642, guid: aab31648dd1d85c4391bd8220e3bb242,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: ui-tianmen-lan
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242,
|
- target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -11694,11 +11699,6 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0.5
|
value: 0.5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712642, guid: aab31648dd1d85c4391bd8220e3bb242,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: ui-tianmen-lan
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3}
|
||||||
--- !u!224 &3180477938823186567 stripped
|
--- !u!224 &3180477938823186567 stripped
|
||||||
|
@ -11714,6 +11714,11 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 3875862869781190770}
|
m_TransformParent: {fileID: 3875862869781190770}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 1083836935691712642, guid: aab31648dd1d85c4391bd8220e3bb242,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: ui-tianmen-lan
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242,
|
- target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -11819,11 +11824,6 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0.5
|
value: 0.5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712642, guid: aab31648dd1d85c4391bd8220e3bb242,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: ui-tianmen-lan
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3}
|
||||||
--- !u!224 &3005917890185233696 stripped
|
--- !u!224 &3005917890185233696 stripped
|
||||||
|
@ -11839,6 +11839,11 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 8792009063685705141}
|
m_TransformParent: {fileID: 8792009063685705141}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 1083836935691712642, guid: 60d9930f7168aa844b98df506ce1707b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: ui-tianmen-huang
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712645, guid: 60d9930f7168aa844b98df506ce1707b,
|
- target: {fileID: 1083836935691712645, guid: 60d9930f7168aa844b98df506ce1707b,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -11944,11 +11949,6 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0.5
|
value: 0.5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712642, guid: 60d9930f7168aa844b98df506ce1707b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: ui-tianmen-huang
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 60d9930f7168aa844b98df506ce1707b, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 60d9930f7168aa844b98df506ce1707b, type: 3}
|
||||||
--- !u!224 &2876328157392863115 stripped
|
--- !u!224 &2876328157392863115 stripped
|
||||||
|
@ -11964,6 +11964,11 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 3335950387263910954}
|
m_TransformParent: {fileID: 3335950387263910954}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: saoguang-lingmai
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 590977968937641174, guid: 1d457c772e4a1b24eaa011cd8aaffef9,
|
- target: {fileID: 590977968937641174, guid: 1d457c772e4a1b24eaa011cd8aaffef9,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -12069,11 +12074,6 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0.5
|
value: 0.5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: saoguang-lingmai
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3}
|
||||||
--- !u!224 &4086917376022267521 stripped
|
--- !u!224 &4086917376022267521 stripped
|
||||||
|
@ -12214,6 +12214,11 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 700173074565294965}
|
m_TransformParent: {fileID: 700173074565294965}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 1083836935691712642, guid: 7733885d3e1a93b47a74dba9ec64227c,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: ui-tianmen-zi
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712645, guid: 7733885d3e1a93b47a74dba9ec64227c,
|
- target: {fileID: 1083836935691712645, guid: 7733885d3e1a93b47a74dba9ec64227c,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -12319,11 +12324,6 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0.5
|
value: 0.5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712642, guid: 7733885d3e1a93b47a74dba9ec64227c,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: ui-tianmen-zi
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 7733885d3e1a93b47a74dba9ec64227c, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 7733885d3e1a93b47a74dba9ec64227c, type: 3}
|
||||||
--- !u!224 &5053420927314057790 stripped
|
--- !u!224 &5053420927314057790 stripped
|
||||||
|
@ -12339,6 +12339,11 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 5278936056957735961}
|
m_TransformParent: {fileID: 5278936056957735961}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: saoguang-lingmai
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 590977968937641174, guid: 1d457c772e4a1b24eaa011cd8aaffef9,
|
- target: {fileID: 590977968937641174, guid: 1d457c772e4a1b24eaa011cd8aaffef9,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -12444,11 +12449,6 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0.5
|
value: 0.5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: saoguang-lingmai
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3}
|
||||||
--- !u!224 &4911996841393389956 stripped
|
--- !u!224 &4911996841393389956 stripped
|
||||||
|
@ -12464,6 +12464,11 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 3875862869781190770}
|
m_TransformParent: {fileID: 3875862869781190770}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 1083836935691712642, guid: 60d9930f7168aa844b98df506ce1707b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: ui-tianmen-huang
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712645, guid: 60d9930f7168aa844b98df506ce1707b,
|
- target: {fileID: 1083836935691712645, guid: 60d9930f7168aa844b98df506ce1707b,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -12569,11 +12574,6 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0.5
|
value: 0.5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712642, guid: 60d9930f7168aa844b98df506ce1707b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: ui-tianmen-huang
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 60d9930f7168aa844b98df506ce1707b, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 60d9930f7168aa844b98df506ce1707b, type: 3}
|
||||||
--- !u!224 &6823032568207958107 stripped
|
--- !u!224 &6823032568207958107 stripped
|
||||||
|
@ -12589,6 +12589,11 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 8792009063685705141}
|
m_TransformParent: {fileID: 8792009063685705141}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 1083836935691712642, guid: 7733885d3e1a93b47a74dba9ec64227c,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: ui-tianmen-zi
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712645, guid: 7733885d3e1a93b47a74dba9ec64227c,
|
- target: {fileID: 1083836935691712645, guid: 7733885d3e1a93b47a74dba9ec64227c,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -12694,11 +12699,6 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0.5
|
value: 0.5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712642, guid: 7733885d3e1a93b47a74dba9ec64227c,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: ui-tianmen-zi
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 7733885d3e1a93b47a74dba9ec64227c, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 7733885d3e1a93b47a74dba9ec64227c, type: 3}
|
||||||
--- !u!224 &6152451778378219186 stripped
|
--- !u!224 &6152451778378219186 stripped
|
||||||
|
@ -12714,6 +12714,11 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 7306400500366346521}
|
m_TransformParent: {fileID: 7306400500366346521}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 1083836935691712642, guid: 60d9930f7168aa844b98df506ce1707b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: ui-tianmen-huang
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712645, guid: 60d9930f7168aa844b98df506ce1707b,
|
- target: {fileID: 1083836935691712645, guid: 60d9930f7168aa844b98df506ce1707b,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -12819,11 +12824,6 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0.5
|
value: 0.5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712642, guid: 60d9930f7168aa844b98df506ce1707b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: ui-tianmen-huang
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 60d9930f7168aa844b98df506ce1707b, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 60d9930f7168aa844b98df506ce1707b, type: 3}
|
||||||
--- !u!224 &6108601459624173648 stripped
|
--- !u!224 &6108601459624173648 stripped
|
||||||
|
@ -12964,6 +12964,11 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 7956670939729184609}
|
m_TransformParent: {fileID: 7956670939729184609}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: saoguang-lingmai
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 590977968937641174, guid: 1d457c772e4a1b24eaa011cd8aaffef9,
|
- target: {fileID: 590977968937641174, guid: 1d457c772e4a1b24eaa011cd8aaffef9,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -13069,11 +13074,6 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0.5
|
value: 0.5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: saoguang-lingmai
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3}
|
||||||
--- !u!224 &7538858967603096275 stripped
|
--- !u!224 &7538858967603096275 stripped
|
||||||
|
@ -13089,6 +13089,11 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 8792009063685705141}
|
m_TransformParent: {fileID: 8792009063685705141}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 1083836935691712642, guid: aab31648dd1d85c4391bd8220e3bb242,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: ui-tianmen-lan
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242,
|
- target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -13194,11 +13199,6 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0.5
|
value: 0.5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712642, guid: aab31648dd1d85c4391bd8220e3bb242,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: ui-tianmen-lan
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3}
|
||||||
--- !u!224 &7023390841172906733 stripped
|
--- !u!224 &7023390841172906733 stripped
|
||||||
|
@ -13214,6 +13214,11 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 7234225016545137519}
|
m_TransformParent: {fileID: 7234225016545137519}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 1083836935691712642, guid: 60d9930f7168aa844b98df506ce1707b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: ui-tianmen-huang
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712645, guid: 60d9930f7168aa844b98df506ce1707b,
|
- target: {fileID: 1083836935691712645, guid: 60d9930f7168aa844b98df506ce1707b,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -13319,11 +13324,6 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0.5
|
value: 0.5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712642, guid: 60d9930f7168aa844b98df506ce1707b,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: ui-tianmen-huang
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 60d9930f7168aa844b98df506ce1707b, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 60d9930f7168aa844b98df506ce1707b, type: 3}
|
||||||
--- !u!224 &8363769760732197860 stripped
|
--- !u!224 &8363769760732197860 stripped
|
||||||
|
@ -13339,6 +13339,11 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 3875862869781190770}
|
m_TransformParent: {fileID: 3875862869781190770}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 1083836935691712642, guid: 7733885d3e1a93b47a74dba9ec64227c,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: ui-tianmen-zi
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712645, guid: 7733885d3e1a93b47a74dba9ec64227c,
|
- target: {fileID: 1083836935691712645, guid: 7733885d3e1a93b47a74dba9ec64227c,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -13444,11 +13449,6 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0.5
|
value: 0.5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 1083836935691712642, guid: 7733885d3e1a93b47a74dba9ec64227c,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: ui-tianmen-zi
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 7733885d3e1a93b47a74dba9ec64227c, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 7733885d3e1a93b47a74dba9ec64227c, type: 3}
|
||||||
--- !u!224 &8235811258509859674 stripped
|
--- !u!224 &8235811258509859674 stripped
|
||||||
|
|
|
@ -248,21 +248,22 @@ function LingMaiMiJingPanel:SetTime()
|
||||||
end
|
end
|
||||||
local time = self.data.endTime - GetTimeStamp()
|
local time = self.data.endTime - GetTimeStamp()
|
||||||
local timeStayAtHere = GetTimeStamp() - self.data.startTime
|
local timeStayAtHere = GetTimeStamp() - self.data.startTime
|
||||||
|
local allStayTime=tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig,158).Value)
|
||||||
--我已占领了多久
|
--我已占领了多久
|
||||||
self.mytime.text = string.format("%s分",math.floor( timeStayAtHere/60 ))
|
self.mytime.text = string.format("%s/%s分",math.floor(timeStayAtHere/60),allStayTime/60)
|
||||||
--判断上方时间显示文字
|
--判断上方时间显示文字
|
||||||
local text = TEXTLIST[self.data.state]
|
local text = TEXTLIST[self.data.state]
|
||||||
if self.data.state == 2 and CalculateSecondsNowTo_N_OClock(24) <= 10800 then
|
if self.data.state == 2 and CalculateSecondsNowTo_N_OClock(24) <= 10800 then
|
||||||
text = TEXTLIST[3]
|
text = TEXTLIST[3]
|
||||||
else
|
else
|
||||||
end
|
end
|
||||||
local allStayTime=tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig,158).Value)
|
|
||||||
self.leftTime.text = string.format(text,TimeToHMS(time))
|
self.leftTime.text = string.format(text,TimeToHMS(time))
|
||||||
self.timer = Timer.New(function ()
|
self.timer = Timer.New(function ()
|
||||||
time = time - 1
|
time = time - 1
|
||||||
timeStayAtHere = timeStayAtHere + 1
|
timeStayAtHere = timeStayAtHere + 1
|
||||||
self.leftTime.text = string.format(text,TimeToHMS(time))
|
self.leftTime.text = string.format(text,TimeToHMS(time))
|
||||||
self.mytime.text = string.format("%s分",math.floor( timeStayAtHere/60 ))
|
self.mytime.text = string.format("%s/%s分",math.floor(timeStayAtHere/60),allStayTime/60)
|
||||||
self.recordRed:SetActive(LingMaiMiJingManager.CheckRecord())
|
self.recordRed:SetActive(LingMaiMiJingManager.CheckRecord())
|
||||||
if time <= 0 or timeStayAtHere>allStayTime then
|
if time <= 0 or timeStayAtHere>allStayTime then
|
||||||
self:OnShow()
|
self:OnShow()
|
||||||
|
|
Loading…
Reference in New Issue