Merge branch 'dev' into fang/dungeon
# Conflicts: # Assets/lua/app/config/item.lua.bytes # Assets/lua/app/config/localization/localization_global_const.lua.bytes # Assets/lua/app/config/skill.lua.bytes # Assets/lua/app/config/strings/cn/global.lua.bytes # Assets/lua/app/config/strings/cn/item.lua.bytes # Assets/lua/app/config/strings/de/item.lua.bytes # Assets/lua/app/config/strings/en/global.lua.bytes # Assets/lua/app/config/strings/en/item.lua.bytes # Assets/lua/app/config/strings/fr/item.lua.bytes # Assets/lua/app/config/strings/id/item.lua.bytes # Assets/lua/app/config/strings/ja/item.lua.bytes # Assets/lua/app/config/strings/ko/item.lua.bytes # Assets/lua/app/config/strings/pt/item.lua.bytes # Assets/lua/app/config/strings/ru/item.lua.bytes # Assets/lua/app/config/strings/th/item.lua.bytes # Assets/lua/app/config/strings/vi/item.lua.bytes # Assets/lua/app/config/strings/zh/global.lua.bytes # Assets/lua/app/config/strings/zh/item.lua.bytes # Assets/lua/app/module/battle/battle_const.lua.bytes # Assets/lua/app/module/battle/controller/battle_controller.lua.bytes # Assets/lua/app/ui/battle/battle_ui.lua.bytes # Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
This commit is contained in:
commit
ee97ab1c93
@ -45,7 +45,7 @@ AnimationClip:
|
|||||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.28333333
|
time: 0.6
|
||||||
value: {x: 0, y: 0, z: 0}
|
value: {x: 0, y: 0, z: 0}
|
||||||
inSlope: {x: 0, y: 0, z: 0}
|
inSlope: {x: 0, y: 0, z: 0}
|
||||||
outSlope: {x: 0, y: 0, z: 0}
|
outSlope: {x: 0, y: 0, z: 0}
|
||||||
@ -54,7 +54,7 @@ AnimationClip:
|
|||||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.81666666
|
||||||
value: {x: 0, y: 0, z: 0}
|
value: {x: 0, y: 0, z: 0}
|
||||||
inSlope: {x: 0, y: 0, z: 0}
|
inSlope: {x: 0, y: 0, z: 0}
|
||||||
outSlope: {x: 0, y: 0, z: 0}
|
outSlope: {x: 0, y: 0, z: 0}
|
||||||
@ -99,7 +99,16 @@ AnimationClip:
|
|||||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.6
|
||||||
|
value: {x: 1, y: 1, z: 1}
|
||||||
|
inSlope: {x: 0, y: 0, z: 0}
|
||||||
|
outSlope: {x: 0, y: 0, z: 0}
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.81666666
|
||||||
value: {x: 0, y: 0, z: 0}
|
value: {x: 0, y: 0, z: 0}
|
||||||
inSlope: {x: 0, y: 0, z: 0}
|
inSlope: {x: 0, y: 0, z: 0}
|
||||||
outSlope: {x: 0, y: 0, z: 0}
|
outSlope: {x: 0, y: 0, z: 0}
|
||||||
@ -155,14 +164,14 @@ AnimationClip:
|
|||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.083333336
|
time: 0.083333336
|
||||||
value: -50
|
value: -50
|
||||||
inSlope: -140
|
inSlope: -85.71429
|
||||||
outSlope: -140
|
outSlope: -85.71429
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.81666666
|
||||||
value: -70
|
value: -70
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
@ -201,14 +210,14 @@ AnimationClip:
|
|||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.25
|
time: 0.25
|
||||||
value: 130
|
value: 130
|
||||||
inSlope: 96
|
inSlope: 54.545452
|
||||||
outSlope: 96
|
outSlope: 54.545452
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.81666666
|
||||||
value: 140
|
value: 140
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
@ -272,7 +281,7 @@ AnimationClip:
|
|||||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||||
m_AdditiveReferencePoseTime: 0
|
m_AdditiveReferencePoseTime: 0
|
||||||
m_StartTime: 0
|
m_StartTime: 0
|
||||||
m_StopTime: 0.5
|
m_StopTime: 0.81666666
|
||||||
m_OrientationOffsetY: 0
|
m_OrientationOffsetY: 0
|
||||||
m_Level: 0
|
m_Level: 0
|
||||||
m_CycleOffset: 0
|
m_CycleOffset: 0
|
||||||
@ -329,7 +338,7 @@ AnimationClip:
|
|||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.81666666
|
||||||
value: 0
|
value: 0
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
@ -357,7 +366,7 @@ AnimationClip:
|
|||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.81666666
|
||||||
value: 0
|
value: 0
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
@ -403,7 +412,7 @@ AnimationClip:
|
|||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.28333333
|
time: 0.6
|
||||||
value: 0
|
value: 0
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
@ -412,7 +421,7 @@ AnimationClip:
|
|||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.81666666
|
||||||
value: 0
|
value: 0
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
@ -442,14 +451,14 @@ AnimationClip:
|
|||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.083333336
|
time: 0.083333336
|
||||||
value: -50
|
value: -50
|
||||||
inSlope: -140
|
inSlope: -85.71429
|
||||||
outSlope: -140
|
outSlope: -85.71429
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.81666666
|
||||||
value: -70
|
value: -70
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
@ -488,14 +497,14 @@ AnimationClip:
|
|||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.25
|
time: 0.25
|
||||||
value: 130
|
value: 130
|
||||||
inSlope: 96
|
inSlope: 54.545452
|
||||||
outSlope: 96
|
outSlope: 54.545452
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.81666666
|
||||||
value: 140
|
value: 140
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
@ -541,7 +550,16 @@ AnimationClip:
|
|||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.6
|
||||||
|
value: 1
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.81666666
|
||||||
value: 0
|
value: 0
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
@ -587,7 +605,16 @@ AnimationClip:
|
|||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.6
|
||||||
|
value: 1
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.81666666
|
||||||
value: 0
|
value: 0
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
@ -633,7 +660,16 @@ AnimationClip:
|
|||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.6
|
||||||
|
value: 1
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.81666666
|
||||||
value: 0
|
value: 0
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
|
|||||||
@ -45,7 +45,7 @@ AnimationClip:
|
|||||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.28333333
|
time: 0.6
|
||||||
value: {x: 0, y: 0, z: 0}
|
value: {x: 0, y: 0, z: 0}
|
||||||
inSlope: {x: 0, y: 0, z: 0}
|
inSlope: {x: 0, y: 0, z: 0}
|
||||||
outSlope: {x: 0, y: 0, z: 0}
|
outSlope: {x: 0, y: 0, z: 0}
|
||||||
@ -54,7 +54,7 @@ AnimationClip:
|
|||||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.81666666
|
||||||
value: {x: 0, y: 0, z: 0}
|
value: {x: 0, y: 0, z: 0}
|
||||||
inSlope: {x: 0, y: 0, z: 0}
|
inSlope: {x: 0, y: 0, z: 0}
|
||||||
outSlope: {x: 0, y: 0, z: 0}
|
outSlope: {x: 0, y: 0, z: 0}
|
||||||
@ -99,7 +99,16 @@ AnimationClip:
|
|||||||
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.6
|
||||||
|
value: {x: 1, y: 1, z: 1}
|
||||||
|
inSlope: {x: 0, y: 0, z: 0}
|
||||||
|
outSlope: {x: 0, y: 0, z: 0}
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.81666666
|
||||||
value: {x: 0, y: 0, z: 0}
|
value: {x: 0, y: 0, z: 0}
|
||||||
inSlope: {x: 0, y: 0, z: 0}
|
inSlope: {x: 0, y: 0, z: 0}
|
||||||
outSlope: {x: 0, y: 0, z: 0}
|
outSlope: {x: 0, y: 0, z: 0}
|
||||||
@ -155,14 +164,14 @@ AnimationClip:
|
|||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.083333336
|
time: 0.083333336
|
||||||
value: 50
|
value: 50
|
||||||
inSlope: 140
|
inSlope: 85.71429
|
||||||
outSlope: 140
|
outSlope: 85.71429
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.81666666
|
||||||
value: 70
|
value: 70
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
@ -201,14 +210,14 @@ AnimationClip:
|
|||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.25
|
time: 0.25
|
||||||
value: 130
|
value: 130
|
||||||
inSlope: 96
|
inSlope: 54.545452
|
||||||
outSlope: 96
|
outSlope: 54.545452
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.81666666
|
||||||
value: 140
|
value: 140
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
@ -272,7 +281,7 @@ AnimationClip:
|
|||||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||||
m_AdditiveReferencePoseTime: 0
|
m_AdditiveReferencePoseTime: 0
|
||||||
m_StartTime: 0
|
m_StartTime: 0
|
||||||
m_StopTime: 0.5
|
m_StopTime: 0.81666666
|
||||||
m_OrientationOffsetY: 0
|
m_OrientationOffsetY: 0
|
||||||
m_Level: 0
|
m_Level: 0
|
||||||
m_CycleOffset: 0
|
m_CycleOffset: 0
|
||||||
@ -347,7 +356,16 @@ AnimationClip:
|
|||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.6
|
||||||
|
value: 1
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.81666666
|
||||||
value: 0
|
value: 0
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
@ -393,7 +411,16 @@ AnimationClip:
|
|||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.6
|
||||||
|
value: 1
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.81666666
|
||||||
value: 0
|
value: 0
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
@ -439,7 +466,16 @@ AnimationClip:
|
|||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.6
|
||||||
|
value: 1
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0.81666666
|
||||||
value: 0
|
value: 0
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
@ -469,14 +505,14 @@ AnimationClip:
|
|||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.083333336
|
time: 0.083333336
|
||||||
value: 50
|
value: 50
|
||||||
inSlope: 140
|
inSlope: 85.71429
|
||||||
outSlope: 140
|
outSlope: 85.71429
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.81666666
|
||||||
value: 70
|
value: 70
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
@ -515,14 +551,14 @@ AnimationClip:
|
|||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.25
|
time: 0.25
|
||||||
value: 130
|
value: 130
|
||||||
inSlope: 96
|
inSlope: 54.545452
|
||||||
outSlope: 96
|
outSlope: 54.545452
|
||||||
tangentMode: 136
|
tangentMode: 136
|
||||||
weightedMode: 0
|
weightedMode: 0
|
||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.81666666
|
||||||
value: 140
|
value: 140
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
@ -550,7 +586,7 @@ AnimationClip:
|
|||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.81666666
|
||||||
value: 0
|
value: 0
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
@ -578,7 +614,7 @@ AnimationClip:
|
|||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.81666666
|
||||||
value: 0
|
value: 0
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
@ -624,7 +660,7 @@ AnimationClip:
|
|||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.28333333
|
time: 0.6
|
||||||
value: 0
|
value: 0
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
@ -633,7 +669,7 @@ AnimationClip:
|
|||||||
inWeight: 0.33333334
|
inWeight: 0.33333334
|
||||||
outWeight: 0.33333334
|
outWeight: 0.33333334
|
||||||
- serializedVersion: 3
|
- serializedVersion: 3
|
||||||
time: 0.5
|
time: 0.81666666
|
||||||
value: 0
|
value: 0
|
||||||
inSlope: 0
|
inSlope: 0
|
||||||
outSlope: 0
|
outSlope: 0
|
||||||
|
|||||||
@ -141,6 +141,7 @@ SpriteAtlas:
|
|||||||
- {fileID: 21300000, guid: ce74095b62dfe7d4dbeba9d77489a676, type: 3}
|
- {fileID: 21300000, guid: ce74095b62dfe7d4dbeba9d77489a676, type: 3}
|
||||||
- {fileID: 21300000, guid: 6d621c5bb7b5cbe419ed63b3f5f9d7d6, type: 3}
|
- {fileID: 21300000, guid: 6d621c5bb7b5cbe419ed63b3f5f9d7d6, type: 3}
|
||||||
- {fileID: 21300000, guid: efb39dcb110bb304094dd6d1052d58eb, type: 3}
|
- {fileID: 21300000, guid: efb39dcb110bb304094dd6d1052d58eb, type: 3}
|
||||||
|
- {fileID: 21300000, guid: b87dcadba2e6bb442a2874411677d1ae, type: 3}
|
||||||
- {fileID: 21300000, guid: a497edeb9fd18b34f945e6ad0a980058, type: 3}
|
- {fileID: 21300000, guid: a497edeb9fd18b34f945e6ad0a980058, type: 3}
|
||||||
- {fileID: 21300000, guid: 8bc7b70c783d5f140b4ddcfbb35f365e, type: 3}
|
- {fileID: 21300000, guid: 8bc7b70c783d5f140b4ddcfbb35f365e, type: 3}
|
||||||
- {fileID: 21300000, guid: 6e0fd41cbc1e6f44e82bedc0d5a92b54, type: 3}
|
- {fileID: 21300000, guid: 6e0fd41cbc1e6f44e82bedc0d5a92b54, type: 3}
|
||||||
@ -260,6 +261,7 @@ SpriteAtlas:
|
|||||||
- battle_obstacle_rocket_down
|
- battle_obstacle_rocket_down
|
||||||
- battle_obstacle_lron_3
|
- battle_obstacle_lron_3
|
||||||
- battle_hinder_17
|
- battle_hinder_17
|
||||||
|
- battle_btn_task
|
||||||
- battle_skill_bg_blue_1
|
- battle_skill_bg_blue_1
|
||||||
- battle_obstacle_silt
|
- battle_obstacle_silt
|
||||||
- battle_skill_line_10
|
- battle_skill_line_10
|
||||||
|
|||||||
@ -25,6 +25,7 @@ MonoBehaviour:
|
|||||||
- {fileID: 21300000, guid: ef0d382b3a69c334485a3da6b4a1b1bd, type: 3}
|
- {fileID: 21300000, guid: ef0d382b3a69c334485a3da6b4a1b1bd, type: 3}
|
||||||
- {fileID: 21300000, guid: ae13651fdfccd754eafa247534bc2602, type: 3}
|
- {fileID: 21300000, guid: ae13651fdfccd754eafa247534bc2602, type: 3}
|
||||||
- {fileID: 21300000, guid: 428dc7da8f35a5740a641b412350196f, type: 3}
|
- {fileID: 21300000, guid: 428dc7da8f35a5740a641b412350196f, type: 3}
|
||||||
|
- {fileID: 21300000, guid: 1bf645aa17a1fa94194d989044eb9a6b, type: 3}
|
||||||
- {fileID: 21300000, guid: cb6f3df0ba4bf6a43b496997afeef3c5, type: 3}
|
- {fileID: 21300000, guid: cb6f3df0ba4bf6a43b496997afeef3c5, type: 3}
|
||||||
- {fileID: 21300000, guid: 8f13ecccc6ac0924a95c9dfcaf551559, type: 3}
|
- {fileID: 21300000, guid: 8f13ecccc6ac0924a95c9dfcaf551559, type: 3}
|
||||||
- {fileID: 21300000, guid: 7a35843cc154240459d64df8b972b216, type: 3}
|
- {fileID: 21300000, guid: 7a35843cc154240459d64df8b972b216, type: 3}
|
||||||
@ -35,4 +36,4 @@ MonoBehaviour:
|
|||||||
- {fileID: 21300000, guid: 8d551bd185f65c84d882369eca19cd03, type: 3}
|
- {fileID: 21300000, guid: 8d551bd185f65c84d882369eca19cd03, type: 3}
|
||||||
- {fileID: 21300000, guid: 2fe1d47a2b60298449b939ddbb06343b, type: 3}
|
- {fileID: 21300000, guid: 2fe1d47a2b60298449b939ddbb06343b, type: 3}
|
||||||
- {fileID: 21300000, guid: f275782590a645a4e887cb6d59347429, type: 3}
|
- {fileID: 21300000, guid: f275782590a645a4e887cb6d59347429, type: 3}
|
||||||
spriteNameList: b2fee9b9c8fee9b9f0fee9b913ffe9b962ffe9b98dffe9b9abffe9b94b00eab98a00eab9bb00eab9fa00eab97501eab94637c61e4737c61e293e7c4a87c0ad22850c1cba860c1cba870c1cba880c1cba890c1cba65e6f5f6
|
spriteNameList: b2fee9b9c8fee9b9f0fee9b913ffe9b962ffe9b98dffe9b9abffe9b94b00eab98a00eab9bb00eab9fa00eab97501eab9abf8f6b94637c61e4737c61e293e7c4a87c0ad22850c1cba860c1cba870c1cba880c1cba890c1cba65e6f5f6
|
||||||
|
|||||||
@ -73,6 +73,7 @@ SpriteAtlas:
|
|||||||
- {fileID: 21300000, guid: 5c2496c8a7252a54db6ec04df885e0db, type: 3}
|
- {fileID: 21300000, guid: 5c2496c8a7252a54db6ec04df885e0db, type: 3}
|
||||||
- {fileID: 21300000, guid: e5eed40ad8ee078429e388683e9754a9, type: 3}
|
- {fileID: 21300000, guid: e5eed40ad8ee078429e388683e9754a9, type: 3}
|
||||||
- {fileID: 21300000, guid: 2fe1d47a2b60298449b939ddbb06343b, type: 3}
|
- {fileID: 21300000, guid: 2fe1d47a2b60298449b939ddbb06343b, type: 3}
|
||||||
|
- {fileID: 21300000, guid: 1bf645aa17a1fa94194d989044eb9a6b, type: 3}
|
||||||
- {fileID: 21300000, guid: 428dc7da8f35a5740a641b412350196f, type: 3}
|
- {fileID: 21300000, guid: 428dc7da8f35a5740a641b412350196f, type: 3}
|
||||||
- {fileID: 21300000, guid: ef0d382b3a69c334485a3da6b4a1b1bd, type: 3}
|
- {fileID: 21300000, guid: ef0d382b3a69c334485a3da6b4a1b1bd, type: 3}
|
||||||
- {fileID: 21300000, guid: dc4c490c976ae854f97b4d48a876936c, type: 3}
|
- {fileID: 21300000, guid: dc4c490c976ae854f97b4d48a876936c, type: 3}
|
||||||
@ -96,6 +97,7 @@ SpriteAtlas:
|
|||||||
- language_pt
|
- language_pt
|
||||||
- setting_dec_1
|
- setting_dec_1
|
||||||
- setting_dec_5
|
- setting_dec_5
|
||||||
|
- setting_apple
|
||||||
- language_zh
|
- language_zh
|
||||||
- language_th
|
- language_th
|
||||||
- setting_dec_2
|
- setting_dec_2
|
||||||
|
|||||||
BIN
Assets/arts/sounds/sfx/battle/12001200.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/12001200.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/12001200.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/12001200.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0a21c7cc66df24c4786b6981fa558eb6
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/arts/sounds/sfx/battle/14001200.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/14001200.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/14001200.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/14001200.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e3401ba9f552fd141a08ab9fac1d5353
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/arts/sounds/sfx/battle/14002200.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/14002200.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/14002200.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/14002200.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 583bbe8e962a32d45be8280b2380d9f5
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/arts/sounds/sfx/battle/22001200.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/22001200.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/22001200.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/22001200.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d1065d2e004959f4bb206ecf96d52ce9
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/arts/sounds/sfx/battle/24001200.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/24001200.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/24001200.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/24001200.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5a48c1bf3156b214da792346839ee759
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/arts/sounds/sfx/battle/24002200.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/24002200.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/24002200.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/24002200.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: c518e32e5a7e38048867c175a92ddf65
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/arts/sounds/sfx/battle/32001200.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/32001200.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/32001200.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/32001200.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 7f0f2defca7eebb4985e2fd416fbcb6e
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/arts/sounds/sfx/battle/34001200.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/34001200.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/34001200.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/34001200.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 91f51b860d4a16741be4cd87e2318af4
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/arts/sounds/sfx/battle/42001200.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/42001200.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/42001200.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/42001200.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6c98b93a866df744e92abe66cfee398a
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/arts/sounds/sfx/battle/44001200.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/44001200.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/44001200.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/44001200.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a02ac519dc34e124ea673f92caa916ee
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/arts/sounds/sfx/battle/54001200.wav
Normal file
BIN
Assets/arts/sounds/sfx/battle/54001200.wav
Normal file
Binary file not shown.
22
Assets/arts/sounds/sfx/battle/54001200.wav.meta
Normal file
22
Assets/arts/sounds/sfx/battle/54001200.wav.meta
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ac07f357f2ae1ab449634716c20bbc3c
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 6
|
||||||
|
defaultSettings:
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 0
|
||||||
|
compressionFormat: 2
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 1
|
||||||
|
normalize: 1
|
||||||
|
preloadAudioData: 0
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 4.1 KiB |
BIN
Assets/arts/textures/ui/battle/battle_btn_task.png
Normal file
BIN
Assets/arts/textures/ui/battle/battle_btn_task.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.8 KiB |
132
Assets/arts/textures/ui/battle/battle_btn_task.png.meta
Normal file
132
Assets/arts/textures/ui/battle/battle_btn_task.png.meta
Normal file
@ -0,0 +1,132 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b87dcadba2e6bb442a2874411677d1ae
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 11
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 1
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 1
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 1
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Android
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 47
|
||||||
|
textureCompression: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: iPhone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 50
|
||||||
|
textureCompression: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 12
|
||||||
|
textureCompression: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/arts/textures/ui/setting/setting_apple.png
Normal file
BIN
Assets/arts/textures/ui/setting/setting_apple.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 676 B |
132
Assets/arts/textures/ui/setting/setting_apple.png.meta
Normal file
132
Assets/arts/textures/ui/setting/setting_apple.png.meta
Normal file
@ -0,0 +1,132 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1bf645aa17a1fa94194d989044eb9a6b
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 11
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 1
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 1
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 1
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Android
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 47
|
||||||
|
textureCompression: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: iPhone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 50
|
||||||
|
textureCompression: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: 12
|
||||||
|
textureCompression: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Assets/lua/app/config/avatar.lua.bytes
Normal file
BIN
Assets/lua/app/config/avatar.lua.bytes
Normal file
Binary file not shown.
7
Assets/lua/app/config/avatar.lua.bytes.meta
Normal file
7
Assets/lua/app/config/avatar.lua.bytes.meta
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3cceb212a1730bd41a3baa39bd1a2287
|
||||||
|
TextScriptImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
4
Assets/lua/app/config/avatar_frame.lua.bytes
Normal file
4
Assets/lua/app/config/avatar_frame.lua.bytes
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
bf_encrypt_luai)1X+H-ø8GH:uua0
|
||||||
|
3D9xI4k5MR0qYxsxX9Z#4Y^N%K'/F
|
||||||
|
X(|\i8reD9xI4j7DR0qz)8r.9x´«µG0ñ:é8r/D¹ù´+·+R0pWi¸r`D9xZÜh5MR0qqm?(V"'j5MR0qqi<w%MM2Z8<Dpqi8seD9xI=k5MS0qqk8reG9xI0k5MT0qqn8reC9xI=k5M[0qqk8reIX(@
|
||||||
|
G4B<reD0xI4lV"<Vn8reM9xI5k5MWo4??
|
||||||
7
Assets/lua/app/config/avatar_frame.lua.bytes.meta
Normal file
7
Assets/lua/app/config/avatar_frame.lua.bytes.meta
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3919c774c82e3ee43b769da7dd365e23
|
||||||
|
TextScriptImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
File diff suppressed because one or more lines are too long
@ -58,22 +58,18 @@ R
|
|||||||
Üúp1æò3¢Ëó9ƒ¾¡´‡Â›1ñkròåɲxÉ4 µLRúq±àò2"Êóx »¡uŠÝúq¹ãòòÔ’8É4!µÍÇ»qñióòdDóx‰½¡u
|
Üúp1æò3¢Ëó9ƒ¾¡´‡Â›1ñkròåɲxÉ4 µLRúq±àò2"Êóx »¡uŠÝúq¹ãòòÔ’8É4!µÍÇ»qñióòdDóx‰½¡u
|
||||||
Üúq1æò2¢Ëóx<EFBFBD>¾¡µ…›1ñiròeÒ38I™ uORzñ±érr¤Åsøˆ¶à5ÍPñ±!i9s4Dx94ê´Rñ° i“2åFsøÉ·à5ÍPñq#i937Dxù4êôRñp"i“2åFsøI²à5ÍRûqpiòò°ÍóøŒ¾¡5‹Ùúñ·å“2åDsøI½à5ÍPûñpiòr¥Íó8º¡5
Ýú1¶æòrÎóø<C3B3>¤`´LR:p±à23"Ê3y »atŠÝ:°¹ã2s¬ÔrùH4!4<>Ûz06çrs%Ës9Ž»!t„Øzð¸ù³ódD³y‰½át
|
Üúq1æò2¢Ëóx<EFBFBD>¾¡µ…›1ñiròeÒ38I™ uORzñ±érr¤Åsøˆ¶à5ÍPñ±!i9s4Dx94ê´Rñ° i“2åFsøÉ·à5ÍPñq#i937Dxù4êôRñp"i“2åFsøI²à5ÍRûqpiòò°ÍóøŒ¾¡5‹Ùúñ·å“2åDsøI½à5ÍPûñpiòr¥Íó8º¡5
Ýú1¶æòrÎóø<C3B3>¤`´LR:p±à23"Ê3y »atŠÝ:°¹ã2s¬ÔrùH4!4<>Ûz06çrs%Ës9Ž»!t„Øzð¸ù³ódD³y‰½át
|
||||||
ܺp1æ²3¢Ë³¹€¾á4‡Âûðpiòs¥Íó9º¡4
Ýú0¶æò3¯Îóùƒ¤ÀuÍPzññä³råDòøH4¡5<C2A1>Ûú16çòr%Ëó8Ž»¡5…Øúñ¹ù“2åDsøÉ¡à5ÍRûñpiòr¥Íó8º¡5
Ýú1¶æòrÎóø<C3B3>¤ÀuÍRzñqÿ22åÖrøI4êuRzqqh¹ò6Ds8 | |||||||