Merge branch 'ShaoNv' of http://192.168.1.21:3000/root/miduo_client into ShaoNv
commit
43eea19a01
|
|
@ -205,7 +205,7 @@ function EnemyView:onCreate(go, role, position, root, isBoss, enemyId)
|
|||
self.rageSlider.fillAmount = self.role.Rage / 4
|
||||
self.rageText.gameObject:SetActive(false)
|
||||
self.rageText.text = ""
|
||||
self.currAniName = "Attack"--"fight"
|
||||
self.currAniName = "Stand"--"fight"
|
||||
self.effect_fly = Util.GetGameObject(go, "c_long_zhandou_lizi")
|
||||
self.effect_fly:SetActive(self.role.star >= 14)
|
||||
-- 伤害文字显示
|
||||
|
|
@ -486,7 +486,7 @@ function EnemyView:PlaySpineAnim(gog, time, name, isLoop)
|
|||
gog.AnimationState:SetAnimation(0, "Stand", true)--"fight"
|
||||
end
|
||||
|
||||
self.currAniName = "Attack"--"fight"
|
||||
self.currAniName = "Stand"--"fight"
|
||||
end
|
||||
gog.AnimationState:ClearTracks() -- 清除上一个动画的影响(修复概率攻击动画播放错误的问题)
|
||||
gog.AnimationState:SetAnimation(time, name, isLoop)
|
||||
|
|
|
|||
|
|
@ -352,9 +352,9 @@ function MonsterView:OnSkillCastingStart(skill)
|
|||
end
|
||||
|
||||
if self.isMainPlayer then
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic2, 0, "Attack" , false)--"fight"
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic2, 0, "Stand" , false)--"fight"
|
||||
else
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic2, 0, "Attack" , false)
|
||||
self:PlaySpineAnim(self.RoleLiveGOGraphic2, 0, "Stand" , false)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -525,10 +525,11 @@ function PlayerView:PlaySpineAnim(gog, time, name, isLoop)
|
|||
return
|
||||
end
|
||||
if isLoop then
|
||||
LogError("===========================================")
|
||||
LogError("==========================================="..name)
|
||||
self.currAniName=name
|
||||
gog.AnimationState:SetAnimation(time, name, isLoop)
|
||||
else
|
||||
LogError("==========================================="..name)
|
||||
local _complete = nil
|
||||
_complete = function(state)
|
||||
gog.AnimationState.Complete = gog.AnimationState.Complete - _complete
|
||||
|
|
@ -537,7 +538,7 @@ function PlayerView:PlaySpineAnim(gog, time, name, isLoop)
|
|||
if endWith(gog.gameObject.name,"skill") then
|
||||
gog.gameObject:SetActive(false)
|
||||
else
|
||||
gog.AnimationState:SetAnimation(0, "Skill_01", true)
|
||||
gog.AnimationState:SetAnimation(0, "Stand", true)
|
||||
end
|
||||
end
|
||||
gog.AnimationState:ClearTracks() -- 清除上一个动画的影响(修复概率攻击动画播放错误的问题)
|
||||
|
|
|
|||
|
|
@ -558,7 +558,7 @@ function this:BattleLogic(curPos)
|
|||
if arr then
|
||||
for i = 1, #arr do
|
||||
local anim =arr[i]
|
||||
anim.anim.AnimationState:SetAnimation(0,"Attack",true)
|
||||
anim.anim.AnimationState:SetAnimation(0,"Stand",true)
|
||||
local arrow = Util.GetGameObject(anim.enemy,"attackArr")
|
||||
arrow:SetActive(true)
|
||||
this.SetArrowRot(arrow)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: afbe2b2d204829d45adc0e73d08ff513
|
||||
guid: 455ed5be327f40f42bf4f3951fd1179c
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a574c972bc7fef14dbad322480084222
|
||||
guid: 940c58bd8dbf7614a8a7d5b2571e23b6
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0f371574119df184b8875d37c1dedf3b
|
||||
guid: 9be403688e923714c98bea12516c520a
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 29074c84af0141842a3df0a33f64b1a3
|
||||
guid: 38208e2e3dd8a294f9bc44a4cc338db5
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 59134d29ef6112f48bb5d7cf6637bac3
|
||||
guid: a27d4da23f5b10a41b470bc1937c65a6
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c3869957e4ae97a49aab0a22509ac198
|
||||
guid: f6811383030e4ae409f21a0308d1a3de
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 49b257cedf1b8fe45b414abf72e82158
|
||||
guid: f534b769f1178094f89562a7a55692e5
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 1bdf49cabd796e0479820402acee2213
|
||||
guid: 82dc17d42681db94b9cec9be9daa979d
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 11682946472686c4c8506ac579f7c68d
|
||||
guid: 8dc4f82e9b57a074dbfb3c9478edbda1
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2cb2c7e2100ff604ba376ce811a55d70
|
||||
guid: 7fecac4e341d85c43ab0e5670a53c97c
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: aa6e60536ca9fa74d86b90e3c40e0c6f
|
||||
guid: 966ca222a9859954a8bfca6c92a4221d
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 63645bedb7633084d8e0118520e50b58
|
||||
guid: 5d5c8457ea5823947942af5be1e417cf
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 037cc68705caeb4429e6b452577aff81
|
||||
guid: 9f86c147eed729541beb928403c5aedb
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e0576928ab1b65146a4ea475c0d4b6d0
|
||||
guid: 7c7e0f1edebea794faea9e5b1dbd7967
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e7f454f602139ac4c891f00e5d8cf1ce
|
||||
guid: 268336ac75e67aa449618c8d50e1af03
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 40c71adb8cf55f746a95ec4e1157c165
|
||||
guid: 5adc6e68ede69b842a4533125e9ff0ea
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 95958a956e3f3534e9bcb14cd86d9a84
|
||||
guid: bbb40473ac0384a46b1e21385e8c1252
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 96c8a68bcb1cb264990b2d165f8156b4
|
||||
guid: 643ee74c8f3ce404d9dc2969a9518f67
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 90efbadc74f43cd4a8c2303f49397922
|
||||
guid: 0656c6079c782684c8e308340892f1c3
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ea04c389db664cf41a5b8cdfbc2ab947
|
||||
guid: 66fce85b8d1964b4b84d2501bd1e4bb6
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2a5be7606a65d3c409f016fe7b4311d2
|
||||
guid: eaca407c4eda6e44883d56785c0d8438
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6f35822d12c25894a983a7ebec4dba0e
|
||||
guid: c3a82c77162d11d4bb19d415683e9621
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ded60ef3b83c71d40ae3de4e81ec23f5
|
||||
guid: f100e55d21aed4f4fb372f9983b6f0be
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: caf4deea2c605ab439a39ca3ec516886
|
||||
guid: bf58c1ce1a6f81e42ad662748be31be5
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3313ed49db3ec4848b082717550b7730
|
||||
guid: edb3bb70c3b81ba4cb2685e7f216e5d4
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: baec1bcdfe3c60344b817c7fc446922f
|
||||
guid: edd75c0ac49bff04c92214565c4eaa73
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 1c4126b1f1c80e442bcb5414dc143c52
|
||||
guid: b096c4763c7e1334fae3c6dec85a0132
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 82278395027de854294463fa466873d8
|
||||
guid: 91fdb082f5c574747b2dfc057579dad5
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 54ac6f9f1a3825b40b26d44cd46808ce
|
||||
guid: 3f7fdaf881742144e9f3d056a2bb2f08
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 5d50af22ce16d154498a6e7077d63d46
|
||||
guid: a5939a95df78b3f46aff55d72305d6a2
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: aa83e524b298f5c49ab2d196118c1fbd
|
||||
guid: 4b6aa90b9fdce634db529c9a1d38ef6e
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2ffde1bbf25e6454aa7e7aba0ca5f000
|
||||
guid: ecaeca446112ff6429762513cc1ffe2f
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: fbf5ef2d3382124458d602b8f1db1085
|
||||
guid: fb48401260839d2438848b927c219732
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 78b490aa34f56fa4cb25da87d7a6f5ca
|
||||
guid: 0d45ab219d5025044aea84a40b333890
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: fd7de1523b2512e4697ff0bc467f8ccb
|
||||
guid: 7b1ed8a7032097c45b72846b3869f344
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e42a7a15eff134448839b08d50ac6df0
|
||||
guid: 37953e79ea568dd44b41a34b69d58d02
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b616b6236e91f5a4fa0d8b676e27542c
|
||||
guid: e072fd51eb4bec04a97023a913c3e5b6
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 79029f7b98780474f8f62cd910c84cb5
|
||||
guid: ca5f700322bec2f42b371b5cf7bab199
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 677a49e2c9e3c9947b070019e97d570e
|
||||
guid: 20b6a447bbefe5d4bab6d8cfb8cb2288
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3041387151aaa724bb92a520d3ad9b9c
|
||||
guid: 07e043f1420e15d4f88700f9f81424de
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 4de0e71bfb489c242b2258700d4150de
|
||||
guid: 1c48cabd0399055499d56fa8ef4e0aba
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 76201e843d69b35498e4b5dd2f49c903
|
||||
guid: 263a623e0c17619439419e751ac7d0a6
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b46efe8f0d1aa174dbac619796eef1c7
|
||||
guid: 6a362431019fd0941be1d913509fb8d9
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f28af5d001172644eaecc1878492b8e4
|
||||
guid: dd43baffde7cf264e89e6f17560b2444
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b6844d0583f99c6458f57175803df10e
|
||||
guid: f6af7bc2db4fe384c8a2deacfab9711b
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ee1aaa5635f33f942a0b54d3c7f59426
|
||||
guid: 01f509bd3b997d840bd7cd5b672cab8b
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 39b5f7a4dc8a2ab49b55d9106613567f
|
||||
guid: 616ae9eee91919746ac7a23343c69fab
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: df71d1ce3202cad488e2ca0592d38116
|
||||
guid: afc1e4d512a519e489bc781394bf5187
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e30a8b03447dfc04d8159c93da16b1e5
|
||||
guid: 934327e99f2acff4ba49468eacaccaf7
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3e72c1307f8aacf44886d6e42ddfa361
|
||||
guid: 0f3840bed6f9a2f4cb413e0efc87ca60
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2ae1d539349b3e54f9ecec0aed4aaa90
|
||||
guid: 0261a05766216304d8f693a8f456810e
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 48b50d2642c635c40be8576bc6c3f071
|
||||
guid: 2f4cb32d462a90a4e87a9e19d5a55cb3
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: cefce2c8a25b7e64bb738b2490e68ee9
|
||||
guid: 3bff3d90737220b43bafe559f825407a
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 91c5e69f3a46cfb4f9715f2d1570f6b0
|
||||
guid: cf90ac1eb5c1ba8439763fac16acdbed
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: cb00b7b09bef8c44e851b4fb39665baf
|
||||
guid: b64503075f0fece4bade0fcd16c05b54
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 5e56346b323ba6648b9fb142c12336ac
|
||||
guid: 17245d36c56b80b4bad71c76006ab2ed
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2e8e5e1d42d51154e944adaa3199f75f
|
||||
guid: 68b4b6d2e9fc06b42a5dd30133db0e2e
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b288a31d922224f4aa3059e93588b574
|
||||
guid: ca3aed730dade0549bcf38c651eabc66
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e9531983e6e42b84b89486a06cd9595c
|
||||
guid: 52f01e58a2a4ffc42a440a14285dec89
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e097c77e66705e341b9990991c88c151
|
||||
guid: df5e65eca2606f144967dff2084dec6b
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d85686b4cd5d4634f9de057626eaa87f
|
||||
guid: 3a1e10eb3c67d41479afd389dddd5208
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 851af956f9e40cb45be88719f32dc3a1
|
||||
guid: 176f4249d8ccb8b4da5e95bcc28e90ba
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 7f8680d0a19b2264daf120188ba95b0e
|
||||
guid: 7168f8d7c869ed74caa5e85d56081b3c
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 48ac8122ebaabae46adf78a1e5641ff7
|
||||
guid: 9ad87a99de7639e4bbab8eacbf07dd1b
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 8c4116fb58baa2e4898e87d957e08a83
|
||||
guid: 66cc949b13746014886e570f9b64b808
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b7d1791364fc8ca40847a1840b4c6498
|
||||
guid: f3a61e13561700e4e9d8dad1b66de2d8
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 8974680c378dc7447ac82bf8a7871a7c
|
||||
guid: 558c8789014362145b039063d38550e2
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c0054606e967f654c998e4badc29cf67
|
||||
guid: f0ea525c2be5b3445909837ec43a3204
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 26d53e326f466834b83444909e2ee886
|
||||
guid: 6459523e92482c040906dd047a82059f
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a540dedfadb0677419ac7104df2da0fb
|
||||
guid: c35858b0e25c56f48ba4e656b996c0c2
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 58a86b28e5f75df448be279cb48f2e24
|
||||
guid: 7a3c2217bbc3cd041bba17e4c8bd2248
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 060995cf9f7cfb649995f403099461d6
|
||||
guid: 1ce70e0b7bf14c142a07b0013d2caf7a
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 4e09640c4d493d7448e145547a01269c
|
||||
guid: ec7c7d15982e73242ab887147c6400a5
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c652f0c78ae14c04593a1898e845e069
|
||||
guid: 14248a993d37dfe4a8eac00c40c8d560
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a38fa8f0c1a9c3947b727ec77bc5714f
|
||||
guid: 7754b8ead76ae844091b00562109b7a7
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 90e0ed80dd6126249b7ab76d96b8f916
|
||||
guid: 22aee693470dd224d841533646191a17
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 67952d9124f8ab5498b0ac978bcbdea7
|
||||
guid: 1b4d35ea048d4bb4e9c343fd8bae901c
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ac1f751618f395d47b9731f211ca586f
|
||||
guid: 0843d2bb95d701f45890e2627975d16f
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e8341ef46a700234a9df80d1530aa314
|
||||
guid: dfa8c95ac5528c94caec78d2a3cbb15f
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 5c2813f6d5dae4844a01519dd5c6cb83
|
||||
guid: 067a09b1a352c0548acb2e0d2d7e9b38
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2d423aea17b75d04888a7076d5a9f056
|
||||
guid: 43b1034bada59c74592d8acf870e963e
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b258c7bb45edacd4eb1ddef89f93671e
|
||||
guid: 8e2e5c900fd806b4b8c8e369dbc38673
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3bde787c082e0e04fa895687e54a406a
|
||||
guid: 7ebd9e1657950ea4894dbc003efddff1
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d90221ec6cbad8643b007f9f900a2f71
|
||||
guid: 92f33cbf5932e97439f273dd1fefcd3e
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0e6ef6fd040a369428d6c7bccf983178
|
||||
guid: de8038731cf07114ca9503939ffce5ba
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 31dd8e2a7fa49934896fb48e886f103c
|
||||
guid: 111dfe3740f92a448b4c8b21f8f1a1f3
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 75439685dacae814eaf3906ae02490c2
|
||||
guid: 2f2f9c3687fabe643bcf538eec9a853c
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ad9553323f31233438ed507c859a438e
|
||||
guid: fae64c17012051a4db92da3ea8f8874a
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 094801a33145872409a0037290c760e9
|
||||
guid: ad57d8ada88da754cbe81e7592ffac18
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3a28a3b34d58aa647bdebcf264e3701f
|
||||
guid: 4be1121f0a3bc5742bf3828b3aeac7a6
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6d3316b2bd57b3f4091e8d08aa5453e9
|
||||
guid: cdd0e5eeccc07784ca8ff1faf2899232
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 1d75814b151730e4086f43df7929aeb4
|
||||
guid: 13c3c9b6d204d0748ac2de3f949c3468
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0b6523931517c9b4c86d8145f413864f
|
||||
guid: 55c9f7eb08e0ba444af4622ded7bf976
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 98e29d0ed8c6ca74bad673459270a48b
|
||||
guid: 2a1a8b2fb4168ff46b2a8c2bf56ba679
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 16fce16675ac20d4ea041583fa56517e
|
||||
guid: adbd3ff52d7cc1e42bda9bc15c065747
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0eee73f5b0963d14b97e1e613a33f3af
|
||||
guid: 0b276ca3aa117e643bea6a27e7edd183
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue