Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
gaoxin 2021-07-09 14:57:02 +08:00
commit c33b24ba18
8 changed files with 624 additions and 492 deletions

View File

@ -169,7 +169,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 70, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8186227736255178852
@ -634,7 +634,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: 119.5, y: -168.93}
m_AnchoredPosition: {x: 119.5, y: -168.93018}
m_SizeDelta: {x: 147.65, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &724716022821637626
@ -708,7 +708,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -2.6, y: 3.8}
m_AnchoredPosition: {x: -2.5999985, y: 3.7999992}
m_SizeDelta: {x: -24.77, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8066938108999663997
@ -989,7 +989,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3292009929065074264}
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:
@ -1870,7 +1870,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0.000030517578}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8951164883984516019

View File

@ -1270,7 +1270,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1080696917594670099}
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:
@ -7519,7 +7519,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: 55.91, y: -39.2}
m_AnchoredPosition: {x: 55.910004, y: -39.2}
m_SizeDelta: {x: 100.33, y: 55}
m_Pivot: {x: 0.5000001, y: 0.49999842}
--- !u!222 &3262152146561394990
@ -7974,7 +7974,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 1
m_Spacing: 0
m_Spacing: 10
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -9027,7 +9027,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -100.05, y: -118}
m_AnchoredPosition: {x: -100.04999, y: -118}
m_SizeDelta: {x: 71.6, y: 69.93}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3124191691634189011

View File

@ -135,7 +135,7 @@ MonoBehaviour:
m_Top: 21
m_Bottom: 0
m_ChildAlignment: 1
m_Spacing: 36.48
m_Spacing: 10
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -2424,7 +2424,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 73.2, y: 3.8}
m_AnchoredPosition: {x: 73.20001, y: 3.8}
m_SizeDelta: {x: 68.5, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3967800694420428273
@ -2494,7 +2494,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2965682092567935477}
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:

View File

@ -108,9 +108,9 @@ RectTransform:
m_Father: {fileID: 7581135397323237180}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -84.11, y: -516}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 129, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5675656333181562820
@ -220,6 +220,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7581135397323237180}
- component: {fileID: 967181818}
m_Layer: 5
m_Name: rightUp
m_TagString: Untagged
@ -251,6 +252,29 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &967181818
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 581457526545903035}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 22
m_Top: 157
m_Bottom: 0
m_ChildAlignment: 2
m_Spacing: 10
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!1 &749973874398757662
GameObject:
m_ObjectHideFlags: 0
@ -519,9 +543,9 @@ RectTransform:
m_Father: {fileID: 7581135397323237180}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -85.11011, y: -374.79492}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 129, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6020975154716938251
@ -1346,6 +1370,7 @@ GameObject:
- component: {fileID: 370551838751614035}
- component: {fileID: 7215149483906349618}
- component: {fileID: 4837195170920748458}
- component: {fileID: 967181817}
m_Layer: 5
m_Name: btn1
m_TagString: Untagged
@ -1444,6 +1469,26 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &967181817
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2010072987787748508}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 1
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &2326400323695555520
GameObject:
m_ObjectHideFlags: 0
@ -2127,9 +2172,9 @@ RectTransform:
m_Father: {fileID: 7581135397323237180}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -85.11011, y: -231.19531}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 127, y: 135}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2892560023550008126
@ -2319,6 +2364,7 @@ GameObject:
- component: {fileID: 5642535416774203362}
- component: {fileID: 2648886891473817919}
- component: {fileID: 6092898537189118852}
- component: {fileID: 967181816}
m_Layer: 5
m_Name: btn2
m_TagString: Untagged
@ -2417,6 +2463,26 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &967181816
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3764174342196893947}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 1
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &4031734823810109523
GameObject:
m_ObjectHideFlags: 0
@ -2970,7 +3036,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.00000008940697, y: 41.46997}
m_AnchoredPosition: {x: 0.00000008940697, y: 41.47004}
m_SizeDelta: {x: 191.08, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &8570320678613256167
@ -4220,7 +4286,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9021446596343102454}
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:

View File

@ -6407,7 +6407,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 1
m_Spacing: 0
m_Spacing: 10
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0

View File

@ -1862,7 +1862,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 1
m_Spacing: 0
m_Spacing: 10
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0

View File

@ -57,9 +57,9 @@ function TimeLimitUpHero:InitComponent()
self.effect=Util.GetGameObject(self.nextReward,"juneng_chenggong")
self.heroPar=Util.GetGameObject(self.gameObject,"Bg2/curObj")
self.dragView=Util.GetGameObject(self.gameObject,"Bg2/dragView")
self.btn_hero=Util.GetGameObject(self.gameObject,"btn_hero")
self.heroIcon=Util.GetGameObject(self.gameObject,"btn_hero/Icon"):GetComponent("Image")
self.textInfo1=Util.GetGameObject(self.gameObject,"btn_hero/Text"):GetComponent("Text")
self.btn_hero=Util.GetGameObject(self.gameObject,"btngroup/btn_hero")
self.heroIcon=Util.GetGameObject(self.btn_hero,"Icon"):GetComponent("Image")
self.textInfo1=Util.GetGameObject(self.btn_hero,"Text"):GetComponent("Text")
self.textInfo1.text="选择神将"
self.titleImg=Util.GetGameObject(self.gameObject,"Bg2/Image (3)"):GetComponent("Image")
self.callTimeImg=Util.GetGameObject(self.gameObject,"callTimeImg"):GetComponent("Image")
@ -68,8 +68,8 @@ function TimeLimitUpHero:InitComponent()
self.heroNameTxt=Util.GetGameObject(self.gameObject,"Bg2/PreviewBtn/di/Name/Text"):GetComponent("Text")
self.heroProImg=Util.GetGameObject(self.gameObject,"Bg2/PreviewBtn/di/Image"):GetComponent("Image")
self.starPar=Util.GetGameObject(self.gameObject,"Bg2/PreviewBtn/di/Image"):GetComponent("Image")
self.gailvImg=Util.GetGameObject(self.gameObject,"btn_hero/InfoImg2"):GetComponent("Image")
self.changeImg=Util.GetGameObject(self.gameObject,"btn_hero/InfoImg"):GetComponent("Image")
self.gailvImg=Util.GetGameObject(self.btn_hero,"InfoImg2"):GetComponent("Image")
self.changeImg=Util.GetGameObject(self.btn_hero,"InfoImg"):GetComponent("Image")
self.changeImg.sprite=self.spLoader:LoadSprite("x_xinjiangzhaohuan_icondi_ghwj_zh")
self.gailvImg.sprite=self.spLoader:LoadSprite("x_xinjiangzhaohuan_gailv")