Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 40 KiB |
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 29 KiB |
Before Width: | Height: | Size: 41 KiB After Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 32 KiB |
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 43 KiB |
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 43 KiB |
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 41 KiB |
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 35 KiB |
Before Width: | Height: | Size: 41 KiB After Width: | Height: | Size: 37 KiB |
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 41 KiB After Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 40 KiB |
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 34 KiB |
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 41 KiB |
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 41 KiB |
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 32 KiB |
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 39 KiB |
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 34 KiB |
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 40 KiB |
Before Width: | Height: | Size: 41 KiB After Width: | Height: | Size: 35 KiB |
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 42 KiB |
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 42 KiB |
Before Width: | Height: | Size: 54 KiB After Width: | Height: | Size: 43 KiB |
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 39 KiB |
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 39 KiB |
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 41 KiB |
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 39 KiB |
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 39 KiB |
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 44 KiB |
Before Width: | Height: | Size: 157 KiB After Width: | Height: | Size: 151 KiB |
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 39 KiB |
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 33 KiB |
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 35 KiB |
Before Width: | Height: | Size: 41 KiB After Width: | Height: | Size: 37 KiB |
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 42 KiB |
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 34 KiB |
Before Width: | Height: | Size: 151 KiB After Width: | Height: | Size: 146 KiB |
Before Width: | Height: | Size: 146 KiB After Width: | Height: | Size: 138 KiB |
Before Width: | Height: | Size: 160 KiB After Width: | Height: | Size: 154 KiB |
Before Width: | Height: | Size: 142 KiB After Width: | Height: | Size: 136 KiB |
Before Width: | Height: | Size: 111 KiB After Width: | Height: | Size: 107 KiB |
Before Width: | Height: | Size: 138 KiB After Width: | Height: | Size: 131 KiB |
Before Width: | Height: | Size: 139 KiB After Width: | Height: | Size: 141 KiB |
Before Width: | Height: | Size: 118 KiB After Width: | Height: | Size: 117 KiB |
Before Width: | Height: | Size: 145 KiB After Width: | Height: | Size: 138 KiB |
Before Width: | Height: | Size: 142 KiB After Width: | Height: | Size: 136 KiB |
Before Width: | Height: | Size: 131 KiB After Width: | Height: | Size: 125 KiB |
|
@ -4645,8 +4645,8 @@ RectTransform:
|
|||
m_LocalScale: {x: 1.121, y: 1.121, z: 1.2}
|
||||
m_Children:
|
||||
- {fileID: 7820664161829032137}
|
||||
- {fileID: 1918539805506993827}
|
||||
- {fileID: 3576822251131750030}
|
||||
- {fileID: 1918539805506993827}
|
||||
m_Father: {fileID: 1570819029236701394}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -7194,7 +7194,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 3647066211733455541}
|
||||
m_Father: {fileID: 8614302680793752992}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
@ -9311,8 +9311,8 @@ RectTransform:
|
|||
m_LocalScale: {x: 1.121, y: 1.121, z: 1.2}
|
||||
m_Children:
|
||||
- {fileID: 8122240164478478706}
|
||||
- {fileID: 1870300530701557260}
|
||||
- {fileID: 6069402865800005301}
|
||||
- {fileID: 1870300530701557260}
|
||||
m_Father: {fileID: 1570819029236701394}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -14002,7 +14002,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 5558357353845668213}
|
||||
m_Father: {fileID: 8246325377464232763}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
@ -17906,7 +17906,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 5837765501628571760}
|
||||
m_RootOrder: 2
|
||||
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}
|
||||
|
@ -18223,7 +18223,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 5003439387145888498}
|
||||
m_Father: {fileID: 1204154185889673860}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
@ -22521,8 +22521,8 @@ RectTransform:
|
|||
m_LocalScale: {x: 1.121, y: 1.121, z: 1.2}
|
||||
m_Children:
|
||||
- {fileID: 3303746076602247238}
|
||||
- {fileID: 3667843503506730412}
|
||||
- {fileID: 7447038135754174901}
|
||||
- {fileID: 3667843503506730412}
|
||||
m_Father: {fileID: 1570819029236701394}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -22573,7 +22573,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: -453.95, y: 0}
|
||||
m_AnchoredPosition: {x: -453.95, y: 0.000047771675}
|
||||
m_SizeDelta: {x: 907.9, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &4260212251028292622
|
||||
|
@ -23103,7 +23103,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8246325377464232763}
|
||||
m_RootOrder: 2
|
||||
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}
|
||||
|
@ -25521,7 +25521,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1204154185889673860}
|
||||
m_RootOrder: 2
|
||||
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}
|
||||
|
@ -30063,7 +30063,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8614302680793752992}
|
||||
m_RootOrder: 2
|
||||
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}
|
||||
|
@ -32980,8 +32980,8 @@ RectTransform:
|
|||
m_LocalScale: {x: 1.121, y: 1.121, z: 1.2}
|
||||
m_Children:
|
||||
- {fileID: 727465291898238319}
|
||||
- {fileID: 583723140753549156}
|
||||
- {fileID: 1230547632573238286}
|
||||
- {fileID: 583723140753549156}
|
||||
m_Father: {fileID: 1570819029236701394}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -33891,7 +33891,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 4842428901316839392}
|
||||
m_Father: {fileID: 5837765501628571760}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
|
|
@ -3255,8 +3255,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -9, y: -8}
|
||||
m_SizeDelta: {x: -37.9, y: -16}
|
||||
m_AnchoredPosition: {x: -9, y: -7.1}
|
||||
m_SizeDelta: {x: -37.9, y: -17.8}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6190125941504810157
|
||||
CanvasRenderer:
|
||||
|
@ -5994,7 +5994,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -0.0000292578}
|
||||
m_AnchoredPosition: {x: 0, y: -0.000021783833}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &1537562228229781123
|
||||
|
|
|
@ -257,6 +257,8 @@ function this:OnSortingOrderChange()
|
|||
orginLayer = this.sortingOrder
|
||||
|
||||
BattleView:OnSortingOrderChange(this.sortingOrder)
|
||||
this.UpRoot:GetComponent("Canvas").sortingOrder = this.sortingOrder + 10
|
||||
this.DownRoot:GetComponent("Canvas").sortingOrder = this.sortingOrder + 10
|
||||
end
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
|
|
|
@ -182,10 +182,12 @@ function this.OnTabChange(index, lastIndex)
|
|||
local monster=this.battleRecord.mdata
|
||||
local showList = this.battleRecord.data
|
||||
if showType == 4 then
|
||||
showList = this.battleRecord.mdata
|
||||
showList={}
|
||||
--= this.battleRecord.mdata
|
||||
for key, value in pairs(monster) do
|
||||
if key==100 or key==106 then
|
||||
table.remove(showList,key)
|
||||
if key~=100 and key~=106 then
|
||||
--table.remove(showList,key)
|
||||
table.insert(showList,value)
|
||||
end
|
||||
end
|
||||
else
|
||||
|
|
|
@ -176,7 +176,7 @@ function MonsterView:OnSkillCastStart(skill)
|
|||
--self.RoleLiveGO3.transform.position=Vector3.zero
|
||||
local offset = self.camp == 0 and SpiritAnimal[20100].offset or SpiritAnimal[20100].enemy_offset
|
||||
local add=roleConfig.enemy_offset
|
||||
self.RoleLiveGO3:GetComponent("RectTransform").anchoredPosition = Vector2.New(offset[1]+add[1], offset[2]+add[2]+180)
|
||||
self.RoleLiveGO3:GetComponent("RectTransform").anchoredPosition = Vector2.New(0, offset[2]+add[2]+180)
|
||||
if self.camp==1 then
|
||||
self.RoleLiveGO3.transform.rotation=Vector3.New(0,180,0)
|
||||
end
|
||||
|
|
|
@ -520,7 +520,7 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData)
|
|||
local scale = roleConfig.play_liveScale
|
||||
local livePos = Vector3.New(roleConfig.offset[1], roleConfig.offset[2], 0)
|
||||
live.texture = CardRendererManager.GetSpineTexture(_pos, liveName, Vector3.one * scale, livePos, true)
|
||||
--SetHEeroLiveToward(live,heroData.heroConfig.Toward)
|
||||
SetHEeroLiveToward(live,heroData.heroConfig.Toward)
|
||||
live.transform.localScale = Vector3.one
|
||||
live.transform.localPosition = Vector3.zero
|
||||
|
||||
|
|
|
@ -175,7 +175,7 @@ end
|
|||
function TailsmanSoulChipLottery:refreshBtnShow()
|
||||
local curTimes = PrivilegeManager.GetPrivilegeUsedTimes(self.maxtimesId)
|
||||
self.limit.text ="今日召唤上限:"..curTimes.."/"..privilegeConfig[self.maxtimesId].Condition[1][2]
|
||||
self.btnTime.gameObject:SetActive(true)
|
||||
self.btnTime.gameObject:SetActive(false)
|
||||
local freeTime = 0
|
||||
if self.freeTimesId and self.freeTimesId > 0 then
|
||||
freeTime = PrivilegeManager.GetPrivilegeRemainValue(self.freeTimesId)
|
||||
|
|