diff --git a/.gitignore b/.gitignore
index 7b170cb1..f5378001 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-
+/wb_unity_pro_2/
/wb_unity_pro/
\ No newline at end of file
diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua
index 6634e804..0e87a94f 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua
@@ -198,7 +198,7 @@ function M:EventInit()
if tex_round ~= nil then
tex_round.text = '第 ' .. _room.curren_round .. ' 局'
end
- self._view:GetChild('tex_round').text = '第 ' .. _room.curren_round .. '/' .. _room.room_config.round .. ' 局'
+ self._view:GetChild('tex_round').text = '第 ' .. _room.curren_round .. ' 局 百息结算 '
self._state.selectedIndex = 1
self:closeTipOnTuoguan()
@@ -254,7 +254,7 @@ function M:EventInit()
if tex_round ~= nil then
tex_round.text = '第 ' .. _room.curren_round .. ' 局'
end
- self._view:GetChild('tex_round').text = '第 ' .. _room.curren_round .. '/' .. _room.room_config.round .. ' 局'
+ self._view:GetChild('tex_round').text = '第 ' .. _room.curren_round .. ' 局 百息结算'
self._state.selectedIndex = 1
self:closeTipOnTuoguan()
@@ -630,8 +630,8 @@ function M:EventInit()
local seat = arg[1]
local card = arg[2]
--禁牌 把手上的牌都禁掉
- local card_info = self._player_card_info[self:GetPos(seat)]
- card_info:banHandCards(self._room.self_player.card_list)
+ -- local card_info = self._player_card_info[self:GetPos(seat)]
+ -- card_info:banHandCards(self._room.self_player.card_list)
end
)
@@ -1137,7 +1137,7 @@ function M:ReloadRoom()
if tex_round ~= nil then
tex_round.text = '第 ' .. room.curren_round .. ' 局'
end
- self._view:GetChild('tex_round').text = '第 ' .. room.curren_round .. '/' .. room.room_config.round .. ' 局'
+ self._view:GetChild('tex_round').text = '第 ' .. room.curren_round .. ' 局 百息结算'
end
function M:PlayChatSound(sex, chat_index)
diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua
index b977b1d9..8d2f56d8 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua
@@ -52,14 +52,19 @@ function M:InitData(over, room, result, total_result, callback)
local xipai=self._view:GetChild("btn_xipai")
xipai.touchable=true
xipai.onClick:Add(function()
- local xiPaiCallBack=function ()
- xipai.touchable=false
- self.xiPaiCtr.selectedIndex=0
- ViewUtil.ErrorTip(1000000,"申请洗牌成功")
- end
- local _gamectr = ControllerManager.GetController(GameController)
- _gamectr:SendXiPaiAction(xiPaiCallBack)
- end)
+ local xiPaiCallBack=function ()
+ xipai.touchable=false
+ self.xiPaiCtr.selectedIndex=0
+ ViewUtil.ErrorTip(1000000,"申请洗牌成功")
+
+ local _gamectr = ControllerManager.GetController(GameController)
+ _gamectr:PlayerReady()
+ self:Close()
+
+ end
+ local _gamectr = ControllerManager.GetController(GameController)
+ _gamectr:SendXiPaiAction(xiPaiCallBack)
+ end)
if result and result.xipai_score then
xipai.text="洗牌 积分x"..result.xipai_score
end
diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerCardInfoView.lua
index c648fa47..caf23451 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerCardInfoView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerCardInfoView.lua
@@ -15,7 +15,8 @@ end
function M:UpdateFzList( fz_list ,ispaly,seat)
-
+ print("lingmeng UpdateFzList")
+ pt(fz_list)
self._area_fz_list:RemoveChildren(0,-1,true)
for i = 1,#fz_list do
local fzitem = nil
@@ -47,19 +48,27 @@ function M:UpdateFzList( fz_list ,ispaly,seat)
elseif fz_list[i].type == RB_FZType.Wei then
local fzcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3")
+ -- for j=1,3 do
+ -- fzcards:GetChild("card_"..j).icon ="ui://Main_RunBeard/202_1_300"
+ -- end
+ -- fzcards:GetChild("card_"..3).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card)--jefe
for j=1,3 do
fzcards:GetChild("card_"..j).icon ="ui://Main_RunBeard/202_1_300"
end
- fzcards:GetChild("card_"..3).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card)--jefe
+ fzcards:GetChild("card_"..1).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card)--jefe
fzcards.x,fzcards.y = 0,0
self:playAnim(fzitem,fzcards,#fz_list,i,ispaly,seat)
elseif fz_list[i].type == RB_FZType.ChouWei then
local fzcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3")
- for j=1,2 do
+ -- for j=1,2 do
+ -- fzcards:GetChild("card_"..j).icon ="ui://Main_RunBeard/202_1_300"
+ -- end
+ -- fzcards:GetChild("card_"..3).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card)
+ for j=2,3 do
fzcards:GetChild("card_"..j).icon ="ui://Main_RunBeard/202_1_300"
end
- fzcards:GetChild("card_"..3).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card)
+ fzcards:GetChild("card_"..1).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card)
fzcards.x,fzcards.y = 0,0
self:playAnim(fzitem,fzcards,#fz_list,i,ispaly,seat)
@@ -79,8 +88,15 @@ function M:UpdateFzList( fz_list ,ispaly,seat)
fzcards:GetChild("card_"..j).icon ="ui://Main_RunBeard/202_1_300"
end
else
+ -- for j=1,4 do
+ -- if j==4 then
+ -- fzcards:GetChild("card_"..j).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card)
+ -- else
+ -- fzcards:GetChild("card_"..j).icon ="ui://Main_RunBeard/202_1_300"
+ -- end
+ -- end
for j=1,4 do
- if j==4 then
+ if j==1 then
fzcards:GetChild("card_"..j).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card)
else
fzcards:GetChild("card_"..j).icon ="ui://Main_RunBeard/202_1_300"
@@ -187,6 +203,7 @@ function M:UpdateOutCardList(outcard,isShow,isMopai,seat)
outcards:GetChild("icon").icon ="ui://Main_RunBeard/202_1_300"
else
outcards:GetChild("icon").icon =self:getCardItem("ui://Main_RunBeard/203_",outcard)
+ self._bgview.selectedIndex=1
end
outcards.x,outcards.y = 0,0
local show_di_bg = outcards:GetChild("show_di_bg")
@@ -223,13 +240,15 @@ function M:UpdateOutCardList(outcard,isShow,isMopai,seat)
show_di_bg.visible = false
end
self._area_outcard_list:AddChild(outcards)
+
end
--弃牌
function M:UpdateQiPai( qi_list,ispaly,seat)
self._area_qipai_list:RemoveChildren(0,-1,true)
for i=1,#qi_list do
- local qicards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Qipai")
+ local qicards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Qipais")
+ pt(qicards)
qicards:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/202_",qi_list[i])
if(ispaly)then
if(i == #qi_list) then
diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua
index a91144e1..1b551428 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua
@@ -302,6 +302,7 @@ function M:UpdateOutCardList(outcard,isShow,isMopai,seat)
show_di_bg.visible = false
end
self._area_outcard_list:AddChild(outcards)
+ self._bgview.selectedIndex = 1
end
--弃牌
@@ -323,11 +324,14 @@ end
function M:PlayingOutCardAnima( card)
coroutine.start(function()
coroutine.wait(0.1)
+ self._bgview.selectedIndex = 1
self:ClearOutCard()
end)
end
function M:UpdateFzList( fz_list ,ispaly)
+
+ printlog("UpdateFzList area_fz_list2")
self._area_fz_list:RemoveChildren(0,-1,true)
for i = 1,#fz_list do
local fzitem=nil
@@ -336,7 +340,9 @@ function M:UpdateFzList( fz_list ,ispaly)
if(ispaly == false)then
fzitem:RemoveChildren(0,-1,true)
end
+ printlog(fzitem.width)printlog(fzitem.height)
end
+
if fz_list[i].type == RB_FZType.Chi or fz_list[i].type == RB_FZType.Bi then
local fzcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3")
@@ -345,6 +351,7 @@ function M:UpdateFzList( fz_list ,ispaly)
fzcards:GetChild("card_"..2).icon = self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].opcard[1])
fzcards:GetChild("card_"..3).icon = self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].opcard[2])
fzcards.x,fzcards.y = 0,0
+
self:playAnim(fzitem,fzcards,#fz_list,i,ispaly)
elseif fz_list[i].type == RB_FZType.Peng then
@@ -361,7 +368,11 @@ function M:UpdateFzList( fz_list ,ispaly)
local fzcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3")
fzcards:GetController("c1").selectedIndex=1
for j=1,3 do
- fzcards:GetChild("card_"..j).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card)
+ if j==1 then
+ fzcards:GetChild("card_"..j).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card)
+ else
+ fzcards:GetChild("card_"..j).icon ="ui://Main_RunBeard/202_1_300"
+ end
end
fzcards.x,fzcards.y = 0,0
self:playAnim(fzitem,fzcards,#fz_list,i,ispaly)
@@ -387,7 +398,7 @@ function M:UpdateFzList( fz_list ,ispaly)
local fzcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_4")
for j=1,4 do
- if j==4 then
+ if j==1 then
fzcards:GetChild("card_"..j).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card)
else
fzcards:GetChild("card_"..j).icon ="ui://Main_RunBeard/202_1_300"
diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/PendulumRule.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/PendulumRule.lua
index 8f6b21cc..7d584b6c 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/PendulumRule.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/PendulumRule.lua
@@ -786,7 +786,7 @@ function M:tryPendulumRule2()
--pt(cards_map)
--printlog("11111111111111111111")
local mapCount=#cards_map
- if mapCount>12 then
+ if mapCount>10 then
local tempCardMpList1={}
local tempCardMpList2={}
local tempCardMpList3={}
diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua
index fbdfb10d..c26f6689 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua
@@ -43,6 +43,7 @@ function M:init()
local view = self._view
self._room = DataManager.CurrenRoom
self._area_outcard_list = view:GetChild("area_outcard_list")
+ self._bgview = view:GetController("bgview")
self._area_handcard_list = view:GetChild("area_handcard_list")
self._area_fz_list = view:GetChild("area_fz_list")
self._area_qipai_list = view:GetChild("windcard_list")
@@ -60,6 +61,7 @@ end
function M:Clear()
self._area_outcard_list:RemoveChildren(0, -1, true)
+ self._bgview.selectedIndex=0
self._area_fz_list:RemoveChildren(0, -1, true)
self._area_handcard_list:RemoveChildren(0, -1, true)
self._area_qipai_list:RemoveChildren(0, -1, true)
@@ -74,7 +76,7 @@ end
function M:ClearOutCard()
self._area_outcard_list:RemoveChildren(0, -1, true)
-
+ self._bgview.selectedIndex = 0
end
--弃牌
@@ -90,8 +92,6 @@ end
--放字
function M:UpdateFzList( fz_list )
- printlog("jefe UpdateFzList=======")
- pt(fz_list)
self._area_fz_list:RemoveChildren(0,-1,true)
for i = 1,#fz_list do
local fzitem = nil
@@ -251,6 +251,7 @@ function M:UpdateOutCardList(outcard)
end
outcards.x,outcards.y = 0,0
self._area_outcard_list:AddChild(outcards)
+ self._bgview.selectedIndex=1
end
--摸牌动画
diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua
index afd1639f..0177cb63 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua
@@ -58,9 +58,9 @@ function M:init()
self.card_hight = 110
self.outcard_button = nil
self._room = DataManager.CurrenRoom
- printlog("zp init")
self._area_handcard_list = view:GetChild('area_handcard_list')
self._area_outcard_list = view:GetChild('area_outcard_list')
+ self._bgview = view:GetController("bgview")
self._area_fz_list = view:GetChild('area_fz_list')
self._area_qipai_list = view:GetChild('windcard_list')
self._mask_liangpai = view:GetChild('mask_liangpai')
@@ -73,9 +73,7 @@ end
function M:ShwoDaNiao(niao)
- printlog("main daniao ShwoDaNiao",self.ctr_niao)
self.ctr_niao.selectedIndex = 1
- printlog("main daniao ShwoDaNiao1")
end
function M:HideDaNiao()
@@ -137,6 +135,7 @@ end
function M:Clear()
self.outcard_button = nil
self._area_outcard_list:RemoveChildren(0, -1, true)
+ self._bgview.selectedIndex = 0
self._area_fz_list:RemoveChildren(0, -1, true)
self._area_handcard_list:RemoveChildren(0, -1, true)
self._area_qipai_list:RemoveChildren(0, -1, true)
@@ -347,14 +346,17 @@ function M:banHandCards(list)
for i = 1, #list do
local card_code = list[i].card_item
pt(card_code)
- local btn_card = UIPackage.CreateObjectFromURL('ui://Main_RunBeard/Btn_Card')
- btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', card_code)
- btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize())
- btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize())
- self.card_width = 87 * self:getCardSize()
- self.card_hight = 110 * self:getCardSize()
- local card_view = NewCardView(btn_card, card_code, list[i].index_X, list[i].index_Y)
- card_view.btn_card.touchable = false
+ -- local btn_card = UIPackage.CreateObjectFromURL('ui://Main_RunBeard/Btn_Card')
+ -- btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', card_code)
+ -- btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize())
+ -- btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize())
+ -- self.card_width = 87 * self:getCardSize()
+ -- self.card_hight = 110 * self:getCardSize()
+
+ -- local card_view = NewCardView(btn_card, card_code, list[i].index_X, list[i].index_Y)
+ -- btn_card.data = card_view
+ -- btn_card.touchable = false
+ self:UpdateKan(card_code)
end
end
@@ -773,6 +775,7 @@ end
--更新 吃碰
function M:UpdateFzList(fz_list)
+ printlog("UpdateFzList area_fz_list1")
self._area_fz_list:RemoveChildren(0, -1, true)
for i = 1, #fz_list do
local fzitem = nil
@@ -801,7 +804,11 @@ function M:UpdateFzList(fz_list)
local fzcards = UIPackage.CreateObjectFromURL('ui://Main_RunBeard/Fz_0_3')
fzcards:GetController('c1').selectedIndex = 1
for j = 1, 3 do
- fzcards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/202_', fz_list[i].card)
+ if j == 1 then
+ fzcards:GetChild('card_' .. j).icon = 'ui://Main_RunBeard/202_1_300'
+ else
+ fzcards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/202_', fz_list[i].card)
+ end
end
fzcards.x, fzcards.y = 0, 0
fzitem:AddChildAt(fzcards, 0)
@@ -810,7 +817,11 @@ function M:UpdateFzList(fz_list)
local fzcards = UIPackage.CreateObjectFromURL('ui://Main_RunBeard/Fz_0_3')
fzcards:GetController('c1').selectedIndex = 1
for j = 1, 3 do
- fzcards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/202_', fz_list[i].card)
+ if j == 1 then
+ fzcards:GetChild('card_' .. j).icon = 'ui://Main_RunBeard/202_1_300'
+ else
+ fzcards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/202_', fz_list[i].card)
+ end
end
fzcards.x, fzcards.y = 0, 0
fzitem:AddChildAt(fzcards, 0)
@@ -826,7 +837,7 @@ function M:UpdateFzList(fz_list)
elseif fz_list[i].type == RB_FZType.Ti then
local fzcards = UIPackage.CreateObjectFromURL('ui://Main_RunBeard/Fz_0_4')
for j = 1, 4 do
- if j == 4 then
+ if j == 1 then
fzcards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeard/202_', fz_list[i].card)
else
fzcards:GetChild('card_' .. j).icon = 'ui://Main_RunBeard/202_1_300'
@@ -841,6 +852,7 @@ end
function M:ClearOutCard()
self._area_outcard_list:RemoveChildren(0, -1, true)
+ self._bgview.selectedIndex = 0
end
--出牌
function M:UpdateOutCardList(outcard)
@@ -853,6 +865,7 @@ function M:UpdateOutCardList(outcard)
end
outcards.x, outcards.y = 0, 0
self._area_outcard_list:AddChild(outcards)
+ self._bgview.selectedIndex = 1
end
--弃牌
@@ -870,10 +883,12 @@ function M:PlayingOutCardAnima(card)
if (self._area_outcard_list ~= nil and self._area_outcard_list.numChildren > 0) then
self._area_outcard_list:GetChildAt(0):GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/202_', card)
self._view:GetTransition('t0'):Play()
+
end
coroutine.start(
function()
coroutine.wait(0.1)
+ self._bgview.selectedIndex = 1
self:ClearOutCard()
end
)
@@ -882,7 +897,6 @@ end
--得到设置的牌字体
function M:getCardItem(card_1, card_2)
if self._room.change_card_display ~= nil then
- --printlog("===========",self._room.change_card_display)
return card_1 .. self._room.change_card_display .. card_2
else
return card_1 .. '6_' .. card_2
diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png
index e078dbbb..85f03107 100644
Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png differ
diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes
index f8239774..8d46756e 100644
Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes differ
diff --git a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png
index ab4b6654..78256ea4 100644
Binary files a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png and b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png differ
diff --git a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes
index 0e96c4ac..51849c74 100644
Binary files a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes and b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes differ
diff --git a/wb_new_ui/.objs/metas/v6yvqp7w/f55qvt.info b/wb_new_ui/.objs/metas/v6yvqp7w/f55qvt.info
new file mode 100644
index 00000000..314bf0c6
--- /dev/null
+++ b/wb_new_ui/.objs/metas/v6yvqp7w/f55qvt.info
@@ -0,0 +1,16 @@
+{
+ "objectStatus": {
+ "n28_o49p": {
+ "hidden": true
+ },
+ "n29_o49p": {
+ "hidden": true
+ },
+ "n27_o49p": {
+ "hidden": true
+ },
+ "n24_mk2u": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/v6yvqp7w/f55qvx.info b/wb_new_ui/.objs/metas/v6yvqp7w/f55qvx.info
index 22178475..3d14a8aa 100644
--- a/wb_new_ui/.objs/metas/v6yvqp7w/f55qvx.info
+++ b/wb_new_ui/.objs/metas/v6yvqp7w/f55qvx.info
@@ -1,3 +1,8 @@
{
+ "objectStatus": {
+ "n45_j34t": {
+ "collapsed": true
+ }
+ },
"fitScreen": "FitSize"
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/v6yvqp7w/f55qw7.info b/wb_new_ui/.objs/metas/v6yvqp7w/f55qw7.info
index 66d3eef3..d3878063 100644
--- a/wb_new_ui/.objs/metas/v6yvqp7w/f55qw7.info
+++ b/wb_new_ui/.objs/metas/v6yvqp7w/f55qw7.info
@@ -3,9 +3,6 @@
"n39_e7qn": {
"collapsed": true
},
- "n49_lr5d": {
- "collapsed": true
- },
"n38_e7qn": {
"hidden": true
}
diff --git a/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info b/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info
index 8c42c4b9..279642d4 100644
--- a/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info
+++ b/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info
@@ -13,6 +13,9 @@
"hidden": true,
"collapsed": true
},
+ "n152_8th3": {
+ "hidden": true
+ },
"n170_o49p": {
"hidden": true
},
diff --git a/wb_new_ui/.objs/metas/v6yvqp7w/fgao1dk.info b/wb_new_ui/.objs/metas/v6yvqp7w/fgao1dk.info
new file mode 100644
index 00000000..d34517d9
--- /dev/null
+++ b/wb_new_ui/.objs/metas/v6yvqp7w/fgao1dk.info
@@ -0,0 +1,7 @@
+{
+ "objectStatus": {
+ "n4_rfcn": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json
index 74de28df..724bf1f6 100644
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@@ -1,5 +1,5 @@
{
- "libview.firstColumnWidth": 522,
+ "libview.firstColumnWidth": 297,
"expanded_nodes": [
"27vd145b",
"/",
@@ -8,15 +8,33 @@
],
"libview.iconScale": 0,
"doc.openedDocs": [
- "ui://ppu1wv76j4mf9j"
+ "ui://ppu1wv76j4mf9j",
+ "ui://v6yvqp7wf55qwa",
+ "ui://v6yvqp7wf55qw7",
+ "ui://v6yvqp7wf55qvx",
+ "ui://v6yvqp7wf55qvw",
+ "ui://v6yvqp7wddb914i",
+ "ui://v6yvqp7wcyprww",
+ "ui://v6yvqp7wcyprwy",
+ "ui://v6yvqp7wcyprwu",
+ "ui://v6yvqp7wcyprwt",
+ "ui://m7iejg46kwi0hkb",
+ "ui://m7iejg46mpllhv2",
+ "ui://m7iejg46kwi0hkl",
+ "ui://v6yvqp7wf55qw5",
+ "ui://v6yvqp7wf55qw4"
],
"packageGroup.mine": [],
"test.device": "720p Phone",
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://ppu1wv76j4mf9j",
+ "doc.activeDoc": "ui://v6yvqp7wf55qw4",
"libview.twoColumn": false,
"libview.expandedNodes": [
+ "27vd145b",
+ "/",
+ "27vd145b",
+ "/component/",
"egnzysm7",
"/",
"egnzysm7",
@@ -30,13 +48,25 @@
"ppu1wv76",
"/component/",
"ppu1wv76",
+ "/component/cards/",
+ "ppu1wv76",
"/component/clearing/",
"ppu1wv76",
- "/component/clearing/image/",
+ "/images/",
"v6yvqp7w",
"/",
"v6yvqp7w",
- "/component/"
+ "/component/",
+ "v6yvqp7w",
+ "/component/Main/",
+ "v6yvqp7w",
+ "/component/Main/component/",
+ "v6yvqp7w",
+ "/component/cards/",
+ "v6yvqp7w",
+ "/images/",
+ "v6yvqp7w",
+ "/images/cards/"
],
"auxline1": true,
"snapToGrid": true,
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
index 63d06b04..3d0def57 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
@@ -1,41 +1,37 @@
-
+
-
+
-
+
-
-
-
-
-
+
-
+
-
+
-
-
-
-
-
+
-
+
+
+
+
+
@@ -62,60 +58,49 @@
-
+
-
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
@@ -128,9 +113,28 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
+
+
-
+
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
tags along with a tag while at the same time applying an Underline or Strikethrough font style on the whole text object.
-- Fixed SDF Scale not getting updated when using SetText() with StringBuilder when the lossyScale of the text object changes. Case #1216007
-- Added Non Breaking Space \u00A0 and Soft Hyphen \u00AD to list of synthesized characters in the event they are not present in the source font file.
-- Fixed stack overflow issue when using TMP_FontAsset.HasCharacter and TMP_FontAsset.HasCharacters function on font assets that have circular fallback references. Case #1222574
-- Fixed atlas texture not getting set correctly to IsReadable when switching a static font asset to dynamic in the Generation Settings of the Font Asset Inspector.
-- Added check for RectTransform.sizeDelta change when OnRectTransformDimensionsChange() is called by the Canvas system to get around potential rounding error that erroneously trigger this callback when the RectTransform is using Stretch Anchor mode.
-- As requested by a few users, TMP_FontAsset.faceInfo setter is now public instead of internal.
-
-## [2.1.0-preview.5] - 2020-02-25
-## [1.5.0-preview.5]
-## [3.0.0-preview.5]
-### Changes
-- Revised SetText function formatting options to including ability to specify padding for integral part of the value. Revised format is as follows: {Arg Index:Integral Padding.Decimal Precision} Example: TMP_Text.SetText("Value = {0:000.00}", 10.375f); result in "Value = 010.38".
-- Fixed issue where text objects isTextObjectScaleStatic property would be ignored when OnCanvasHierarchyChanged() is called.
-- Added a Character, Glyph and Record count to those respective tables in the Font Asset Inspector.
-- Fixed potential Null Reference Exception that would occur when using text Overflow Ellipsis mode with a primary font asset that doesn't contain the Ellipsis character. Case #1209771
-- Fixed a potential Editor lockup when using text Overflow Page mode. Case #1219055
-- Fixed Input Field incorrect caret vertical alignment when using the Midline / Vertical Geometry alignment option.
-- Added initial / minimal support for the New Input System. Please use with caution and report any issues.
-- Changes to Font Asset Generation Settings via the Font Asset Inspector will now update the existing glyphs and characters for the new settings instead of clearing them.
-- Text object InternalUpdate() used to handle potential scale changes of text objects now uses willRenderCanvases event instead of onPreCull. This avoids a potential one frame delay in updating of objects and no impact on objects. Case #1216007
-
-## [2.1.0-preview.4] - 2020-01-31
-## [1.5.0-preview.4]
-## [3.0.0-preview.4]
-### Changes
-- Fixed Input Field issue where scrolling events could prevent OnEndEdit event from firing. See [forum post](https://forum.unity.com/threads/mouse-wheel-on-multiline-input-field-with-no-scrollbar-hangs-input-field-stops-event-firing.794607/) for details.
-- Improved Input Field handling of Vertical Scrollbar in conjunction with the ResetOnDeActivation property. Using the Vertical Scrollbar no longer triggers OnEndEdit event.
-- Fixed MissingReferenceException when deleting a TMP prefab that is part of a nested prefab. Case #1207793
-- Improved handling of allocations of newly created text objects with large amount of text. As a result of these revisions, allocations will potentially be reduce by 10X. See #1205923
-- Fixed potential Null Reference Exception with the TMP DropDown that could occur when using the experimental Editor "Enter Play Mode" feature. Case #1207915
-- Fixed potential issue with the assignment of sub text object materials.
-- Add support for hiding the soft keyboard for Switch in the TMP Input Field.
-- Fixed incorrect Preferred Height when Word Wrapping is disabled on text objects. See [forum post](https://forum.unity.com/threads/incorrect-wordwrapping-preferredsize-textmespro-2-1-preview-3.812376/) for details.
-- Added support for the new Selected state and color to the TMP Input Field. Case #1210496
-- Fixed additional instances of TMP Resource Importer window being created when deleting the "TextMesh Pro" folder just after having imported them. Case #1205848
-- Added public ITextPreprocessor textPreprocessor; property to allow setting the text preprocessor for a given text component.
-
-## [2.1.0-preview.3] - 2019-12-16
-## [1.5.0-preview.3]
-### Changes
-- Fixed potential issue with TMP Dropdown where calling Show() and Hide() in very short interval could result in additional Blockers. Case #1194114
-- Fixed potential issues that could occur when upgrading to version 1.5.0-preview.2 or newer of the TMP package without also updating the TMP Essential Resources in the project.
-- Added check and warning when trying to create a font asset whose source font file has "Incl. Font Data" disabled in the Font Import Settings. Case #1198587 and #1198112
-- Fixed Ellipsis overflow mode issue when using small caps. Case #1198392
-- Fixed potential layout issue when adding a Layout Group to the text object itself. Case #1197614
-- Fixed Font Asset Creator issue where too many adjustment records with adjustment value of zero were added to the font asset.
-- Added support for Line Separator \u2028 and Paragraph Separator \u2029.
-- TMP shaders have been moved from "TextMesh Pro/Resources/Shaders" folder to "TextMesh Pro/Shaders" folder. See the following [post](https://forum.unity.com/threads/version-1-5-0-2-1-0-preview-2-now-available-for-testing.753587/#post-5206853) for details.
-- Added new experimental SDF and Mobile SDF Shaders that use Screen Space Derivatives (SSD) where these shaders no longer require SDF Scale to be passed via Vertex Attributes. These shaders have higher performance overhead but are more flexible. This overhead should only be noticeable on mobile platforms.
-- Fixed potential text alignment issue where upgrading from package version 1.4.1 to 1.5.0-preview.2 would result in incorrect alignment on prefabs. Case #1198833
-- Added \u061C Arabic Letter Mark, \u200E Left-to-Right Mark and \u200F Right-to-Left Mark to list of control and non renderable characters.
-- Fixed Missing Reference Exception that would appear when expanding the Extra Settings of a TextMeshPro Preset asset. Case #1201072
-- Fixed Missing Reference Exception that would appear when editing the Vertex Color or Color Gradient of a TMP component Preset asset. Case #1201069
-- Fixed Inspector layout issue preventing enabling or disabling the Outline, Underlay, Lighting and Glow features when selecting a Preset asset material. Case #1196963
-- Revised the Create Material Preset context menu option to issue a warning and ignore materials outside the project. Case #1200109
-- Added experimental ITextPreprocessor interface to allow users to create custom components to handle text preprocessing and shaping. This interface includes a PreprocessText(string text) function that is called when the object contains a component that inherits from this interface.
-- Added support for Unity Presets in the Editor for both and components. Case #1191793
-- Optimization to ensure the TMP Update Manager only rebuilds text objects once per frame regardless of the number of cameras in the scene.
-
-## [2.1.0-preview.2] - 2019-10-30
-## [1.5.0-preview.2]
-### Changes
-- Fixed Input Field issue when Read Only flag is set preventing the initial setting of the text. Also fixed Read Only flag not being respected when using IME input.
-- Fixed potential infinite loop when using text overflow mode ScrollRect. See Case #1188867
-- Fixed Input Field culling related issue(s) where text would be incorrectly culled. See https://forum.unity.com/threads/version-1-5-0-2-1-0-preview-1-now-available-for-testing.753587/#post-5023700
-- Revised handling and referencing of the CanvasRenderer in anticipation of an incoming change to the MaskableGraphic class where it will no longer automatically add a CanvasRenderer to components inheriting from it. As a result, objects will no longer have a CanvasRenderer.
-- Fixed potential NRE when using Overflow Truncate mode with sprites. See https://forum.unity.com/threads/tmpro-stackoverflow-caused-by-tmpro-textmeshprougui-generatetextmesh.750398/page-2#post-5042822
-- Fixed issue when using font weights in combination of font styles in the editor.
-- Fixed for potential incorrect preferred height.
-- Improved handling of StyleSheet options to reorder, add or delete styles.
-- Fixed Input Field Caret & Selection Highlight potential culling issue when the object was instantiated outside the culling region.
-- Fixed potential issue with registration of text objects in the TMP_UpdateManager.
-- Optimization to suppress callback to InternalUpdate when parent Canvas is disabled. Case #1189820
-- Fixed Fallback material not getting updated correctly when changing Generation Settings on the Fallback Font Asset.
-- Fixed a typo in the Font Weight section of the Font Asset Editor.
-- Fixed potential ArgumentOutOfRangeException in the Input Field when using Hide Mobile Input and deleting a long string. Case #1162514
-- Added "Is Scale Static" option in the Extra Settings to exclude text objects from InternalUpdate callbacks to improve performance when the object's scale is static. This InternalUpdate callback is used to track potential changes to the scale of text objects to update their SDF Scale.
-- Added the ability to control culling modes for the TMP Shaders. This new option is available in the Debug section of the Material Inspector. New feature requires updating the TMP Essential Resources. See the following post https://forum.unity.com/threads/not-see-textmeshpro-rendering-from-the-back.767510/#post-5112461.
-- Fixed Material Inspector issue when toggling the Record button in the Animation window. Case #1174960
-- Improved Line Breaking handling for CJK. This also addresses a few reported issues. Case #1171603
-- Added support for <NBSP> tag which is internally replaced by a non-breaking space or \u00A0.
-- Improved performance when retrieving glyph adjustment records when using dynamic font assets.
-- Fixed potential Null Reference Exception in the Editor when assigning new font asset to disabled game object when no previous font asset was assigned.
-
-## [2.1.0-preview.1] - 2019-09-30
-## [1.5.0-preview.1]
-### Changes
-- Fixed an issue when using Overflow Ellipsis mode where the Ellipsis character would not be displayed correctly when the preceding character is a sprite.
-- Added the ability to define the Resource path for Style Sheets in the TMP Settings.
-- TMP Style Sheets can now be assigned to text objects in the Extra Settings section of the text object inspector.
-- Added the ability to assign a Style to text objects using the new Text Style property in the text object inspector. A new public property TMP_Text.textStyle was also added.
-- Improved Style Sheet editor to allow sorting of styles in the style sheet.
-- Improved handling of nested styles.
-- Added public TMP_Style GetStyle(string name) to get the potential style by name.
-- Revised the ForceMeshUpdate() function as follows: public void ForceMeshUpdate(bool ignoreActiveState = false, bool forceTextReparsing = false).
-- Fixed SubMeshUI objects text disappearing when saving a scene.
-- Creating Material Presets via the Material Context menu with multi selection will now work as expected and assign the newly created material preset to all selected text objects.
-- Fixed minor issue when changing Material Preset in prefab isolation mode with multiple text objects selected where the new material preset would not be assigned to disabled text objects.
-- Revised Character, Word, Line and Paragraph spacing adjustments to be in font units (em) where a value of 1 represents 1/100 em.
-- Added TMP_Text.onFontAssetRequest and TMP_Text.onSpriteAssetRequest events to allow users to implement custom asset loading when using the <font="Font Asset Name"> and <sprite="Sprite Asset Name"> tags.
-- Additional Shader Channels on the Canvas will be set to TexCoord1, Normal and Tangents or Mixed when using TMP Surface Shaders. Otherwise it will be set to TexCoord1 only. Case #1100696
-- Added new attribute to the <mark> tag to allow users to define a padding value for the mark / highlight region. Example: <mark color=#FFFF0080 padding="1.0,1.0,0.0,0.0"> where padding="Left, Right, Top, Bottom".
-- Fixed an issue which could result in out of range exception when referencing sprites contained in fallback sprite assets using unicode values.
-- Fixed an issue in the Font Asset Creator where the source font file property of the newly created font asset was not getting set.
-- Added .blend files to exclusion asset scan list of the Project GUID Remapping tool.
-- Fixed issue where Caret position would be incorrect when using IME. Case #1146626
-- Clamped Outline Softness to a value of 0-1 in the TMP Distance Field shader which makes it consistent with other SDF Shaders. Case #1136161
-- Text Auto-Sizing Min and Max values are now clamped between 0 and 32767. Case #1067717
-- Text Font Size Min and Max values are now clamped between 0 and 32767. Case #1164407
-- Rich Text Tag values are now limited to a maximum value of 32767.
-- Added Placeholder option to TMP Dropdown. Placeholder text is displayed when selection value is -1. Also added example scene in the TMP Examples & Extras.
-- Added the ability to define Face Info metrics per Sprite Assets. This will provide for more consistent scaling of the sprites regardless of the font asset used. Sprite Assets with undefined Face Info will continue to inherit the Face Info metrics of the current font asset.
-- Added Update Sprite Asset option in the header of the Sprite Asset inspector. This increases the discoverability of this option already available via the Sprite Asset Context Menu.
-- Revised the text auto-sizing handling in regards to maximum iteration threshold which could result in a crash on some Android devices. Case #1141328
-- Font Asset Generation Settings are now disabled in the inspector if the Source Font File is missing or if the Atlas Population Mode is set to static.
-- Fixed vertical alignment issue when using Overflow Page mode.
-- Improved handling of text auto-size line adjustment spacing resulting in fewer iterations and more accurate resulting point size.
-- Added support for Layout Elements to the TMP Input Field.
-= Fixed text alignment issue with TMP Input Field when using Center alignment on the underlying text component.
-- Setting ContentType.Custom on the TMP Input Field will no longer hide the Soft Keyboard. The Soft Keyboard can now be control independently via the shouldHideSoftKeyboard property.
-- Added new Font Asset Context Menu option "Force Upgrade To Version 1.1.0" for convenience purposes in case a font asset didn't get upgraded automatically when migrating from version 1.3.0 to 1.4.x or 2.0.x.
-- The <gradient> tag now as an optional attribute "tint=0" or "tint=1" controlling whether or not the gradient will be affect by vertex color. The alpha of the gradient will continue to be affected by the vertex color alpha.
-- Added new angle=x attribute to the <i> tag where the value of x define the italic slant angle.
-- Since the legacy TextContainer used by TMP has been deprecated, it was removed from the Layout Context Menu options.
-- Improved character positioning when using italic text where large angle / slant would potentially result in uneven spacing between normal and italic blocks of text.
-- Fixed an issue where <mspace> and <cspace> tags would not be handled correctly in conjunction with word wrapping.
-- Fixed issue in the TMP_Dropdown.cs that was affecting navigation. Case 1162600. See https://forum.unity.com/threads/huge-bug-missing-a-code-line-since-1-4-0.693421/
-- Fixed an issue related to kerning where the glyph adjustment values did not account for the upsampling of the legacy SDF modes like SDF8 / SDF16 and SDF32.
-- Made the TMP_Text.text property virtual.
-- Fixed Material Preset of fallback materials getting modified when the TMP Settings Match Material Preset option is disabled.
-- Added ShaderUtilities.ID_GlowInner to list of material property IDs.
-- Fixed potential null reference exception when creating new text objects when no default font asset has been assigned in the TMP Settings and the LiberationSans SDF font asset has been deleted from the project. Case #1161120
-- Fixed import TMP Essential Resources button being disabled when importing the TMP Examples & Extras first. Case #1163979
-- Fixed potential ArgumentOutOfRangeException when Hide Mobile Input is enabled and deleting the last character in the text. Case #1162514
-- Improved handling of manual addition of glyph positional adjustment pairs for both dynamic and static font assets. Case #1165763
-- Fixed issue where text in the TMP_InputField would disappear due to incorrect culling. Case #1164096
-- Fixed potential IndexOutOfRangeException that could be thrown when using the Pinyin IME interface and typing very fast to enter Chinese text. Case #1164383
-- Added support for Vertical Tab \v which inserts a line break but not a paragraph break.
-- Added support for Shift Enter in the TMP Input Field which inserts a Vertical Tab in the text in Multi Line mode.
-- Fixed text horizontal alignment when lines of text only contain the Ellipsis \u2026 Unicode character. Case #1162685
-- Text alignment is now serialized into separate fields for horizontal and vertical alignment and can now be get / set independently via TMP_Text.horizontalAlignment and TMP_Text.verticalAlignment. The TMP_Text.alignment property remains and uses the new serialized fields for horizontal and vertical alignment.
-- Improved handling of Soft Hyphens when using Text Auto-Size.
-- Fixed Null character being passed to Validate method of the TMP_InputField. Case #1172102
-- Fixed an issue where the Preferred Width and Height were not correct when using Tabs.
-- The Cull Transparent Mesh flag on TMP_SubMeshUI objects will now mirror the settings on the parent text object's CanvasRenderer.
-- Updated Sprite Importer to improve compatibility with Texture Packer Json Array export format.
-- Newly created StyleSheets will be pinged in the project tab. Case #1182117
-- Added new option in the TMP Settings to control line breaking rules for Hangul to enabled Modern line breaking or traditional line breaking.
-- Fixed potential issue related to SDF Scaling when the scale of the text object is negative. See https://forum.unity.com/threads/version-1-4-1-preview-1-with-dynamic-sdf-for-unity-2018-3-now-available.622420/page-5#post-4958240 for details.
-- Added validation check for Sprite Data Source file in the Sprite Asset Importer. Case #1186620
-- Added warning when using Create - TextMeshPro - Sprite Asset menu when no valid texture is selected. Case #1163982
-- Fixed potential cosmetic issue in the text component inspector when using Overflow Linked mode. Case #1177640
-
-## [1.4.1] - 2019-04-12
-### Changes
-- Improved handling of font asset automatic upgrade to version 1.1.0 which is required to support the new Dynamic SDF system.
-- Made release compatible with .Net 3.5 scripting runtime.
-
-## [1.4.0] - 2019-03-07
-### Changes
-- Same release as 1.4.0-preview.3a.
-
-## [1.4.0-preview.3a] - 2019-02-28
-### Changes
-- Improved performance of the Project Files GUID Remapping Tool.
-- Fixed an issue with the TMP_FontAsset.TryAddCharacters() functions which was resulting in an error when added characters exceeded the capacity of the atlas texture.
-- Updated TMP_FontAsset.TryAddCharacters functions to add new overloads returning list of characters that could not be added.
-- Added function in OnEnable of FontAsset Editor's to clean up Fallback list to remove any null / empty entries.
-- Added support for Stereo rendering to the TMP Distance Field and Mobile Distance Field shaders.
-
-## [1.4.0-preview.2a] - 2019-02-14
-### Changes
-- Fixed an issue with SDF Scale handling where the text object would not render correctly after the object scale had been set to zero.
-- Fixed an issue with the TMP_UpdateManager where text objects were not getting unregistered correctly.
-- Any changes to Font Asset Creation Settings' padding, atlas width and / or atlas height will now result in all Material Presets for the given font asset to also be updated.
-- Added new section in the TMP Settings related to the new Dynamic Font System.
-- Added new property in the Dynamic Font System section to determine if OpenType Font Features will be retrieved from source font files at runtime as new characters are added to font assets. Glyph Adjustment Data (Kerning) is the only feature currently supported.
-- Fix an issue where font assets created at runtime were not getting their asset version number set to "1.1.0".
-- Improved parsing of the text file used in the Font Asset Creator and "Characters from File" option to handle UTF16 "\u" and UTF32 "\U" escape character sequences.
-- Fixed a Null Reference Error (NRE) that could occur when using the <font> tag with an invalid font name followed by the <sprite> tag.
-- The Glyph Adjustment Table presentation and internal data structure has been changed to facilitate the future addition of OpenType font features. See https://forum.unity.com/threads/version-1-4-0-preview-with-dynamic-sdf-for-unity-2018-3-now-available.622420/#post-4206595 for more details.
-- Fixed an issue with the <rotate> tag incorrectly affecting character spacing.
-
-## [1.4.0-preview.1] - 2019-01-30
-### Changes
-- Renamed TMPro_FontUtilities to TMP_FontAssetCommon to more accurately reflect the content of this file.
-- Accessing the TextMesh Pro Settings via the new Edit - Settings menu when TMP Essential Resources have not yet been imported in the project will no longer open a new window to provide the options to import these resources.
-- Fixed an issue where using int.MaxValue, int.MinValue, float.MaxValue and float.MinValue in conjunction with SetText() would display incorrect numerical values. Case #1078521.
-- Added public setter to the TMP Settings' missingGlyphCharacter to allow changing which character will be used for missing characters via scripting.
-- Fixed a potential Null Reference Exception related to loading the Default Style Sheet.
-- Added compiler conditional to TMP_UpdateManager.cs to address changes to SRP.
-- Improved the <margin> tag to make it possible to define both left and right margin values. Example: <margin left=10% right=10px>.
-- Added new menu option to allow the quick creation of a UI Button using TMP. New menu option is located in Create - UI - Button (TextMeshPro).
-- Renamed TMP related create menu options.
-- Fixed TMP object creation handling when using Prefab isolation mode. Case #1077392
-- Fixed another issue related to Prefabs where some serialized properties of the text object would incorrectly show up in the Overrides prefab options. Case #1093101
-- Fixed issue where changing the Sorting Layer or Sorting Order of a object would not dirty the scene. Case #1069776
-- Fixed a text alignment issue when setting text alignment on disabled text objects. Case #1047771
-- Fixed an issue where text object bounds were not set correctly on newly created text objects or in some cases when setting the text to null or string.empty. Case #1093388
-- Fixed an issue in the IntToString() function that could result in Index Out Of Bounds error. Case #1102007
-- Changed the TMP_InputField IsValidChar function to protected virtual.
-- The "Allow Rich Text Editing" property of the TMP_InputField is now set to false by default.
-- Added new option to the Sprite Asset context menu to make it easier to update sprite glyphs edited via the Unity Sprite Editor.
-- Added new Sharpness slider in the Debug section of the SDF Material inspector.
-- Fixed an error that would occur when using the context menu Reset on text component. Case #1044726
-- Fixed issue where CharacterInfo.index would be incorrect as a result of using Surrogate Pairs in the text. Case #1037828
-- The TMP_EditorPanel and TMP_UiEditorPanel now have their "UseForChildren" flag set to true to enable user / custom inspectors to inherit from them.
-- Fixed an issue where rich text tags using pixel (px) or font units (em) were not correctly accounting for orthographic camera mode. This change only affects the normal TMP text component.
-- Fixed an inspector issue related to changes to the margin in the TMP Extra Settings panel. Case #1114253
-- Added new property to Glyph Adjustment Pairs which determines if Character Spacing Adjustments should affect the given pair.
-- Updated the Glyph Adjustment Table where ID now represents the unicode (hex) value for the character instead of its decimal value.
-- Added new SetValueWithoutNotify() function to TMP_DropDown and SetTextWithoutNotify() function to TMP_InputField allowing these to be set without triggering OnValueChanged event.
-- Geometry buffer deallocation which normally takes place when current allocations exceed those of the new text by more than 256 characters will no longer occur if the new text is set to null or string.empty.
-- Fixed a minor issue where the underline SDF scale would be incorrect when the underline text sequence contained normal size characters and ended with a subscript or superscript character.
-- Fixed an error that would occur when using the Reset Context menu on a Material using the SDF Surface or Mobile SDF Surface Shaders. Case #1122279
-- Resolved a Null Reference Error that would appear when cycling through the text overflow modes. Case #1121624
-
-## [1.3.0] - 2018-08-09
-### Changes
-- Revamped UI to conform to Unity Human Interface Guidelines.
-- Updated the title text on the Font Asset Creator window tab to "Font Asset Creator".
-- Using TMP_Text.SetCharArray() with an empty char[] array will now clear the text.
-- Made a small improvement to the TMP Input Field when using nested 2d RectMasks.
-- Renamed symbol defines used by TMP to append TMP_ in front of the define to avoid potential conflicts with user defines.
-- Improved the Project Files GUID Remapping tool to allow specifying a target folder to scan.
-- Added the ability to cancel the scanning process used by the Project Files GUID Remapping tool.
-- Moved TMP Settings to universal settings window in 2018.3 and above.
-- Changing style sheet in the TMP Settings will now be reflected automatically on existing text objects in the editor.
-- Added new function TMP_StyleSheet.UpdateStyleSheet() to update the internal reference to which style sheet text objects should be using in conjunction with the style tag.
-
-## [1.2.4] - 2018-06-10
-### Changes
-- Fixed a minor issue when using Justified and Flush alignment in conjunction with \u00A0.
-- The Font Asset creationSettings field is no longer an Editor only serialized field.
-
-## [1.2.3] - 2018-05-29
-### Changes
-- Added new bitmap shader with support for Custom Font Atlas texture. This shader also includes a new property "Padding" to provide control over the geometry padding to closely fit a modified / custom font atlas texture.
-- Fixed an issue with ForceMeshUpdate(bool ignoreActiveState) not being handled correctly.
-- Cleaned up memory allocations from repeated use of the Font Asset Creator.
-- Sprites are now scaled based on the current font instead of the primary font asset assigned to the text object.
-- It is now possible to recall the most recent settings used when creating a font asset in the Font Asset Creator.
-- Newly created font assets now contain the settings used when they were last created. This will make the process of updating / regenerating font assets much easier.
-- New context menu "Update Font Asset" was added to the Font Asset inspector which will open the Font Asset Creator with the most recently used settings for that font asset.
-- New Context Menu "Create Font Asset" was added to the Font inspector panel which will open the Font Asset Creator with this source font file already selected.
-- Fixed 3 compiler warnings that would appear when using .Net 4.x.
-- Modified the TMP Settings to place the Missing Glyph options in their own section.
-- Renamed a symbol used for internal debugging to avoid potential conflicts with other user project defines.
-- TMP Sprite Importer "Create Sprite Asset" and "Save Sprite Asset" options are disabled unless a Sprite Data Source, Import Format and Sprite Texture Atlas are provided.
-- Improved the performance of the Project Files GUID Remapping tool.
-- Users will now be prompted to import the TMP Essential Resources when using the Font Asset Creator if such resources have not already been imported.
-
-## [1.2.2] - 2018-03-28
-### Changes
-- Calling SetAllDirty() on a TMP text component will now force a regeneration of the text object including re-parsing of the text.
-- Fixed potential Null Reference Exception that could occur when assigning a new fallback font asset.
-- Removed public from test classes.
-- Fixed an issue where using nested links (which doesn't make sense conceptually) would result in an error. Should accidental use of nested links occurs, the last / most nested ends up being used.
-- Fixed a potential text alignment issue where an hyphen at the end of a line followed by a new line containing a single word too long to fit the text container would result in miss alignment of the hyphen.
-- Updated package license.
-- Non-Breaking Space character (0xA0) will now be excluded from word spacing adjustments when using Justified or Flush text alignment.
-- Improved handling of Underline, Strikethrough and Mark tag with regards to vertex color and Color tag alpha.
-- Improved TMP_FontAsset.HasCharacter(char character, bool searchFallbacks) to include a recursive search of fallbacks as well as TMP Settings fallback list and default font asset.
-- The <gradient> tag will now also apply to sprites provided the sprite tint attribute is set to a value of 1. Ex. <sprite="Sprite Asset" index=0 tint=1>.
-- Updated Font Asset Creator Plugin to allow for cancellation of the font asset generation process.
-- Added callback to support the Scriptable Render Pipeline (SRP) with the normal TextMeshPro component.
-- Improved handling of some non-breaking space characters which should not be ignored at the end of a line.
-- Sprite Asset fallbacks will now be searched when using the <sprite> tag and referencing a sprite by Unicode or by Name.
-- Updated EmojiOne samples from https://www.emojione.com/ and added attribution.
-- Removed the 32bit versions of the TMP Plugins used by the Font Asset Creator since the Unity Editor is now only available as 64bit.
-- The isTextTruncated property is now serialized.
-- Added new event handler to the TMP_TextEventHandler.cs script included in Example 12a to allow tracking of interactions with Sprites.
-
-## [1.2.1] - 2018-02-14
-### Changes
-- Package is now backwards compatible with Unity 2018.1.
-- Renamed Assembly Definitions (.asmdef) to new UPM package conventions.
-- Added DisplayName for TMP UPM package.
-- Revised Editor and Playmode tests to ignore / skip over the tests if the required resources are not present in the project.
-- Revised implementation of Font Asset Creator progress bar to use Unity's EditorGUI.ProgressBar instead of custom texture.
-- Fixed an issue where using the material tag in conjunction with fallback font assets was not handled correctly.
-- Fixed an issue where changing the fontStyle property in conjunction with using alternative typefaces / font weights would not correctly trigger a regeneration of the text object.
-
-## [1.2.0] - 2018-01-23
-### Changes
-- Package version # increased to 1.2.0 which is the first release for Unity 2018.2.
-
-## [1.1.0] - 2018-01-23
-### Changes
-- Package version # increased to 1.1.0 which is the first release for Unity 2018.1.
-
-## [1.0.27] - 2018-01-16
-### Changes
-- Fixed an issue where setting the TMP_InputField.text property to null would result in an error.
-- Fixed issue with Raycast Target state not getting serialized properly when saving / reloading a scene.
-- Changed reference to PrefabUtility.GetPrefabParent() to PrefabUtility.GetCorrespondingObjectFromSource() to reflect public API change in 2018.2
-- Option to import package essential resources will only be presented to users when accessing a TMP component or the TMP Settings file via the project menu.
-
-## [1.0.26] - 2018-01-10
-### Added
-- Removed Tizen player references in the TMP_InputField as the Tizen player is no longer supported as of Unity 2018.1.
-
-## [1.0.25] - 2018-01-05
-### Added
-- Fixed a minor issue with PreferredValues calculation in conjunction with using text auto-sizing.
-- Improved Kerning handling where it is now possible to define positional adjustments for the first and second glyph in the pair.
-- Renamed Kerning Info Table to Glyph Adjustment Table to better reflect the added functionality of this table.
-- Added Search toolbar to the Glyph Adjustment Table.
-- Fixed incorrect detection / handling of Asset Serialization mode in the Project Conversion Utility.
-- Removed SelectionBase attribute from TMP components.
-- Revised TMP Shaders to support the new UNITY_UI_CLIP_RECT shader keyword which can provide a performance improvement of up to 30% on some devices.
-- Added TMP_PRESENT define as per the request of several third party asset publishers.
-
-## [1.0.23] - 2017-11-14
-### Added
-- New menu option added to Import Examples and additional content like Font Assets, Materials Presets, etc for TextMesh Pro. This new menu option is located in "Window -> TextMeshPro -> Import Examples and Extra Content".
-- New menu option added to Convert existing project files and assets created with either the Source Code or DLL only version of TextMesh Pro. Please be sure to backup your project before using this option. The new menu option is located in "Window -> TextMeshPro -> Project Files GUID Remapping Tool".
-- Added Assembly Definitions for the TMP Runtime and Editor scripts.
-- Added support for the UI DirtyLayoutCallback, DirtyVerticesCallback and DirtyMaterialCallback.
\ No newline at end of file
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/CHANGELOG.md.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/CHANGELOG.md.meta
deleted file mode 100644
index edf5c327..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/CHANGELOG.md.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 22464cf7ab0243a6bf9c79851183b002
-TextScriptImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Documentation~/TextMeshPro.md b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Documentation~/TextMeshPro.md
deleted file mode 100644
index 8f8c0926..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Documentation~/TextMeshPro.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# **_TextMesh Pro User Guide_**
-
-#### **Overview**
-This User Guide was designed to provide first time users of TextMesh Pro with a basic overview of the features and functionality of the tool.
-
-#### **Installation**
-The TextMesh Pro UPM package is already included with the Unity Editor and as such does not require installation. TextMesh Pro "TMP" does however require adding resources to your project which are essential for using TextMesh Pro.
-
-To import the "*TMP Essential Resources*", please use the "*Window -> TextMeshPro -> Import TMP Essential Resources*" menu option. These resources will be added at the root of your project in the "*TextMesh Pro*" folder.
-
-The TextMesh Pro package also includes additional resources and examples that will make discovering and learning about TextMesh Pro's powerful features easier. It is strongly recommended that first time users import these additional resources.
-
-To import the "*TMP Examples & Extras*", please use the "*Window -> TextMeshPro -> Import TMP Examples & Extras*" menu option. These resources will also be added in the same "*TextMesh Pro*" folder inside your project.
-
-
-#### **Quick Start**
-There are two TextMesh Pro components available. The first TMP text component is of type <TextMeshPro> and designed to work with the MeshRenderer. This component is an ideal replacement for the legacy TextMesh component.
-
-To add a new <TextMeshPro> text object, go to: *GameObject->3D Object->TextMeshPro Text*.
-
-The second TMP text component is of type <TextMeshProUGUI> and designed to work with the CanvasRenderer and Canvas system. This component is an ideal replacement for the UI.Text component.
-
-To add a new <TextMeshProUGUI> text object, go to: *GameObject->UI->TextMeshPro Text*.
-
-You may also wish to watch this [Getting Started](https://youtu.be/olnxlo-Wri4) short video which covers this topic.
-
-We strongly recommend that you also watch the [Font Asset Creation](https://youtu.be/qzJNIGCFFtY) video as well as the [Working with Material Presets](https://youtu.be/d2MARbDNeaA) as these two topics is also key to working and getting the most out of TextMesh Pro.
-
-As mentionned in the Installation section of this guide, it is recommended that you import the "*TMP Examples & Extras*" and take the time to explore each of the examples as they provide a great overview of the functionality of the tool and the many text layout and [rich text tags](http://digitalnativestudios.com/textmeshpro/docs/rich-text/) available in TextMesh Pro.
-
-#### **Support & API Documentation**
-Should you have questions or require assistance, please visit the [Unity UI & TextMesh Pro](https://forum.unity.com/forums/unity-ui-textmesh-pro.60/) section of the Unity forum as well as the [TextMesh Pro User Forum](http://digitalnativestudios.com/forum/index.php) where you will find additional information, [Video Tutorials](http://digitalnativestudios.com/forum/index.php?board=4.0) and [FAQ](http://digitalnativestudios.com/forum/index.php?topic=890.0). In the event you are unable to find the information you seek, always feel free to post on the [Unity UI & TextMesh Pro](https://forum.unity.com/forums/unity-ui-textmesh-pro.60/) section user forum.
-
-[Online Documentation](http://digitalnativestudios.com/textmeshpro/docs/) is also available on TextMesh Pro including Rich Text tags, Shaders, Scripting API and more.
-
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Documentation~/TextMeshPro.md.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Documentation~/TextMeshPro.md.meta
deleted file mode 100644
index 8c72f725..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Documentation~/TextMeshPro.md.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: ca77d26d10b9455ca5a4b22c93be2a31
-TextScriptImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources.meta
deleted file mode 100644
index 7c07b007..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d1a0a27327b54c3bac52a08929c33f81
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos.meta
deleted file mode 100644
index f2596c78..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e93ec7eb6de342aabd156833e253f838
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Dropdown Icon.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Dropdown Icon.psd
deleted file mode 100644
index 93f5a2cb..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Dropdown Icon.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Dropdown Icon.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Dropdown Icon.psd.meta
deleted file mode 100644
index 7bdb473e..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Dropdown Icon.psd.meta
+++ /dev/null
@@ -1,143 +0,0 @@
-fileFormatVersion: 2
-guid: a7ec9e7ad8b847b7ae4510af83c5d868
-TextureImporter:
- fileIDToRecycleName: {}
- externalObjects: {}
- serializedVersion: 7
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- sRGBTexture: 1
- linearTexture: 1
- 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
- grayScaleToAlpha: 0
- generateCubemap: 6
- cubemapConvolution: 0
- seamlessCubemap: 0
- textureFormat: -2
- maxTextureSize: 128
- textureSettings:
- serializedVersion: 2
- filterMode: -1
- aniso: 1
- mipBias: -100
- wrapU: 1
- wrapV: 1
- wrapW: 1
- nPOTScale: 0
- lightmap: 0
- compressionQuality: 50
- spriteMode: 0
- 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: 2
- textureShape: 1
- singleChannelComponent: 0
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- platformSettings:
- - serializedVersion: 2
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 128
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- - serializedVersion: 2
- buildTarget: Standalone
- maxTextureSize: 128
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- - serializedVersion: 2
- buildTarget: iPhone
- maxTextureSize: 128
- resizeAlgorithm: 0
- textureFormat: 2
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- - serializedVersion: 2
- buildTarget: Android
- maxTextureSize: 128
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- - serializedVersion: 2
- buildTarget: Windows Store Apps
- maxTextureSize: 128
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- - serializedVersion: 2
- buildTarget: WebGL
- maxTextureSize: 128
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID:
- vertices: []
- indices:
- edges: []
- weights: []
- spritePackingTag:
- pSDRemoveMatte: 1
- pSDShowRemoveMatteOption: 1
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Font Asset Icon.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Font Asset Icon.psd
deleted file mode 100644
index 2fb1164d..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Font Asset Icon.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Font Asset Icon.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Font Asset Icon.psd.meta
deleted file mode 100644
index bd64ad7d..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Font Asset Icon.psd.meta
+++ /dev/null
@@ -1,57 +0,0 @@
-fileFormatVersion: 2
-guid: ee148e281f3c41c5b4ff5f8a5afe5a6c
-timeCreated: 1463559213
-licenseType: Pro
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: 0.25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 7
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 128
- textureSettings:
- filterMode: -1
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- allowsAlphaSplitting: 0
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- outline: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Input Field Icon.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Input Field Icon.psd
deleted file mode 100644
index f0360d34..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Input Field Icon.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Input Field Icon.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Input Field Icon.psd.meta
deleted file mode 100644
index eb2e1ce2..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Input Field Icon.psd.meta
+++ /dev/null
@@ -1,57 +0,0 @@
-fileFormatVersion: 2
-guid: 3ee40aa79cd242a5b53b0b0ca4f13f0f
-timeCreated: 1457860876
-licenseType: Pro
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: 0.25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 128
- textureSettings:
- filterMode: -1
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- allowsAlphaSplitting: 0
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- outline: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Sprite Asset Icon.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Sprite Asset Icon.psd
deleted file mode 100644
index 7036296e..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Sprite Asset Icon.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Sprite Asset Icon.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Sprite Asset Icon.psd.meta
deleted file mode 100644
index a22cdf1c..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Sprite Asset Icon.psd.meta
+++ /dev/null
@@ -1,57 +0,0 @@
-fileFormatVersion: 2
-guid: ec7c645d93308c04d8840982af12101e
-timeCreated: 1463559213
-licenseType: Pro
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: 0.25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 7
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 128
- textureSettings:
- filterMode: -1
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- allowsAlphaSplitting: 0
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- outline: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Text Component Icon.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Text Component Icon.psd
deleted file mode 100644
index 3cc41630..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Text Component Icon.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Text Component Icon.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Text Component Icon.psd.meta
deleted file mode 100644
index 623993d2..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Gizmos/TMP - Text Component Icon.psd.meta
+++ /dev/null
@@ -1,53 +0,0 @@
-fileFormatVersion: 2
-guid: 2fd6421f253b4ef1a19526541f9ffc0c
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: .25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 128
- textureSettings:
- filterMode: -1
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: .5, y: .5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Shaders.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Shaders.meta
deleted file mode 100644
index 95efe2ba..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Shaders.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2da27f5fe80a3a549ac7331d9f52f5f0
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Shaders/TMP_Properties.cginc b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Shaders/TMP_Properties.cginc
deleted file mode 100644
index 2e962588..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Shaders/TMP_Properties.cginc
+++ /dev/null
@@ -1,85 +0,0 @@
-// UI Editable properties
-uniform sampler2D _FaceTex; // Alpha : Signed Distance
-uniform float _FaceUVSpeedX;
-uniform float _FaceUVSpeedY;
-uniform fixed4 _FaceColor; // RGBA : Color + Opacity
-uniform float _FaceDilate; // v[ 0, 1]
-uniform float _OutlineSoftness; // v[ 0, 1]
-
-uniform sampler2D _OutlineTex; // RGBA : Color + Opacity
-uniform float _OutlineUVSpeedX;
-uniform float _OutlineUVSpeedY;
-uniform fixed4 _OutlineColor; // RGBA : Color + Opacity
-uniform float _OutlineWidth; // v[ 0, 1]
-
-uniform float _Bevel; // v[ 0, 1]
-uniform float _BevelOffset; // v[-1, 1]
-uniform float _BevelWidth; // v[-1, 1]
-uniform float _BevelClamp; // v[ 0, 1]
-uniform float _BevelRoundness; // v[ 0, 1]
-
-uniform sampler2D _BumpMap; // Normal map
-uniform float _BumpOutline; // v[ 0, 1]
-uniform float _BumpFace; // v[ 0, 1]
-
-uniform samplerCUBE _Cube; // Cube / sphere map
-uniform fixed4 _ReflectFaceColor; // RGB intensity
-uniform fixed4 _ReflectOutlineColor;
-//uniform float _EnvTiltX; // v[-1, 1]
-//uniform float _EnvTiltY; // v[-1, 1]
-uniform float3 _EnvMatrixRotation;
-uniform float4x4 _EnvMatrix;
-
-uniform fixed4 _SpecularColor; // RGB intensity
-uniform float _LightAngle; // v[ 0,Tau]
-uniform float _SpecularPower; // v[ 0, 1]
-uniform float _Reflectivity; // v[ 5, 15]
-uniform float _Diffuse; // v[ 0, 1]
-uniform float _Ambient; // v[ 0, 1]
-
-uniform fixed4 _UnderlayColor; // RGBA : Color + Opacity
-uniform float _UnderlayOffsetX; // v[-1, 1]
-uniform float _UnderlayOffsetY; // v[-1, 1]
-uniform float _UnderlayDilate; // v[-1, 1]
-uniform float _UnderlaySoftness; // v[ 0, 1]
-
-uniform fixed4 _GlowColor; // RGBA : Color + Intesity
-uniform float _GlowOffset; // v[-1, 1]
-uniform float _GlowOuter; // v[ 0, 1]
-uniform float _GlowInner; // v[ 0, 1]
-uniform float _GlowPower; // v[ 1, 1/(1+4*4)]
-
-// API Editable properties
-uniform float _ShaderFlags;
-uniform float _WeightNormal;
-uniform float _WeightBold;
-
-uniform float _ScaleRatioA;
-uniform float _ScaleRatioB;
-uniform float _ScaleRatioC;
-
-uniform float _VertexOffsetX;
-uniform float _VertexOffsetY;
-
-//uniform float _UseClipRect;
-uniform float _MaskID;
-uniform sampler2D _MaskTex;
-uniform float4 _MaskCoord;
-uniform float4 _ClipRect; // bottom left(x,y) : top right(z,w)
-//uniform float _MaskWipeControl;
-//uniform float _MaskEdgeSoftness;
-//uniform fixed4 _MaskEdgeColor;
-//uniform bool _MaskInverse;
-
-uniform float _MaskSoftnessX;
-uniform float _MaskSoftnessY;
-
-// Font Atlas properties
-uniform sampler2D _MainTex;
-uniform float _TextureWidth;
-uniform float _TextureHeight;
-uniform float _GradientScale;
-uniform float _ScaleX;
-uniform float _ScaleY;
-uniform float _PerspectiveFilter;
-uniform float _Sharpness;
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Shaders/TMP_Properties.cginc.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Shaders/TMP_Properties.cginc.meta
deleted file mode 100644
index e6dcc0a0..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Shaders/TMP_Properties.cginc.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 3c6c403084eacec478a1129ce20061ea
-ShaderImporter:
- externalObjects: {}
- defaultTextures: []
- nonModifiableTextures: []
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Shaders/TMP_SDF Internal Editor.shader b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Shaders/TMP_SDF Internal Editor.shader
deleted file mode 100644
index baf4501c..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Shaders/TMP_SDF Internal Editor.shader
+++ /dev/null
@@ -1,75 +0,0 @@
-// Simplified SDF shader:
-// - No Shading Option (bevel / bump / env map)
-// - No Glow Option
-// - Softness is applied on both side of the outline
-
-Shader "Hidden/TMP/Internal/Editor/Distance Field SSD" {
-
- Properties{
- _FaceColor("Face Color", Color) = (1,1,1,1)
- _FaceDilate("Face Dilate", Range(-1,1)) = 0
-
- _OutlineColor("Outline Color", Color) = (0,0,0,1)
- _OutlineWidth("Outline Thickness", Range(0,1)) = 0
- _OutlineSoftness("Outline Softness", Range(0,1)) = 0
-
- _UnderlayColor("Border Color", Color) = (0,0,0,.5)
- _UnderlayOffsetX("Border OffsetX", Range(-1,1)) = 0
- _UnderlayOffsetY("Border OffsetY", Range(-1,1)) = 0
- _UnderlayDilate("Border Dilate", Range(-1,1)) = 0
- _UnderlaySoftness("Border Softness", Range(0,1)) = 0
-
- _WeightNormal("Weight Normal", float) = 0
- _WeightBold("Weight Bold", float) = .5
-
- _ShaderFlags("Flags", float) = 0
- _ScaleRatioA("Scale RatioA", float) = 1
- _ScaleRatioB("Scale RatioB", float) = 1
- _ScaleRatioC("Scale RatioC", float) = 1
-
- _MainTex("Font Atlas", 2D) = "white" {}
- _TextureWidth("Texture Width", float) = 1024
- _TextureHeight("Texture Height", float) = 1024
- _GradientScale("Gradient Scale", float) = 1
- _ScaleX("Scale X", float) = 1
- _ScaleY("Scale Y", float) = 1
- _PerspectiveFilter("Perspective Correction", Range(0, 1)) = 0.875
- _Sharpness("Sharpness", Range(-1,1)) = 0
-
- _VertexOffsetX("Vertex OffsetX", float) = 0
- _VertexOffsetY("Vertex OffsetY", float) = 0
- }
-
- SubShader
- {
- Tags
- {
- "ForceSupported" = "True"
- }
-
- Lighting Off
- Blend One OneMinusSrcAlpha
- Cull Off
- ZWrite Off
- ZTest Always
-
- Pass
- {
- CGPROGRAM
- #pragma vertex VertShader
- #pragma fragment PixShader
- #pragma shader_feature __ OUTLINE_ON
- #pragma shader_feature __ UNDERLAY_ON UNDERLAY_INNER
-
- #include "UnityCG.cginc"
- #include "UnityUI.cginc"
- #include "TMP_Properties.cginc"
-
- #include "TMP_SDF_SSD.cginc"
-
- ENDCG
- }
- }
-
- CustomEditor "TMPro.EditorUtilities.TMP_SDFShaderGUI"
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Shaders/TMP_SDF Internal Editor.shader.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Shaders/TMP_SDF Internal Editor.shader.meta
deleted file mode 100644
index 5ba708d8..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Shaders/TMP_SDF Internal Editor.shader.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 9c442dc870b456e48b615cd8add0e9ef
-ShaderImporter:
- externalObjects: {}
- defaultTextures: []
- nonModifiableTextures: []
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Shaders/TMP_SDF_SSD.cginc b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Shaders/TMP_SDF_SSD.cginc
deleted file mode 100644
index 0f587bd4..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Shaders/TMP_SDF_SSD.cginc
+++ /dev/null
@@ -1,132 +0,0 @@
-struct vertex_t
-{
- float4 position : POSITION;
- float3 normal : NORMAL;
- float4 color : COLOR;
- float2 texcoord0 : TEXCOORD0;
- float2 texcoord1 : TEXCOORD1;
-};
-
-struct pixel_t
-{
- float4 position : SV_POSITION;
- float4 faceColor : COLOR;
- float4 outlineColor : COLOR1;
- float2 texcoord0 : TEXCOORD0;
- float4 param : TEXCOORD1; // weight, scaleRatio
- float2 clipUV : TEXCOORD2;
- #if (UNDERLAY_ON || UNDERLAY_INNER)
- float4 texcoord2 : TEXCOORD3;
- float4 underlayColor : COLOR2;
- #endif
-};
-
-sampler2D _GUIClipTexture;
-uniform float4x4 unity_GUIClipTextureMatrix;
-float4 _MainTex_TexelSize;
-
-float4 SRGBToLinear(float4 rgba)
-{
- return float4(lerp(rgba.rgb / 12.92f, pow((rgba.rgb + 0.055f) / 1.055f, 2.4f), step(0.04045f, rgba.rgb)), rgba.a);
-}
-
-pixel_t VertShader(vertex_t input)
-{
- pixel_t output;
-
- float bold = step(input.texcoord1.y, 0);
-
- float4 vert = input.position;
- vert.x += _VertexOffsetX;
- vert.y += _VertexOffsetY;
-
- float4 vPosition = UnityObjectToClipPos(vert);
-
- float weight = lerp(_WeightNormal, _WeightBold, bold) / 4.0;
- weight = (weight + _FaceDilate) * _ScaleRatioA * 0.5;
-
- // Generate UV for the Clip Texture
- float3 eyePos = UnityObjectToViewPos(input.position);
- float2 clipUV = mul(unity_GUIClipTextureMatrix, float4(eyePos.xy, 0, 1.0));
-
- float4 color = input.color;
- #if (FORCE_LINEAR && !UNITY_COLORSPACE_GAMMA)
- color = SRGBToLinear(input.color);
- #endif
-
- float opacity = color.a;
- #if (UNDERLAY_ON | UNDERLAY_INNER)
- opacity = 1.0;
- #endif
-
- float4 faceColor = float4(color.rgb, opacity) * _FaceColor;
- faceColor.rgb *= faceColor.a;
-
- float4 outlineColor = _OutlineColor;
- outlineColor.a *= opacity;
- outlineColor.rgb *= outlineColor.a;
-
- output.position = vPosition;
- output.faceColor = faceColor;
- output.outlineColor = outlineColor;
- output.texcoord0 = float2(input.texcoord0.xy);
- output.param = float4(0.5 - weight, 1.3333 * _GradientScale * (_Sharpness + 1) / _MainTex_TexelSize.z , _OutlineWidth * _ScaleRatioA * 0.5, 0);
- output.clipUV = clipUV;
-
- #if (UNDERLAY_ON || UNDERLAY_INNER)
- float4 underlayColor = _UnderlayColor;
- underlayColor.rgb *= underlayColor.a;
-
- float x = -(_UnderlayOffsetX * _ScaleRatioC) * _GradientScale / _MainTex_TexelSize.z;
- float y = -(_UnderlayOffsetY * _ScaleRatioC) * _GradientScale / _MainTex_TexelSize.w;
-
- output.texcoord2 = float4(input.texcoord0 + float2(x, y), input.color.a, 0);
- output.underlayColor = underlayColor;
- #endif
-
- return output;
-}
-
-float4 PixShader(pixel_t input) : SV_Target
-{
- float d = tex2D(_MainTex, input.texcoord0.xy).a;
-
- float2 UV = input.texcoord0.xy;
- float scale = rsqrt(abs(ddx(UV.x) * ddy(UV.y) - ddy(UV.x) * ddx(UV.y))) * input.param.y;
-
- #if (UNDERLAY_ON | UNDERLAY_INNER)
- float layerScale = scale;
- layerScale /= 1 + ((_UnderlaySoftness * _ScaleRatioC) * layerScale);
- float layerBias = input.param.x * layerScale - .5 - ((_UnderlayDilate * _ScaleRatioC) * .5 * layerScale);
- #endif
-
- scale /= 1 + (_OutlineSoftness * _ScaleRatioA * scale);
-
- float4 faceColor = input.faceColor * saturate((d - input.param.x) * scale + 0.5);
-
- #ifdef OUTLINE_ON
- float4 outlineColor = lerp(input.faceColor, input.outlineColor, sqrt(min(1.0, input.param.z * scale * 2)));
- faceColor = lerp(outlineColor, input.faceColor, saturate((d - input.param.x - input.param.z) * scale + 0.5));
- faceColor *= saturate((d - input.param.x + input.param.z) * scale + 0.5);
- #endif
-
- #if UNDERLAY_ON
- d = tex2D(_MainTex, input.texcoord2.xy).a * layerScale;
- faceColor += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * saturate(d - layerBias) * (1 - faceColor.a);
- #endif
-
- #if UNDERLAY_INNER
- float bias = input.param.x * scale - 0.5;
- float sd = saturate(d * scale - bias - input.param.z);
- d = tex2D(_MainTex, input.texcoord2.xy).a * layerScale;
- faceColor += float4(_UnderlayColor.rgb * _UnderlayColor.a, _UnderlayColor.a) * (1 - saturate(d - layerBias)) * sd * (1 - faceColor.a);
- #endif
-
- #if (UNDERLAY_ON | UNDERLAY_INNER)
- faceColor *= input.texcoord2.z;
- #endif
-
- faceColor *= tex2D(_GUIClipTexture, input.clipUV).a;
-
- return faceColor;
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Shaders/TMP_SDF_SSD.cginc.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Shaders/TMP_SDF_SSD.cginc.meta
deleted file mode 100644
index 3d0b3bf4..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Shaders/TMP_SDF_SSD.cginc.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: abe6991365a27d341a10580f3b7c0f44
-ShaderImporter:
- externalObjects: {}
- defaultTextures: []
- nonModifiableTextures: []
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures.meta
deleted file mode 100644
index d6754b05..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f8e6a2d47aba4c6c9b3c5a72d9f48da5
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/SectionHeader_Dark.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/SectionHeader_Dark.psd
deleted file mode 100644
index 8ebaa27a..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/SectionHeader_Dark.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/SectionHeader_Dark.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/SectionHeader_Dark.psd.meta
deleted file mode 100644
index ed7250a7..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/SectionHeader_Dark.psd.meta
+++ /dev/null
@@ -1,53 +0,0 @@
-fileFormatVersion: 2
-guid: fb5730e24283d0c489e5c7d0bee023d9
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: .25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: .5, y: .5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/SectionHeader_Light.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/SectionHeader_Light.psd
deleted file mode 100644
index e598e6d9..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/SectionHeader_Light.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/SectionHeader_Light.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/SectionHeader_Light.psd.meta
deleted file mode 100644
index 1e747b22..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/SectionHeader_Light.psd.meta
+++ /dev/null
@@ -1,53 +0,0 @@
-fileFormatVersion: 2
-guid: e3b0f810fdea84e40ab4ba20f256f7e8
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: .25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: .5, y: .5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBaseLine.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBaseLine.psd
deleted file mode 100644
index 3da358a1..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBaseLine.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBaseLine.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBaseLine.psd.meta
deleted file mode 100644
index 09deb3c8..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBaseLine.psd.meta
+++ /dev/null
@@ -1,53 +0,0 @@
-fileFormatVersion: 2
-guid: 8bc445bb79654bf496c92d0407840a92
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: .25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: .5, y: .5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBaseLine_Light.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBaseLine_Light.psd
deleted file mode 100644
index cf49b6cb..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBaseLine_Light.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBaseLine_Light.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBaseLine_Light.psd.meta
deleted file mode 100644
index 78e14cba..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBaseLine_Light.psd.meta
+++ /dev/null
@@ -1,53 +0,0 @@
-fileFormatVersion: 2
-guid: 18775b51e3bd42299fd30bd036ea982f
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: .25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: .5, y: .5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBottom.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBottom.psd
deleted file mode 100644
index 1f35779e..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBottom.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBottom.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBottom.psd.meta
deleted file mode 100644
index 8e79b489..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBottom.psd.meta
+++ /dev/null
@@ -1,53 +0,0 @@
-fileFormatVersion: 2
-guid: ca51b19024094d1b87f3e07edb0a75fb
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: .25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: .5, y: .5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBottom_Light.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBottom_Light.psd
deleted file mode 100644
index d8af55bd..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBottom_Light.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBottom_Light.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBottom_Light.psd.meta
deleted file mode 100644
index 9c9a6fc0..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignBottom_Light.psd.meta
+++ /dev/null
@@ -1,53 +0,0 @@
-fileFormatVersion: 2
-guid: 585b70cb75dd43efbfead809c30a1731
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: .25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: .5, y: .5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCapLine.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCapLine.psd
deleted file mode 100644
index 7eefe6b2..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCapLine.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCapLine.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCapLine.psd.meta
deleted file mode 100644
index 0455a2fc..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCapLine.psd.meta
+++ /dev/null
@@ -1,58 +0,0 @@
-fileFormatVersion: 2
-guid: 0d9a36012a224080966c7b55896aa0f9
-timeCreated: 1467964791
-licenseType: Pro
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: 0.25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 7
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- allowsAlphaSplitting: 0
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCapLine_Light.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCapLine_Light.psd
deleted file mode 100644
index f08bb6ce..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCapLine_Light.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCapLine_Light.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCapLine_Light.psd.meta
deleted file mode 100644
index dfd05a11..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCapLine_Light.psd.meta
+++ /dev/null
@@ -1,58 +0,0 @@
-fileFormatVersion: 2
-guid: 49679f302ac6408697f6b9314a38985c
-timeCreated: 1467964413
-licenseType: Pro
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: 0.25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 7
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- allowsAlphaSplitting: 0
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenter.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenter.psd
deleted file mode 100644
index 939bc6dc..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenter.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenter.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenter.psd.meta
deleted file mode 100644
index d189fc27..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenter.psd.meta
+++ /dev/null
@@ -1,53 +0,0 @@
-fileFormatVersion: 2
-guid: 81ed8c76d2bc4a4c95d092c98af4e58f
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: .25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: .5, y: .5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenterGeo.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenterGeo.psd
deleted file mode 100644
index f9ce9a8b..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenterGeo.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenterGeo.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenterGeo.psd.meta
deleted file mode 100644
index 555bb1bb..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenterGeo.psd.meta
+++ /dev/null
@@ -1,56 +0,0 @@
-fileFormatVersion: 2
-guid: c76700ea0062413d9f69409b4e9e151b
-timeCreated: 1484171296
-licenseType: Pro
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: .25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- allowsAlphaSplitting: 0
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: .5, y: .5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenterGeo_Light.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenterGeo_Light.psd
deleted file mode 100644
index e37b2e25..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenterGeo_Light.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenterGeo_Light.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenterGeo_Light.psd.meta
deleted file mode 100644
index 044d0c21..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenterGeo_Light.psd.meta
+++ /dev/null
@@ -1,56 +0,0 @@
-fileFormatVersion: 2
-guid: 35ff0937876540d3bd4b6a941df62a92
-timeCreated: 1484171296
-licenseType: Pro
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: .25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- allowsAlphaSplitting: 0
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: .5, y: .5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenter_Light.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenter_Light.psd
deleted file mode 100644
index 7274887f..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenter_Light.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenter_Light.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenter_Light.psd.meta
deleted file mode 100644
index d98d3772..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignCenter_Light.psd.meta
+++ /dev/null
@@ -1,53 +0,0 @@
-fileFormatVersion: 2
-guid: 6ace62d30f494c948b71d5594afce11d
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: .25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: .5, y: .5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignFlush.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignFlush.psd
deleted file mode 100644
index eeeea67b..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignFlush.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignFlush.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignFlush.psd.meta
deleted file mode 100644
index 84ed28c0..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignFlush.psd.meta
+++ /dev/null
@@ -1,53 +0,0 @@
-fileFormatVersion: 2
-guid: 691475c57a824010be0c6f474caeb7e1
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: .25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: .5, y: .5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignFlush_Light.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignFlush_Light.psd
deleted file mode 100644
index b69f6a2e..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignFlush_Light.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignFlush_Light.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignFlush_Light.psd.meta
deleted file mode 100644
index b9e61247..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignFlush_Light.psd.meta
+++ /dev/null
@@ -1,53 +0,0 @@
-fileFormatVersion: 2
-guid: 64b9fad609434c489c32b1cdf2004a1c
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: .25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: .5, y: .5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignJustified.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignJustified.psd
deleted file mode 100644
index 3ce55c49..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignJustified.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignJustified.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignJustified.psd.meta
deleted file mode 100644
index f8a90b42..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignJustified.psd.meta
+++ /dev/null
@@ -1,59 +0,0 @@
-fileFormatVersion: 2
-guid: 92027f7f8cfc4feaa477da0dc38d3d46
-timeCreated: 1472535271
-licenseType: Pro
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: 0.25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 7
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- allowsAlphaSplitting: 0
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- spriteTessellationDetail: -1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignJustified_Light.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignJustified_Light.psd
deleted file mode 100644
index d7fd5c82..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignJustified_Light.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignJustified_Light.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignJustified_Light.psd.meta
deleted file mode 100644
index e5b5aa85..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignJustified_Light.psd.meta
+++ /dev/null
@@ -1,59 +0,0 @@
-fileFormatVersion: 2
-guid: fa6bd40a216346b783a4cce741d277a5
-timeCreated: 1472535778
-licenseType: Pro
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: 0.25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 7
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- allowsAlphaSplitting: 0
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- spriteTessellationDetail: -1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignLeft.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignLeft.psd
deleted file mode 100644
index fc7e10b2..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignLeft.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignLeft.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignLeft.psd.meta
deleted file mode 100644
index 8023379e..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignLeft.psd.meta
+++ /dev/null
@@ -1,53 +0,0 @@
-fileFormatVersion: 2
-guid: 9288066c33474b94b6ee5465f4df1cc0
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: .25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: .5, y: .5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignLeft_Light.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignLeft_Light.psd
deleted file mode 100644
index 5522c373..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignLeft_Light.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignLeft_Light.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignLeft_Light.psd.meta
deleted file mode 100644
index aaa8b81d..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignLeft_Light.psd.meta
+++ /dev/null
@@ -1,53 +0,0 @@
-fileFormatVersion: 2
-guid: 12736c98af174f91827a26b66d2b01b9
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: .25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: .5, y: .5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMidLine.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMidLine.psd
deleted file mode 100644
index 14d28a2d..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMidLine.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMidLine.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMidLine.psd.meta
deleted file mode 100644
index e481463b..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMidLine.psd.meta
+++ /dev/null
@@ -1,58 +0,0 @@
-fileFormatVersion: 2
-guid: c2f7f6a88b4c4f20a53deb72f3d9144c
-timeCreated: 1426240649
-licenseType: Store
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: 0.25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- allowsAlphaSplitting: 0
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMiddle.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMiddle.psd
deleted file mode 100644
index c4483dbd..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMiddle.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMiddle.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMiddle.psd.meta
deleted file mode 100644
index d1ec5285..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMiddle.psd.meta
+++ /dev/null
@@ -1,53 +0,0 @@
-fileFormatVersion: 2
-guid: 41b96614b2e6494ba995ddcd252d11ae
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: .25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: .5, y: .5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMiddle_Light.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMiddle_Light.psd
deleted file mode 100644
index 4263bf9b..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMiddle_Light.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMiddle_Light.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMiddle_Light.psd.meta
deleted file mode 100644
index 7cda20b7..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMiddle_Light.psd.meta
+++ /dev/null
@@ -1,53 +0,0 @@
-fileFormatVersion: 2
-guid: 066619c9c9c84f89acb1b48c11a7efe2
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: .25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: .5, y: .5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMidline_Light.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMidline_Light.psd
deleted file mode 100644
index a5bed371..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMidline_Light.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMidline_Light.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMidline_Light.psd.meta
deleted file mode 100644
index 6fabec54..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignMidline_Light.psd.meta
+++ /dev/null
@@ -1,58 +0,0 @@
-fileFormatVersion: 2
-guid: bb42b2d967d6427983c901a4ffc8ecd9
-timeCreated: 1426240650
-licenseType: Store
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: 0.25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- allowsAlphaSplitting: 0
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignRight.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignRight.psd
deleted file mode 100644
index 4ef1998b..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignRight.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignRight.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignRight.psd.meta
deleted file mode 100644
index cf5c7649..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignRight.psd.meta
+++ /dev/null
@@ -1,53 +0,0 @@
-fileFormatVersion: 2
-guid: 342a0f8aca7f4f0691338912faec0494
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: .25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: .5, y: .5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignRight_Light.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignRight_Light.psd
deleted file mode 100644
index bdeff413..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignRight_Light.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignRight_Light.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignRight_Light.psd.meta
deleted file mode 100644
index dab7997c..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignRight_Light.psd.meta
+++ /dev/null
@@ -1,53 +0,0 @@
-fileFormatVersion: 2
-guid: e05ace3bd15740cda0bad60d89092a5b
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: .25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: .5, y: .5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignTop.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignTop.psd
deleted file mode 100644
index b00d4585..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignTop.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignTop.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignTop.psd.meta
deleted file mode 100644
index 74931bf8..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignTop.psd.meta
+++ /dev/null
@@ -1,53 +0,0 @@
-fileFormatVersion: 2
-guid: 48d034c499ee4697af9dd6e327110249
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: .25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: .5, y: .5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignTop_Light.psd b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignTop_Light.psd
deleted file mode 100644
index 84f0e61c..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignTop_Light.psd and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignTop_Light.psd.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignTop_Light.psd.meta
deleted file mode 100644
index bbd509d1..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Editor Resources/Textures/btn_AlignTop_Light.psd.meta
+++ /dev/null
@@ -1,53 +0,0 @@
-fileFormatVersion: 2
-guid: ed041e68439749a69d0efa0e3d896c2e
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 2
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- linearTexture: 1
- correctGamma: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: .25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 0
- cubemapConvolution: 0
- cubemapConvolutionSteps: 8
- cubemapConvolutionExponent: 1.5
- seamlessCubemap: 0
- textureFormat: -3
- maxTextureSize: 32
- textureSettings:
- filterMode: 0
- aniso: 1
- mipBias: -1
- wrapMode: 1
- nPOTScale: 0
- lightmap: 0
- rGBM: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: .5, y: .5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaIsTransparency: 1
- textureType: 2
- buildTargetSettings: []
- spriteSheet:
- sprites: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/LICENSE.md b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/LICENSE.md
deleted file mode 100644
index 37d06155..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/LICENSE.md
+++ /dev/null
@@ -1,5 +0,0 @@
-TextMesh Pro copyright © 2014-2019 Unity Technologies ApS
-
-Licensed under the Unity Companion License for Unity-dependent projects--see [Unity Companion License](http://www.unity3d.com/legal/licenses/Unity_Companion_License).
-
-Unless expressly provided otherwise, the Software under this license is made available strictly on an “AS IS” BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the license for details on these and other terms and conditions.
\ No newline at end of file
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/LICENSE.md.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/LICENSE.md.meta
deleted file mode 100644
index 1df95556..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/LICENSE.md.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 0d2d0f36e67d4518a07df76235e91f9a
-TextScriptImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Package Resources.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Package Resources.meta
deleted file mode 100644
index e8a96b82..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Package Resources.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5ec95f4d5b2d1f14e9ff8682562553f9
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Package Resources/TMP Essential Resources.unitypackage b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Package Resources/TMP Essential Resources.unitypackage
deleted file mode 100644
index aa27eb5b..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Package Resources/TMP Essential Resources.unitypackage and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Package Resources/TMP Essential Resources.unitypackage.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Package Resources/TMP Essential Resources.unitypackage.meta
deleted file mode 100644
index bc49ab30..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Package Resources/TMP Essential Resources.unitypackage.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: ce4ff17ca867d2b48b5c8a4181611901
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Package Resources/TMP Examples & Extras.unitypackage b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Package Resources/TMP Examples & Extras.unitypackage
deleted file mode 100644
index ea3a62b9..00000000
Binary files a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Package Resources/TMP Examples & Extras.unitypackage and /dev/null differ
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Package Resources/TMP Examples & Extras.unitypackage.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Package Resources/TMP Examples & Extras.unitypackage.meta
deleted file mode 100644
index aaf21f78..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Package Resources/TMP Examples & Extras.unitypackage.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: bc00e25696e4132499f56528d3fed2e3
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/PackageConversionData.json b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/PackageConversionData.json
deleted file mode 100644
index 05c193e2..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/PackageConversionData.json
+++ /dev/null
@@ -1,654 +0,0 @@
-{
- "assetRecords": [
- {
- "referencedResource": "Blue to Purple - Vertical.asset",
- "target": "guid: 1e643bbd7e13d46418da3774e72bef60",
- "replacement": "guid: 479a66fa4b094512a62b0a8e553ad95a"
- },
- {
- "referencedResource": "Dark to Light Green - Vertical.asset",
- "target": "guid: 90c9133b254e2184b8084dea4f392337",
- "replacement": "guid: 4c86a3366cd840348ebe8dc438570ee4"
- },
- {
- "referencedResource": "Light to Dark Green - Vertical.asset",
- "target": "guid: 33c745f0979f3984182a138bcc6e57ec",
- "replacement": "guid: 5cf8ae092ca54931b443bec5148f3c59"
- },
- {
- "referencedResource": "Yellow to Orange - Vertical.asset",
- "target": "guid: e002cb2a36d9e4a439a062867fa24e1e",
- "replacement": "guid: 69a525efa7e6472eab268f6ea605f06e"
- },
- {
- "referencedResource": "Crate - Surface Shader Scene.mat",
- "target": "guid: e177c46c2a091564d88df2c2ca9dcf97",
- "replacement": "guid: e6b9b44320f4448d9d5e0ee634259966"
- },
- {
- "referencedResource": "Ground - Logo Scene.mat",
- "target": "guid: 504ae362e57fc464b847f1e9fd0e4035",
- "replacement": "guid: c719e38f25a9480abd2480ab621a2949"
- },
- {
- "referencedResource": "Ground - Surface Shader Scene.mat",
- "target": "guid: 9ed9aa864ec2d7f4dad266b9534c6d85",
- "replacement": "guid: aadd5a709a48466c887296bb5b1b8110"
- },
- {
- "referencedResource": "Small Crate_diffuse.mat",
- "target": "guid: 92f161029a6d3c54a92d9d283352a135",
- "replacement": "guid: 22262639920f43d6be32430e4e58350d"
- },
- {
- "referencedResource": "Text Popup.prefab",
- "target": "guid: c879e892866c8db4f8930b25672233ac",
- "replacement": "guid: b06f0e6c1dfa4356ac918da1bb32c603"
- },
- {
- "referencedResource": "TextMeshPro - Prefab 1.prefab",
- "target": "guid: a6a60659abb4d9d4b934feebd3dcc952",
- "replacement": "guid: a6e39ced0ea046bcb636c3f0b2e2a745"
- },
- {
- "referencedResource": "TextMeshPro - Prefab 2.prefab",
- "target": "guid: 1b190e3e0ab4c8e4881656b9160c59c2",
- "replacement": "guid: fdad9d952ae84cafb74c63f2e694d042"
- },
- {
- "referencedResource": "Anton SDF.asset",
- "target": "guid: f76ef802b8b940c46a31f9027f2b0158",
- "replacement": "guid: 8a89fa14b10d46a99122fd4f73fca9a2"
- },
- {
- "referencedResource": "Anton SDF - Drop Shadow.mat",
- "target": "guid: 250a1a103b3b4914c9707e6a423446d6",
- "replacement": "guid: 749b9069dc4742c5bfa5c74644049926"
- },
- {
- "referencedResource": "Anton SDF - Outline.mat",
- "target": "guid: e077dc203e948b740859c1c0ca8b9691",
- "replacement": "guid: a00013af81304728b2be1f4309ee2433"
- },
- {
- "referencedResource": "Bangers SDF.asset",
- "target": "guid: 808aa8f1ab804104aa7d0c337a6c1481",
- "replacement": "guid: 125cb55b44b24c4393181402bc6200e6"
- },
- {
- "referencedResource": "Bangers SDF - Drop Shadow.mat",
- "target": "guid: c26f698d4eee19e4a8b8f42cd299bab5",
- "replacement": "guid: f2dcf029949142e28b974630369c8b4e"
- },
- {
- "referencedResource": "Bangers SDF - Outline.mat",
- "target": "guid: db7f2cfbf23d6d54ca4e74a9abd55326",
- "replacement": "guid: f629c6e43dba4bf38cb74d8860150664"
- },
- {
- "referencedResource": "Bangers SDF Glow.mat",
- "target": "guid: 7dd7006c58d8a3148a73aa211d8c13d0",
- "replacement": "guid: d75b8f41e959450c84ac6e967084d3e1"
- },
- {
- "referencedResource": "Bangers SDF Logo.mat",
- "target": "guid: 4fb51aa7001a2244395ddf6a15d37389",
- "replacement": "guid: f4e195ac1e204eff960149d1cb34e18c"
- },
- {
- "referencedResource": "Electronic Highway Sign SDF.asset",
- "target": "guid: 163292f6f226d954593d45b079f8aae0",
- "replacement": "guid: dc36b3fdc14f47ebb36fd484a67e268a"
- },
- {
- "referencedResource": "LiberationSans SDF - Drop Shadow.mat",
- "target": "guid: 33db60c37b63f08448ded4b385e74e38",
- "replacement": "guid: e73a58f6e2794ae7b1b7e50b7fb811b0"
- },
- {
- "referencedResource": "LiberationSans SDF - Metalic Green.mat",
- "target": "guid: 4f9843c79516ed1468b9b5a4f32e67e3",
- "replacement": "guid: 8b29aaa3eec7468097ff07adfcf29ac9"
- },
- {
- "referencedResource": "LiberationSans SDF - Outline.mat",
- "target": "guid: 83a1b0fe6c3dbac44b66f09c82e1d509",
- "replacement": "guid: 79459efec17a4d00a321bdcc27bbc385"
- },
- {
- "referencedResource": "LiberationSans SDF - Overlay.mat",
- "target": "guid: 55eb086ae18c76e4bb6cc7106d0dd6e2",
- "replacement": "guid: 9ad269c99dcf42b7aedefd83dd5a7b9d"
- },
- {
- "referencedResource": "LiberationSans SDF - Soft Mask.mat",
- "target": "guid: 74e06d99c1657fc4abd33f20685ea9ff",
- "replacement": "guid: 42df1c7856584b6b8db9a509b6b10074"
- },
- {
- "referencedResource": "Oswald Bold SDF.asset",
- "target": "guid: 09641b029dfa78843902b548a9de7553",
- "replacement": "guid: 0161d805a3764c089bef00bfe00793f5"
- },
- {
- "referencedResource": "Roboto-Bold SDF.asset",
- "target": "guid: d62a573c923f5cb47b8ff65261033b90",
- "replacement": "guid: 5302535af1044152a457ed104f1f4b91"
- },
- {
- "referencedResource": "Roboto-Bold SDF - Drop Shadow.mat",
- "target": "guid: 102e7c5c5e3b1f3468518cb166967d77",
- "replacement": "guid: b246c4190f4e46ec9352fe15a7b09ce0"
- },
- {
- "referencedResource": "Roboto-Bold SDF - Surface.mat",
- "target": "guid: e2da38ead8f8238449c54a1ef49e080f",
- "replacement": "guid: e6b276ec991f467aa14ef1f3cc665993"
- },
- {
- "referencedResource": "DropCap Numbers.asset",
- "target": "guid: c4fd2a959a50b584b92dedfefec1ffda",
- "replacement": "guid: 14aa93acbb234d16aaef0e8b46814db6"
- },
- {
- "referencedResource": "Benchmark01.cs",
- "target": "guid: c5fb1b5c24460f745be29cc0eb06a58c",
- "replacement": "guid: f970ea55f9f84bf79b05dab180b8c125"
- },
- {
- "referencedResource": "Benchmark01_UGUI.cs",
- "target": "guid: 5e6abf300e36c0a4eb43969c3f2172f8",
- "replacement": "guid: 8ef7be1c625941f7ba8ed7cc71718c0d"
- },
- {
- "referencedResource": "Benchmark02.cs",
- "target": "guid: 3467f4170568a484d8b57e2051a27363",
- "replacement": "guid: e8538afcddc14efbb5d9e94b7ae50197"
- },
- {
- "referencedResource": "Benchmark03.cs",
- "target": "guid: e6e9d20624a23da4c8b2b6fb7608bb9a",
- "replacement": "guid: a73109742c8d47ac822895a473300c29"
- },
- {
- "referencedResource": "Benchmark04.cs",
- "target": "guid: 481dd67bdedc3104ea2156ed49f3acd5",
- "replacement": "guid: dc20866c0d5e413ab7559440e15333ae"
- },
- {
- "referencedResource": "CameraController.cs",
- "target": "guid: a9f0e07aefca0cc459134ff9df622278",
- "replacement": "guid: 2d687537154440a3913a9a3c7977978c"
- },
- {
- "referencedResource": "ChatController.cs",
- "target": "guid: eba5a4db2591a5844aea5f6f3ad8548e",
- "replacement": "guid: 53d91f98a2664f5cb9af11de72ac54ec"
- },
- {
- "referencedResource": "EnvMapAnimator.cs",
- "target": "guid: 7e69f3f28c520ce4d9ab9964b2895b1a",
- "replacement": "guid: a4b6f99e8bc54541bbd149b014ff441c"
- },
- {
- "referencedResource": "ObjectSpin.cs",
- "target": "guid: 5e7872ff51989434dabf7807265ada3c",
- "replacement": "guid: 4f19c7f94c794c5097d8bd11e39c750d"
- },
- {
- "referencedResource": "ShaderPropAnimator.cs",
- "target": "guid: c56cf968fb6a5b6488e709242718845d",
- "replacement": "guid: 2787a46a4dc848c1b4b7b9307b614bfd"
- },
- {
- "referencedResource": "SimpleScript.cs",
- "target": "guid: c64808ff5137c9044a583750e5b0468a",
- "replacement": "guid: 9eff140b25d64601aabc6ba32245d099"
- },
- {
- "referencedResource": "SkewTextExample.cs",
- "target": "guid: 48d40dfeb33b717488f55ddbf676643a",
- "replacement": "guid: d412675cfb3441efa3bf8dcd9b7624dc"
- },
- {
- "referencedResource": "TeleType.cs",
- "target": "guid: 9094c5c777af3f14489e8947748e86e6",
- "replacement": "guid: e32c266ee6204b21a427753cb0694c81"
- },
- {
- "referencedResource": "TextConsoleSimulator.cs",
- "target": "guid: 45757dcc8f119454dac6365e8fd15e8b",
- "replacement": "guid: 43bcd35a1c0c40ccb6d472893fe2093f"
- },
- {
- "referencedResource": "TextMeshProFloatingText.cs",
- "target": "guid: dd0e4b969aa70504382a89d2f208ae6c",
- "replacement": "guid: a4d4c76e63944cba8c7d00f56334b98c"
- },
- {
- "referencedResource": "TextMeshSpawner.cs",
- "target": "guid: 385939aed18e82d41894437798c30ed8",
- "replacement": "guid: 76c11bbcfddf44e0ba17d6c2751c8d84"
- },
- {
- "referencedResource": "TMP_ExampleScript_01.cs",
- "target": "guid: 36bafabb5572c6347923b971425ab3be",
- "replacement": "guid: 6f2c5b59b6874405865e2616e4ec276a"
- },
- {
- "referencedResource": "TMP_FrameRateCounter.cs",
- "target": "guid: c0357609254b68d4881cab18f04dd4dc",
- "replacement": "guid: 686ec78b56aa445795335fbadafcfaa4"
- },
- {
- "referencedResource": "TMP_TextEventCheck.cs",
- "target": "guid: ba181bda76b7f6047ba2188e94bf0894",
- "replacement": "guid: d736ce056cf444ca96e424f4d9c42b76"
- },
- {
- "referencedResource": "TMP_TextEventHandler.cs",
- "target": "guid: 48a2fdbd95acd794caf78a85a0b6926a",
- "replacement": "guid: 1312ae25639a4bae8e25ae223209cc50"
- },
- {
- "referencedResource": "TMP_TextInfoDebugTool.cs",
- "target": "guid: 5eeee4467ee5b6a4884a1ec94812d93e",
- "replacement": "guid: 21256c5b62f346f18640dad779911e20"
- },
- {
- "referencedResource": "TMP_TextSelector_A.cs",
- "target": "guid: 68baf2864c88f4a43a50f16709de8717",
- "replacement": "guid: 103e0a6a1d404693b9fb1a5173e0e979"
- },
- {
- "referencedResource": "TMP_TextSelector_B.cs",
- "target": "guid: f499ff45b9a3d0840a0df48d01b2877b",
- "replacement": "guid: a05dcd8be7ec4ccbb35c26219884aa37"
- },
- {
- "referencedResource": "TMP_UiFrameRateCounter.cs",
- "target": "guid: dc33b7a34d20d5e4e8d54b6867ce81e3",
- "replacement": "guid: 24b0dc2d1d494adbbec1f4db26b4cf83"
- },
- {
- "referencedResource": "TMPro_InstructionOverlay.cs",
- "target": "guid: 53b866620ba77504eaf52cab7dbd95c9",
- "replacement": "guid: c3c1afeda5e545e0b19add5373896d2e"
- },
- {
- "referencedResource": "VertexColorCycler.cs",
- "target": "guid: c8d54cdd5913d4e4bb7b655d7d16835b",
- "replacement": "guid: 91b8ba3d52e041fab2d0e0f169855539"
- },
- {
- "referencedResource": "VertexJitter.cs",
- "target": "guid: e4769cb37968ea948a763a9a89f9e583",
- "replacement": "guid: 2ed57967c52645d390a89dcf8f61ba73"
- },
- {
- "referencedResource": "VertexShakeA.cs",
- "target": "guid: eaa12d191e718c945ac55da73fa469db",
- "replacement": "guid: f7cfa58e417a46ea8889989684c2522e"
- },
- {
- "referencedResource": "VertexShakeB.cs",
- "target": "guid: 32c83a5d3ba42b84aa26386eac47566b",
- "replacement": "guid: e4e0d9ccee5f4950be8979268c9014e0"
- },
- {
- "referencedResource": "VertexZoom.cs",
- "target": "guid: 5305493000edc7d4ea4302757dc19a99",
- "replacement": "guid: 52ec835d14bd486f900952b77698b7eb"
- },
- {
- "referencedResource": "WarpTextExample.cs",
- "target": "guid: f3eef864a10f51045a7530e2afe7c179",
- "replacement": "guid: 790744c462254b7ba8038e6ed28b3db2"
- },
- {
- "referencedResource": "DropCap Numbers.psd",
- "target": "guid: 28b41fef228d6814f90e541deaf9f262",
- "replacement": "guid: fd09957580ac4326916010f1f260975b"
- },
- {
- "referencedResource": "Brushed Metal 3.jpg",
- "target": "guid: c30270e41dccf9441ab56d94261bdcfa",
- "replacement": "guid: f88677df267a41d6be1e7a6133e7d227"
- },
- {
- "referencedResource": "Engraved Wall.jpg",
- "target": "guid: 93d6f74f2ef358e41989d4152b195f88",
- "replacement": "guid: e0f91e6569da4934a48d85bf8d3063f0"
- },
- {
- "referencedResource": "Engraved Wall Normal.jpg",
- "target": "guid: 1edd0950293e8664094053a041548c23",
- "replacement": "guid: 20f91c93e7fb490f9496609c52ef3904"
- },
- {
- "referencedResource": "Floor Cement.jpg",
- "target": "guid: ac5a0a5373b36e049bb7f98f88dbc244",
- "replacement": "guid: 283f897e4925411ebbaa758b4cb13fc2"
- },
- {
- "referencedResource": "Floor Tiles 1 - diffuse.jpg",
- "target": "guid: 7bbfb8818476e4641ba3e75f5225eb69",
- "replacement": "guid: 85ac55597b97403c82fc6601a93cf241"
- },
- {
- "referencedResource": "Floor Tiles 1 - normal.jpg",
- "target": "guid: e00d5a9a0944134448432ccacf221b95",
- "replacement": "guid: c45cd05946364f32aba704f0853a975b"
- },
- {
- "referencedResource": "Fruit Jelly (B&W).jpg",
- "target": "guid: 74d8c208a0193e14ca6916bea88a2c52",
- "replacement": "guid: 1cdc5b506b1a4a33a53c30669ced1f51"
- },
- {
- "referencedResource": "Gradient Diagonal (Color).jpg",
- "target": "guid: 2421a4955e71725448211e6bfbc7d7fb",
- "replacement": "guid: 2ce5c55e85304b819a1826ecbc839aa5"
- },
- {
- "referencedResource": "Gradient Horizontal (Color).jpg",
- "target": "guid: 0bbb43aff4f7811419ffceb1b16cf3d6",
- "replacement": "guid: 6eb184de103d4b3f812b38561065192f"
- },
- {
- "referencedResource": "Gradient Vertical (Color).jpg",
- "target": "guid: 3359915af07779e4e9a966df9eed764f",
- "replacement": "guid: 03d0538de6e24c0f819bfc9ce084dfa9"
- },
- {
- "referencedResource": "Mask Zig-n-Zag.psd",
- "target": "guid: 04eb87e72b3c1c648ba47a869ee00505",
- "replacement": "guid: bb8dfcd263ad4eb383a33d74a720be6f"
- },
- {
- "referencedResource": "Sand Normal Map.jpg",
- "target": "guid: 89e1b1c005d29cf4598ea861deb35a80",
- "replacement": "guid: 8b8c8a10edf94ddc8cc4cc4fcd5696a9"
- },
- {
- "referencedResource": "Small Crate_diffuse.jpg",
- "target": "guid: 64734c9bc6df32149a0c9cb0b18693e1",
- "replacement": "guid: 602cb87b6a29443b8636370ea0751574"
- },
- {
- "referencedResource": "Small Crate_normal.jpg",
- "target": "guid: 81b50d9cb6f3104448ec54c00a80101a",
- "replacement": "guid: 8878a782f4334ecbbcf683b3ac780966"
- },
- {
- "referencedResource": "Stainless 03.png",
- "target": "guid: 40d7f27f614cc1043a1f7e19074f461c",
- "replacement": "guid: 83cb272f9ee046f6ab6636ca38af8db4"
- },
- {
- "referencedResource": "Text Overflow - Linked Text Image 1.png",
- "target": "guid: 1fd8c568b1fcdbe43be65c1619cf3293",
- "replacement": "guid: 4ccf43d26c4748c792174516f4a8fcef"
- },
- {
- "referencedResource": "Text Overflow - Linked Text UI Screenshot.png",
- "target": "guid: 7983d2ec0427c114a916ae3c4769dc10",
- "replacement": "guid: c76d18757a194d618355f05f815cb0a1"
- },
- {
- "referencedResource": "Wipe Pattern - Circle.psd",
- "target": "guid: 6f5e9497d22a7a84193ec825e2eb41ac",
- "replacement": "guid: 10c49fcd9c64421db7c0133e61e55f97"
- },
- {
- "referencedResource": "Wipe Pattern - Diagonal.psd",
- "target": "guid: 8ee4d366b96418044aa9f94b3e2de645",
- "replacement": "guid: ed5290d8df18488780e2996b9b882f01"
- },
- {
- "referencedResource": "Wipe Pattern - Radial Double.psd",
- "target": "guid: 3e0e22da7c9570b498205179ef58ef38",
- "replacement": "guid: 7631f4eff8f74ed38eb3eb9db17134e1"
- },
- {
- "referencedResource": "Wipe Pattern - Radial Quad.psd",
- "target": "guid: 05ffd580f33f74644a6025ec196860af",
- "replacement": "guid: 2b5e9ae96c5644d8bae932f8b4ca68a2"
- },
- {
- "referencedResource": "LiberationSans SDF.asset",
- "target": "guid: 715b80e429c437e40867928a4e1fc975",
- "replacement": "guid: 8f586378b4e144a9851e7b34d9b748ee"
- },
- {
- "referencedResource": "LineBreaking Following Characters.txt",
- "target": "guid: 312ba5b9e90627940866e19549a788cf",
- "replacement": "guid: fade42e8bc714b018fac513c043d323b"
- },
- {
- "referencedResource": "LineBreaking Leading Characters.txt",
- "target": "guid: 8d713940fcbede142ae4a33ea0062b33",
- "replacement": "guid: d82c1b31c7e74239bff1220585707d2b"
- },
- {
- "referencedResource": "TMP_Bitmap.shader",
- "target": "guid: edfcf888cd11d9245b91d2883049a57e",
- "replacement": "guid: 128e987d567d4e2c824d754223b3f3b0"
- },
- {
- "referencedResource": "TMP_Bitmap-Mobile.shader",
- "target": "guid: d1cf17907700cb647aa3ea423ba38f2e",
- "replacement": "guid: 1e3b057af24249748ff873be7fafee47"
- },
- {
- "referencedResource": "TMP_SDF.shader",
- "target": "guid: dca26082f9cb439469295791d9f76fe5",
- "replacement": "guid: 68e6db2ebdc24f95958faec2be5558d6"
- },
- {
- "referencedResource": "TMP_SDF Overlay.shader",
- "target": "guid: 4a7755d6b5b67874f89c85f56f95fe97",
- "replacement": "guid: dd89cf5b9246416f84610a006f916af7"
- },
- {
- "referencedResource": "TMP_SDF-Mobile.shader",
- "target": "guid: cafd18099dfc0114896e0a8b277b81b6",
- "replacement": "guid: fe393ace9b354375a9cb14cdbbc28be4"
- },
- {
- "referencedResource": "TMP_SDF-Mobile Masking.shader",
- "target": "guid: afc255f7c2be52e41973a3d10a2e632d",
- "replacement": "guid: bc1ede39bf3643ee8e493720e4259791"
- },
- {
- "referencedResource": "TMP_SDF-Mobile Overlay.shader",
- "target": "guid: 9ecb3fe313cb5f7478141eba4a2d54ed",
- "replacement": "guid: a02a7d8c237544f1962732b55a9aebf1"
- },
- {
- "referencedResource": "TMP_SDF-Surface.shader",
- "target": "guid: 8e6b9842dbb1a5a4887378afab854e63",
- "replacement": "guid: f7ada0af4f174f0694ca6a487b8f543d"
- },
- {
- "referencedResource": "TMP_SDF-Surface-Mobile.shader",
- "target": "guid: 3c2ea7753c1425145a74d106ec1cd852",
- "replacement": "guid: 85187c2149c549c5b33f0cdb02836b17"
- },
- {
- "referencedResource": "TMP_Sprite.shader",
- "target": "guid: 3a1c68c8292caf046bd21158886c5e40",
- "replacement": "guid: cf81c85f95fe47e1a27f6ae460cf182c"
- },
- {
- "referencedResource": "Default Sprite Asset.asset",
- "target": "guid: 273ca6c80b4b5d746b5e548f532bffd8",
- "replacement": "guid: fbef3c704dce48f08a44612d6c856c8d"
- },
- {
- "referencedResource": "EmojiOne.asset",
- "target": "guid: 9a952e2781ef26940ae089f1053ef4ef",
- "replacement": "guid: c41005c129ba4d66911b75229fd70b45"
- },
- {
- "referencedResource": "TMP Default Style Sheet.asset",
- "target": "guid: 54d1085f9a2fdea4587fcfc7dddcd4bc",
- "replacement": "guid: f952c082cb03451daed3ee968ac6c63e"
- },
- {
- "referencedResource": "TMP Settings.asset",
- "target": "guid: 69ed5bac41eebaa4c97e9d2a4168c54f",
- "replacement": "guid: 3f5b5dff67a942289a9defa416b206f3"
- },
- {
- "referencedResource": "TextContainer.cs",
- "target": "guid: 3b34fc186f40e8043b977d4fa70db8c5",
- "replacement": "guid: 32d40088a6124c578ad6b428df586e2e"
- },
- {
- "referencedResource": "TextContainer.cs",
- "target": "fileID: 311004786, guid: 89f0137620f6af44b9ba852b4190e64e",
- "replacement": "fileID: 11500000, guid: 32d40088a6124c578ad6b428df586e2e"
- },
- {
- "referencedResource": "TextMeshPro.cs",
- "target": "guid: 1a1578b9753d2604f98d608cb4239e2f",
- "replacement": "guid: 9541d86e2fd84c1d9990edf0852d74ab"
- },
- {
- "referencedResource": "TextMeshPro.cs",
- "target": "fileID: -806885394, guid: 89f0137620f6af44b9ba852b4190e64e",
- "replacement": "fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab"
- },
- {
- "referencedResource": "TextMeshProUGUI.cs",
- "target": "guid: 496f2e385b0c62542b5c739ccfafd8da",
- "replacement": "guid: f4688fdb7df04437aeb418b961361dc5"
- },
- {
- "referencedResource": "TextMeshProUGUI.cs",
- "target": "fileID: 1453722849, guid: 89f0137620f6af44b9ba852b4190e64e",
- "replacement": "fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5"
- },
- {
- "referencedResource": "TMP_Asset.cs",
- "target": "guid: e2c4405608b405a4680436e183e53c45",
- "replacement": "guid: 3bda1886f58f4e0ab1139400b160c3ee"
- },
- {
- "referencedResource": "TMP_Asset.cs",
- "target": "fileID: -659140726, guid: 89f0137620f6af44b9ba852b4190e64e",
- "replacement": "fileID: 11500000, guid: 3bda1886f58f4e0ab1139400b160c3ee"
- },
- {
- "referencedResource": "TMP_ColorGradient.cs",
- "target": "guid: e90e18dd4a044ff4394833216e6bf4d2",
- "replacement": "guid: 54d21f6ece3b46479f0c328f8c6007e0"
- },
- {
- "referencedResource": "TMP_ColorGradient.cs",
- "target": "fileID: 2108210716, guid: 89f0137620f6af44b9ba852b4190e64e",
- "replacement": "fileID: 11500000, guid: 54d21f6ece3b46479f0c328f8c6007e0"
- },
- {
- "referencedResource": "TMP_Dropdown.cs",
- "target": "guid: 44cb1d34ddab9d449a05fc3747876be1",
- "replacement": "guid: 7b743370ac3e4ec2a1668f5455a8ef8a"
- },
- {
- "referencedResource": "TMP_Dropdown.cs",
- "target": "fileID: 1148083418, guid: 89f0137620f6af44b9ba852b4190e64e",
- "replacement": "fileID: 11500000, guid: 7b743370ac3e4ec2a1668f5455a8ef8a"
- },
- {
- "referencedResource": "TMP_FontAsset.cs",
- "target": "guid: 74dfce233ddb29b4294c3e23c1d3650d",
- "replacement": "guid: 71c1514a6bd24e1e882cebbe1904ce04"
- },
- {
- "referencedResource": "TMP_FontAsset.cs",
- "target": "fileID: -667331979, guid: 89f0137620f6af44b9ba852b4190e64e",
- "replacement": "fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04"
- },
- {
- "referencedResource": "TMP_InputField.cs",
- "target": "guid: 7b85855a3deaa2e44ac6741a6bbc85f6",
- "replacement": "guid: 2da0c512f12947e489f739169773d7ca"
- },
- {
- "referencedResource": "TMP_InputField.cs",
- "target": "fileID: -1620774994, guid: 89f0137620f6af44b9ba852b4190e64e",
- "replacement": "fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca"
- },
- {
- "referencedResource": "TMP_Settings.cs",
- "target": "guid: aafc3c7b9e915d64e8ec3d2c88b3a231",
- "replacement": "guid: 2705215ac5b84b70bacc50632be6e391"
- },
- {
- "referencedResource": "TMP_Settings.cs",
- "target": "fileID: -395462249, guid: 89f0137620f6af44b9ba852b4190e64e",
- "replacement": "fileID: 11500000, guid: 2705215ac5b84b70bacc50632be6e391"
- },
- {
- "referencedResource": "TMP_SpriteAsset.cs",
- "target": "guid: 90940d439ca0ef746af0b48419b92d2e",
- "replacement": "guid: 84a92b25f83d49b9bc132d206b370281"
- },
- {
- "referencedResource": "TMP_SpriteAsset.cs",
- "target": "fileID: 2019389346, guid: 89f0137620f6af44b9ba852b4190e64e",
- "replacement": "fileID: 11500000, guid: 84a92b25f83d49b9bc132d206b370281"
- },
- {
- "referencedResource": "TMP_StyleSheet.cs",
- "target": "guid: 13259b4ce497b194eb52a33d8eda0bdc",
- "replacement": "guid: ab2114bdc8544297b417dfefe9f1e410"
- },
- {
- "referencedResource": "TMP_StyleSheet.cs",
- "target": "fileID: -1936749209, guid: 89f0137620f6af44b9ba852b4190e64e",
- "replacement": "fileID: 11500000, guid: ab2114bdc8544297b417dfefe9f1e410"
- },
- {
- "referencedResource": "TMP_SubMesh.cs",
- "target": "guid: bd950677b2d06c74494b1c1118584fff",
- "replacement": "guid: 07994bfe8b0e4adb97d706de5dea48d5"
- },
- {
- "referencedResource": "TMP_SubMesh.cs",
- "target": "fileID: 1330537494, guid: 89f0137620f6af44b9ba852b4190e64e",
- "replacement": "fileID: 11500000, guid: 07994bfe8b0e4adb97d706de5dea48d5"
- },
- {
- "referencedResource": "TMP_SubMeshUI.cs",
- "target": "guid: a5378e1f14d974d419f811d6b0861f20",
- "replacement": "guid: 058cba836c1846c3aa1c5fd2e28aea77"
- },
- {
- "referencedResource": "TMP_SubMeshUI.cs",
- "target": "fileID: 1908110080, guid: 89f0137620f6af44b9ba852b4190e64e",
- "replacement": "fileID: 11500000, guid: 058cba836c1846c3aa1c5fd2e28aea77"
- },
- {
- "referencedResource": "TMP_Text.cs",
- "target": "guid: 9ec8dc9c3fa2e5d41b939b5888d2f1e8",
- "replacement": "guid: 5143f58107604835ab1a5efa2d8818fd"
- },
- {
- "referencedResource": "TMP_Text.cs",
- "target": "fileID: -1385168320, guid: 89f0137620f6af44b9ba852b4190e64e",
- "replacement": "fileID: 11500000, guid: 5143f58107604835ab1a5efa2d8818fd"
- },
- {
- "referencedResource": "Default Sprite Asset.png",
- "target": "guid: 5b32c2d36abe44540bed74c1f787033b",
- "replacement": "guid: a0fc465d6cf04254a2938578735e2383"
- },
- {
- "referencedResource": "EmojiOne.png",
- "target": "guid: 6ec706981a919c3489f0b061a40054e2",
- "replacement": "guid: dffef66376be4fa480fb02b19edbe903"
- }
- ]
-}
\ No newline at end of file
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/PackageConversionData.json.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/PackageConversionData.json.meta
deleted file mode 100644
index a7a2790c..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/PackageConversionData.json.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 05f5bfd584002f948982a1498890f9a9
-TextScriptImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/PackageConversionData_Assets.json b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/PackageConversionData_Assets.json
deleted file mode 100644
index f07aa23f..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/PackageConversionData_Assets.json
+++ /dev/null
@@ -1,184 +0,0 @@
-{
- "assetRecords": [
- {
- "referencedResource": "TMP_FontAsset.cs",
- "target": "guid: 74dfce233ddb29b4294c3e23c1d3650d",
- "replacement": "guid: 71c1514a6bd24e1e882cebbe1904ce04"
- },
- {
- "referencedResource": "TMP_FontAsset.cs",
- "target": "fileID: -667331979, guid: 89f0137620f6af44b9ba852b4190e64e",
- "replacement": "fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04"
- },
- {
- "referencedResource": "Anton SDF.asset",
- "target": "guid: f76ef802b8b940c46a31f9027f2b0158",
- "replacement": "guid: 8a89fa14b10d46a99122fd4f73fca9a2"
- },
- {
- "referencedResource": "Bangers SDF.asset",
- "target": "guid: 808aa8f1ab804104aa7d0c337a6c1481",
- "replacement": "guid: 125cb55b44b24c4393181402bc6200e6"
- },
- {
- "referencedResource": "Electronic Highway Sign SDF.asset",
- "target": "guid: 163292f6f226d954593d45b079f8aae0",
- "replacement": "guid: dc36b3fdc14f47ebb36fd484a67e268a"
- },
- {
- "referencedResource": "Oswald Bold SDF.asset",
- "target": "guid: 09641b029dfa78843902b548a9de7553",
- "replacement": "guid: 0161d805a3764c089bef00bfe00793f5"
- },
- {
- "referencedResource": "Roboto-Bold SDF.asset",
- "target": "guid: d62a573c923f5cb47b8ff65261033b90",
- "replacement": "guid: 5302535af1044152a457ed104f1f4b91"
- },
- {
- "referencedResource": "LiberationSans SDF.asset",
- "target": "guid: 715b80e429c437e40867928a4e1fc975",
- "replacement": "guid: 8f586378b4e144a9851e7b34d9b748ee"
- },
- {
- "referencedResource": "TMP_Bitmap.shader",
- "target": "guid: edfcf888cd11d9245b91d2883049a57e",
- "replacement": "guid: 128e987d567d4e2c824d754223b3f3b0"
- },
- {
- "referencedResource": "TMP_Bitmap-Mobile.shader",
- "target": "guid: d1cf17907700cb647aa3ea423ba38f2e",
- "replacement": "guid: 1e3b057af24249748ff873be7fafee47"
- },
- {
- "referencedResource": "TMP_SDF.shader",
- "target": "guid: dca26082f9cb439469295791d9f76fe5",
- "replacement": "guid: 68e6db2ebdc24f95958faec2be5558d6"
- },
- {
- "referencedResource": "TMP_SDF Overlay.shader",
- "target": "guid: 4a7755d6b5b67874f89c85f56f95fe97",
- "replacement": "guid: dd89cf5b9246416f84610a006f916af7"
- },
- {
- "referencedResource": "TMP_SDF-Mobile.shader",
- "target": "guid: cafd18099dfc0114896e0a8b277b81b6",
- "replacement": "guid: fe393ace9b354375a9cb14cdbbc28be4"
- },
- {
- "referencedResource": "TMP_SDF-Mobile Masking.shader",
- "target": "guid: afc255f7c2be52e41973a3d10a2e632d",
- "replacement": "guid: bc1ede39bf3643ee8e493720e4259791"
- },
- {
- "referencedResource": "TMP_SDF-Mobile Overlay.shader",
- "target": "guid: 9ecb3fe313cb5f7478141eba4a2d54ed",
- "replacement": "guid: a02a7d8c237544f1962732b55a9aebf1"
- },
- {
- "referencedResource": "TMP_SDF-Surface.shader",
- "target": "guid: 8e6b9842dbb1a5a4887378afab854e63",
- "replacement": "guid: f7ada0af4f174f0694ca6a487b8f543d"
- },
- {
- "referencedResource": "TMP_SDF-Surface-Mobile.shader",
- "target": "guid: 3c2ea7753c1425145a74d106ec1cd852",
- "replacement": "guid: 85187c2149c549c5b33f0cdb02836b17"
- },
- {
- "referencedResource": "TMP_Sprite.shader",
- "target": "guid: 3a1c68c8292caf046bd21158886c5e40",
- "replacement": "guid: cf81c85f95fe47e1a27f6ae460cf182c"
- },
- {
- "referencedResource": "TMP_ColorGradient.cs",
- "target": "guid: e90e18dd4a044ff4394833216e6bf4d2",
- "replacement": "guid: 54d21f6ece3b46479f0c328f8c6007e0"
- },
- {
- "referencedResource": "TMP_ColorGradient.cs",
- "target": "fileID: 2108210716, guid: 89f0137620f6af44b9ba852b4190e64e",
- "replacement": "fileID: 11500000, guid: 54d21f6ece3b46479f0c328f8c6007e0"
- },
- {
- "referencedResource": "TMP_Settings.cs",
- "target": "guid: aafc3c7b9e915d64e8ec3d2c88b3a231",
- "replacement": "guid: 2705215ac5b84b70bacc50632be6e391"
- },
- {
- "referencedResource": "TMP_Settings.cs",
- "target": "fileID: -395462249, guid: 89f0137620f6af44b9ba852b4190e64e",
- "replacement": "fileID: 11500000, guid: 2705215ac5b84b70bacc50632be6e391"
- },
- {
- "referencedResource": "TMP Settings.asset",
- "target": "guid: 69ed5bac41eebaa4c97e9d2a4168c54f",
- "replacement": "guid: 3f5b5dff67a942289a9defa416b206f3"
- },
- {
- "referencedResource": "LineBreaking Following Characters.txt",
- "target": "guid: 312ba5b9e90627940866e19549a788cf",
- "replacement": "guid: fade42e8bc714b018fac513c043d323b"
- },
- {
- "referencedResource": "LineBreaking Leading Characters.txt",
- "target": "guid: 8d713940fcbede142ae4a33ea0062b33",
- "replacement": "guid: d82c1b31c7e74239bff1220585707d2b"
- },
- {
- "referencedResource": "TMP_StyleSheet.cs",
- "target": "guid: 13259b4ce497b194eb52a33d8eda0bdc",
- "replacement": "guid: ab2114bdc8544297b417dfefe9f1e410"
- },
- {
- "referencedResource": "TMP_StyleSheet.cs",
- "target": "fileID: -1936749209, guid: 89f0137620f6af44b9ba852b4190e64e",
- "replacement": "fileID: 11500000, guid: ab2114bdc8544297b417dfefe9f1e410"
- },
- {
- "referencedResource": "TMP Default Style Sheet.asset",
- "target": "guid: 54d1085f9a2fdea4587fcfc7dddcd4bc",
- "replacement": "guid: f952c082cb03451daed3ee968ac6c63e"
- },
- {
- "referencedResource": "TMP_SpriteAsset.cs",
- "target": "guid: 90940d439ca0ef746af0b48419b92d2e",
- "replacement": "guid: 84a92b25f83d49b9bc132d206b370281"
- },
- {
- "referencedResource": "TMP_SpriteAsset.cs",
- "target": "fileID: 2019389346, guid: 89f0137620f6af44b9ba852b4190e64e",
- "replacement": "fileID: 11500000, guid: 84a92b25f83d49b9bc132d206b370281"
- },
- {
- "referencedResource": "Default Sprite Asset.asset",
- "target": "guid: 273ca6c80b4b5d746b5e548f532bffd8",
- "replacement": "guid: fbef3c704dce48f08a44612d6c856c8d"
- },
- {
- "referencedResource": "Default Sprite Asset.png",
- "target": "guid: 5b32c2d36abe44540bed74c1f787033b",
- "replacement": "guid: a0fc465d6cf04254a2938578735e2383"
- },
- {
- "referencedResource": "EmojiOne.asset",
- "target": "guid: 9a952e2781ef26940ae089f1053ef4ef",
- "replacement": "guid: c41005c129ba4d66911b75229fd70b45"
- },
- {
- "referencedResource": "EmojiOne.png",
- "target": "guid: 6ec706981a919c3489f0b061a40054e2",
- "replacement": "guid: dffef66376be4fa480fb02b19edbe903"
- },
- {
- "referencedResource": "DropCap Numbers.asset",
- "target": "guid: c4fd2a959a50b584b92dedfefec1ffda",
- "replacement": "guid: 14aa93acbb234d16aaef0e8b46814db6"
- },
- {
- "referencedResource": "DropCap Numbers.psd",
- "target": "guid: 28b41fef228d6814f90e541deaf9f262",
- "replacement": "guid: fd09957580ac4326916010f1f260975b"
- }
- ]
-}
\ No newline at end of file
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/PackageConversionData_Assets.json.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/PackageConversionData_Assets.json.meta
deleted file mode 100644
index f534ac14..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/PackageConversionData_Assets.json.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 0e0afa652c0031c48896a97b424d027b
-TextScriptImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts.meta
deleted file mode 100644
index 3c2e4cf7..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e6a1d1e3d2384453a7371b4a07a41ca4
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor.meta
deleted file mode 100644
index af509a3a..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b5d6c28ed7b94775be9e2560f300247c
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/DropdownOptionListDrawer.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/DropdownOptionListDrawer.cs
deleted file mode 100644
index 2b7dc854..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/DropdownOptionListDrawer.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using UnityEditorInternal;
-using UnityEngine;
-using UnityEngine.UI;
-using UnityEditor;
-
-namespace TMPro.EditorUtilities
-{
- [CustomPropertyDrawer(typeof(TMP_Dropdown.OptionDataList), true)]
- class DropdownOptionListDrawer : PropertyDrawer
- {
- private ReorderableList m_ReorderableList;
-
- private void Init(SerializedProperty property)
- {
- if (m_ReorderableList != null)
- return;
-
- SerializedProperty array = property.FindPropertyRelative("m_Options");
-
- m_ReorderableList = new ReorderableList(property.serializedObject, array);
- m_ReorderableList.drawElementCallback = DrawOptionData;
- m_ReorderableList.drawHeaderCallback = DrawHeader;
- m_ReorderableList.elementHeight += 16;
- }
-
- public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
- {
- Init(property);
-
- m_ReorderableList.DoList(position);
- }
-
- private void DrawHeader(Rect rect)
- {
- GUI.Label(rect, "Options");
- }
-
- private void DrawOptionData(Rect rect, int index, bool isActive, bool isFocused)
- {
- SerializedProperty itemData = m_ReorderableList.serializedProperty.GetArrayElementAtIndex(index);
- SerializedProperty itemText = itemData.FindPropertyRelative("m_Text");
- SerializedProperty itemImage = itemData.FindPropertyRelative("m_Image");
-
- RectOffset offset = new RectOffset(0, 0, -1, -3);
- rect = offset.Add(rect);
- rect.height = EditorGUIUtility.singleLineHeight;
-
- EditorGUI.PropertyField(rect, itemText, GUIContent.none);
- rect.y += EditorGUIUtility.singleLineHeight;
- EditorGUI.PropertyField(rect, itemImage, GUIContent.none);
- }
-
- public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
- {
- Init(property);
-
- return m_ReorderableList.GetHeight();
- }
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/DropdownOptionListDrawer.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/DropdownOptionListDrawer.cs.meta
deleted file mode 100644
index f7f4c565..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/DropdownOptionListDrawer.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 9545c9eb3bf94265810463794fec8334
-timeCreated: 1464818008
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/GlyphInfoDrawer.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/GlyphInfoDrawer.cs
deleted file mode 100644
index 0936dc75..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/GlyphInfoDrawer.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-using UnityEngine;
-using UnityEditor;
-using System.Collections;
-
-
-namespace TMPro.EditorUtilities
-{
-
- [CustomPropertyDrawer(typeof(TMP_Glyph))]
- public class GlyphInfoDrawer : PropertyDrawer
- {
-
- public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
- {
- SerializedProperty prop_id = property.FindPropertyRelative("id");
- SerializedProperty prop_x = property.FindPropertyRelative("x");
- SerializedProperty prop_y = property.FindPropertyRelative("y");
- SerializedProperty prop_width = property.FindPropertyRelative("width");
- SerializedProperty prop_height = property.FindPropertyRelative("height");
- SerializedProperty prop_xOffset = property.FindPropertyRelative("xOffset");
- SerializedProperty prop_yOffset = property.FindPropertyRelative("yOffset");
- SerializedProperty prop_xAdvance = property.FindPropertyRelative("xAdvance");
- SerializedProperty prop_scale = property.FindPropertyRelative("scale");
-
-
- // We get Rect since a valid position may not be provided by the caller.
- Rect rect = GUILayoutUtility.GetRect(position.width, 48);
- rect.y -= 15;
-
- //GUI.enabled = false;
- EditorGUIUtility.labelWidth = 40f;
- EditorGUIUtility.fieldWidth = 45f;
-
- bool prevGuiState = GUI.enabled;
- GUI.enabled = true;
- EditorGUI.LabelField(new Rect(rect.x + 5f, rect.y, 80f, 18), new GUIContent("Ascii: " + prop_id.intValue + ""), TMP_UIStyleManager.label);
- EditorGUI.LabelField(new Rect(rect.x + 90f, rect.y, 80f, 18), new GUIContent("Hex: " + prop_id.intValue.ToString("X") + ""), TMP_UIStyleManager.label);
- EditorGUI.LabelField(new Rect(rect.x + 170f, rect.y, 80, 18), "Char: [ " + (char)prop_id.intValue + " ]", TMP_UIStyleManager.label);
- GUI.enabled = prevGuiState;
-
- EditorGUIUtility.labelWidth = 35f;
- EditorGUIUtility.fieldWidth = 10f;
-
- float width = (rect.width - 5f) / 4;
- EditorGUI.PropertyField(new Rect(rect.x + 5f + width * 0, rect.y + 22, width - 5f, 18), prop_x, new GUIContent("X:"));
- EditorGUI.PropertyField(new Rect(rect.x + 5f + width * 1, rect.y + 22, width - 5f, 18), prop_y, new GUIContent("Y:"));
- EditorGUI.PropertyField(new Rect(rect.x + 5f + width * 2, rect.y + 22, width - 5f, 18), prop_width, new GUIContent("W:"));
- EditorGUI.PropertyField(new Rect(rect.x + 5f + width * 3, rect.y + 22, width - 5f, 18), prop_height, new GUIContent("H:"));
-
- //GUI.enabled = true;
- EditorGUI.PropertyField(new Rect(rect.x + 5f + width * 0, rect.y + 44, width - 5f, 18), prop_xOffset, new GUIContent("OX:"));
- EditorGUI.PropertyField(new Rect(rect.x + 5f + width * 1, rect.y + 44, width - 5f, 18), prop_yOffset, new GUIContent("OY:"));
- //GUI.enabled = true;
- EditorGUI.PropertyField(new Rect(rect.x + 5f + width * 2, rect.y + 44, width - 5f, 18), prop_xAdvance, new GUIContent("ADV:"));
- EditorGUI.PropertyField(new Rect(rect.x + 5f + width * 3, rect.y + 44, width - 5f, 18), prop_scale, new GUIContent("SF:"));
- }
-
- }
-}
-*/
\ No newline at end of file
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/GlyphInfoDrawer.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/GlyphInfoDrawer.cs.meta
deleted file mode 100644
index 10ed151e..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/GlyphInfoDrawer.cs.meta
+++ /dev/null
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 900f1a451c764dc3bdcc0de815a15935
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/GlyphMetricsPropertyDrawer.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/GlyphMetricsPropertyDrawer.cs
deleted file mode 100644
index bcd25a61..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/GlyphMetricsPropertyDrawer.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using UnityEngine;
-using UnityEngine.TextCore;
-using UnityEditor;
-using System.Collections;
-
-
-namespace TMPro.EditorUtilities
-{
-
- [CustomPropertyDrawer(typeof(GlyphMetrics))]
- public class GlyphMetricsPropertyDrawer : PropertyDrawer
- {
- public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
- {
- SerializedProperty prop_Width = property.FindPropertyRelative("m_Width");
- SerializedProperty prop_Height = property.FindPropertyRelative("m_Height");
- SerializedProperty prop_HoriBearingX = property.FindPropertyRelative("m_HorizontalBearingX");
- SerializedProperty prop_HoriBearingY = property.FindPropertyRelative("m_HorizontalBearingY");
- SerializedProperty prop_HoriAdvance = property.FindPropertyRelative("m_HorizontalAdvance");
-
- // We get Rect since a valid position may not be provided by the caller.
- Rect rect = new Rect(position.x, position.y, position.width, 49);
-
- EditorGUI.LabelField(new Rect(rect.x, rect.y - 2.5f, rect.width, 18), new GUIContent("Glyph Metrics"));
-
- EditorGUIUtility.labelWidth = 50f;
- EditorGUIUtility.fieldWidth = 15f;
-
- //GUI.enabled = false;
- float width = (rect.width - 75f) / 2;
- EditorGUI.PropertyField(new Rect(rect.x + width * 0, rect.y + 20, width - 5f, 18), prop_Width, new GUIContent("W:"));
- EditorGUI.PropertyField(new Rect(rect.x + width * 1, rect.y + 20, width - 5f, 18), prop_Height, new GUIContent("H:"));
-
- //GUI.enabled = true;
-
- width = (rect.width - 75f) / 3;
- EditorGUI.BeginChangeCheck();
- EditorGUI.PropertyField(new Rect(rect.x + width * 0, rect.y + 40, width - 5f, 18), prop_HoriBearingX, new GUIContent("BX:"));
- EditorGUI.PropertyField(new Rect(rect.x + width * 1, rect.y + 40, width - 5f, 18), prop_HoriBearingY, new GUIContent("BY:"));
- EditorGUI.PropertyField(new Rect(rect.x + width * 2, rect.y + 40, width - 5f, 18), prop_HoriAdvance, new GUIContent("AD:"));
- if (EditorGUI.EndChangeCheck())
- {
-
- }
- }
-
- public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
- {
- return 65f;
- }
-
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/GlyphMetricsPropertyDrawer.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/GlyphMetricsPropertyDrawer.cs.meta
deleted file mode 100644
index d91f5791..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/GlyphMetricsPropertyDrawer.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: e3882522a08b6f5459b4dea6f8791278
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/GlyphRectPropertyDrawer.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/GlyphRectPropertyDrawer.cs
deleted file mode 100644
index c9be74e9..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/GlyphRectPropertyDrawer.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using UnityEngine;
-using UnityEngine.TextCore;
-using UnityEditor;
-using System.Collections;
-
-
-namespace TMPro.EditorUtilities
-{
-
- [CustomPropertyDrawer(typeof(GlyphRect))]
- public class GlyphRectPropertyDrawer : PropertyDrawer
- {
- public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
- {
- //EditorGUI.BeginProperty(position, label, property);
-
- SerializedProperty prop_X = property.FindPropertyRelative("m_X");
- SerializedProperty prop_Y = property.FindPropertyRelative("m_Y");
- SerializedProperty prop_Width = property.FindPropertyRelative("m_Width");
- SerializedProperty prop_Height = property.FindPropertyRelative("m_Height");
-
- // We get Rect since a valid position may not be provided by the caller.
- Rect rect = new Rect(position.x, position.y, position.width, 49);
- EditorGUI.LabelField(new Rect(rect.x, rect.y - 2.5f, rect.width, 18), new GUIContent("Glyph Rect"));
-
- EditorGUIUtility.labelWidth = 50f;
- EditorGUIUtility.fieldWidth = 20f;
-
- //GUI.enabled = false;
- float width = (rect.width - 75f) / 4;
- EditorGUI.PropertyField(new Rect(rect.x + width * 0, rect.y + 20, width - 5f, 18), prop_X, new GUIContent("X:"));
- EditorGUI.PropertyField(new Rect(rect.x + width * 1, rect.y + 20, width - 5f, 18), prop_Y, new GUIContent("Y:"));
- EditorGUI.PropertyField(new Rect(rect.x + width * 2, rect.y + 20, width - 5f, 18), prop_Width, new GUIContent("W:"));
- EditorGUI.PropertyField(new Rect(rect.x + width * 3, rect.y + 20, width - 5f, 18), prop_Height, new GUIContent("H:"));
-
- //EditorGUI.EndProperty();
- }
-
- public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
- {
- return 45f;
- }
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/GlyphRectPropertyDrawer.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/GlyphRectPropertyDrawer.cs.meta
deleted file mode 100644
index 93232794..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/GlyphRectPropertyDrawer.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 8bc2b083b068f3546a9509c805e0541c
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_BaseEditorPanel.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_BaseEditorPanel.cs
deleted file mode 100644
index 5896c336..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_BaseEditorPanel.cs
+++ /dev/null
@@ -1,1336 +0,0 @@
-using UnityEngine;
-using UnityEditor;
-using System.Collections.Generic;
-using System.Linq;
-
-
-namespace TMPro.EditorUtilities
-{
- public abstract class TMP_BaseEditorPanel : Editor
- {
- //Labels and Tooltips
- static readonly GUIContent k_RtlToggleLabel = new GUIContent("Enable RTL Editor", "Reverses text direction and allows right to left editing.");
- //static readonly GUIContent k_MainSettingsLabel = new GUIContent("Main Settings");
- static readonly GUIContent k_FontAssetLabel = new GUIContent("Font Asset", "The Font Asset containing the glyphs that can be rendered for this text.");
- static readonly GUIContent k_MaterialPresetLabel = new GUIContent("Material Preset", "The material used for rendering. Only materials created from the Font Asset can be used.");
- static readonly GUIContent k_StyleLabel = new GUIContent("Text Style", "The style from a style sheet to be applied to the text.");
- static readonly GUIContent k_AutoSizeLabel = new GUIContent("Auto Size", "Auto sizes the text to fit the available space.");
- static readonly GUIContent k_FontSizeLabel = new GUIContent("Font Size", "The size the text will be rendered at in points.");
- static readonly GUIContent k_AutoSizeOptionsLabel = new GUIContent("Auto Size Options");
- static readonly GUIContent k_MinLabel = new GUIContent("Min", "The minimum font size.");
- static readonly GUIContent k_MaxLabel = new GUIContent("Max", "The maximum font size.");
- static readonly GUIContent k_WdLabel = new GUIContent("WD%", "Compresses character width up to this value before reducing font size.");
- static readonly GUIContent k_LineLabel = new GUIContent("Line", "Negative value only. Compresses line height down to this value before reducing font size.");
- static readonly GUIContent k_FontStyleLabel = new GUIContent("Font Style", "Styles to apply to the text such as Bold or Italic.");
-
- static readonly GUIContent k_BoldLabel = new GUIContent("B", "Bold");
- static readonly GUIContent k_ItalicLabel = new GUIContent("I", "Italic");
- static readonly GUIContent k_UnderlineLabel = new GUIContent("U", "Underline");
- static readonly GUIContent k_StrikethroughLabel = new GUIContent("S", "Strikethrough");
- static readonly GUIContent k_LowercaseLabel = new GUIContent("ab", "Lowercase");
- static readonly GUIContent k_UppercaseLabel = new GUIContent("AB", "Uppercase");
- static readonly GUIContent k_SmallcapsLabel = new GUIContent("SC", "Smallcaps");
-
- static readonly GUIContent k_ColorModeLabel = new GUIContent("Color Mode", "The type of gradient to use.");
- static readonly GUIContent k_BaseColorLabel = new GUIContent("Vertex Color", "The base color of the text vertices.");
- static readonly GUIContent k_ColorPresetLabel = new GUIContent("Color Preset", "A Color Preset which override the local color settings.");
- static readonly GUIContent k_ColorGradientLabel = new GUIContent("Color Gradient", "The gradient color applied over the Vertex Color. Can be locally set or driven by a Gradient Asset.");
- static readonly GUIContent k_CorenerColorsLabel = new GUIContent("Colors", "The color composition of the gradient.");
- static readonly GUIContent k_OverrideTagsLabel = new GUIContent("Override Tags", "Whether the color settings override the tag.");
-
- static readonly GUIContent k_SpacingOptionsLabel = new GUIContent("Spacing Options (em)", "Spacing adjustments between different elements of the text. Values are in font units where a value of 1 equals 1/100em.");
- static readonly GUIContent k_CharacterSpacingLabel = new GUIContent("Character");
- static readonly GUIContent k_WordSpacingLabel = new GUIContent("Word");
- static readonly GUIContent k_LineSpacingLabel = new GUIContent("Line");
- static readonly GUIContent k_ParagraphSpacingLabel = new GUIContent("Paragraph");
-
- static readonly GUIContent k_AlignmentLabel = new GUIContent("Alignment", "Horizontal and vertical aligment of the text within its container.");
- static readonly GUIContent k_WrapMixLabel = new GUIContent("Wrap Mix (W <-> C)", "How much to favor words versus characters when distributing the text.");
-
- static readonly GUIContent k_WrappingLabel = new GUIContent("Wrapping", "Wraps text to the next line when reaching the edge of the container.");
- static readonly GUIContent[] k_WrappingOptions = { new GUIContent("Disabled"), new GUIContent("Enabled") };
- static readonly GUIContent k_OverflowLabel = new GUIContent("Overflow", "How to display text which goes past the edge of the container.");
-
- static readonly GUIContent k_MarginsLabel = new GUIContent("Margins", "The space between the text and the edge of its container.");
- static readonly GUIContent k_GeometrySortingLabel = new GUIContent("Geometry Sorting", "The order in which text geometry is sorted. Used to adjust the way overlapping characters are displayed.");
- static readonly GUIContent k_IsTextObjectScaleStatic = new GUIContent("Is Scale Static", "Controls whether a text object will be excluded from the InteralUpdate callback to handle scale changes of the text object or its parent(s).");
- static readonly GUIContent k_RichTextLabel = new GUIContent("Rich Text", "Enables the use of rich text tags such as and .");
- static readonly GUIContent k_EscapeCharactersLabel = new GUIContent("Parse Escape Characters", "Whether to display strings such as \"\\n\" as is or replace them by the character they represent.");
- static readonly GUIContent k_VisibleDescenderLabel = new GUIContent("Visible Descender", "Compute descender values from visible characters only. Used to adjust layout behavior when hiding and revealing characters dynamically.");
- static readonly GUIContent k_SpriteAssetLabel = new GUIContent("Sprite Asset", "The Sprite Asset used when NOT specifically referencing one using .");
- static readonly GUIContent k_StyleSheetAssetLabel = new GUIContent("Style Sheet Asset", "The Style Sheet Asset used by this text object.");
-
- static readonly GUIContent k_HorizontalMappingLabel = new GUIContent("Horizontal Mapping", "Horizontal UV mapping when using a shader with a texture face option.");
- static readonly GUIContent k_VerticalMappingLabel = new GUIContent("Vertical Mapping", "Vertical UV mapping when using a shader with a texture face option.");
- static readonly GUIContent k_LineOffsetLabel = new GUIContent("Line Offset", "Adds an horizontal offset to each successive line. Used for slanted texturing.");
-
- static readonly GUIContent k_KerningLabel = new GUIContent("Kerning", "Enables character specific spacing between pairs of characters.");
- static readonly GUIContent k_PaddingLabel = new GUIContent("Extra Padding", "Adds some padding between the characters and the edge of the text mesh. Can reduce graphical errors when displaying small text.");
-
- static readonly GUIContent k_LeftLabel = new GUIContent("Left");
- static readonly GUIContent k_TopLabel = new GUIContent("Top");
- static readonly GUIContent k_RightLabel = new GUIContent("Right");
- static readonly GUIContent k_BottomLabel = new GUIContent("Bottom");
-
- protected static readonly GUIContent k_ExtraSettingsLabel = new GUIContent("Extra Settings");
- protected static string[] k_UiStateLabel = new string[] { "(Click to collapse) ", "(Click to expand) " };
-
- static Dictionary k_AvailableStyles = new Dictionary();
- protected Dictionary m_TextStyleIndexLookup = new Dictionary();
-
- protected struct Foldout
- {
- // Track Inspector foldout panel states, globally.
- public static bool extraSettings = false;
- public static bool materialInspector = true;
- }
-
- protected static int s_EventId;
-
- public int selAlignGridA;
- public int selAlignGridB;
-
- protected SerializedProperty m_TextProp;
-
- protected SerializedProperty m_IsRightToLeftProp;
- protected string m_RtlText;
-
- protected SerializedProperty m_FontAssetProp;
-
- protected SerializedProperty m_FontSharedMaterialProp;
- protected Material[] m_MaterialPresets;
- protected GUIContent[] m_MaterialPresetNames;
- protected Dictionary m_MaterialPresetIndexLookup = new Dictionary();
- protected int m_MaterialPresetSelectionIndex;
- protected bool m_IsPresetListDirty;
-
- protected List m_Styles = new List();
- protected GUIContent[] m_StyleNames;
- protected int m_StyleSelectionIndex;
-
- protected SerializedProperty m_FontStyleProp;
-
- protected SerializedProperty m_FontColorProp;
- protected SerializedProperty m_EnableVertexGradientProp;
- protected SerializedProperty m_FontColorGradientProp;
- protected SerializedProperty m_FontColorGradientPresetProp;
- protected SerializedProperty m_OverrideHtmlColorProp;
-
- protected SerializedProperty m_FontSizeProp;
- protected SerializedProperty m_FontSizeBaseProp;
-
- protected SerializedProperty m_AutoSizingProp;
- protected SerializedProperty m_FontSizeMinProp;
- protected SerializedProperty m_FontSizeMaxProp;
-
- protected SerializedProperty m_LineSpacingMaxProp;
- protected SerializedProperty m_CharWidthMaxAdjProp;
-
- protected SerializedProperty m_CharacterSpacingProp;
- protected SerializedProperty m_WordSpacingProp;
- protected SerializedProperty m_LineSpacingProp;
- protected SerializedProperty m_ParagraphSpacingProp;
-
- protected SerializedProperty m_TextAlignmentProp;
-
- protected SerializedProperty m_HorizontalAlignmentProp;
- protected SerializedProperty m_VerticalAlignmentProp;
-
- protected SerializedProperty m_HorizontalMappingProp;
- protected SerializedProperty m_VerticalMappingProp;
- protected SerializedProperty m_UvLineOffsetProp;
-
- protected SerializedProperty m_EnableWordWrappingProp;
- protected SerializedProperty m_WordWrappingRatiosProp;
- protected SerializedProperty m_TextOverflowModeProp;
- protected SerializedProperty m_PageToDisplayProp;
- protected SerializedProperty m_LinkedTextComponentProp;
- protected SerializedProperty m_ParentLinkedTextComponentProp;
-
- protected SerializedProperty m_EnableKerningProp;
-
- protected SerializedProperty m_IsRichTextProp;
-
- protected SerializedProperty m_HasFontAssetChangedProp;
-
- protected SerializedProperty m_EnableExtraPaddingProp;
- protected SerializedProperty m_CheckPaddingRequiredProp;
- protected SerializedProperty m_EnableEscapeCharacterParsingProp;
- protected SerializedProperty m_UseMaxVisibleDescenderProp;
- protected SerializedProperty m_GeometrySortingOrderProp;
- protected SerializedProperty m_IsTextObjectScaleStaticProp;
-
- protected SerializedProperty m_SpriteAssetProp;
-
- protected SerializedProperty m_StyleSheetAssetProp;
- protected SerializedProperty m_TextStyleHashCodeProp;
-
- protected SerializedProperty m_MarginProp;
-
- protected SerializedProperty m_ColorModeProp;
-
- protected bool m_HavePropertiesChanged;
-
- protected TMP_Text m_TextComponent;
- protected TMP_Text m_PreviousLinkedTextComponent;
- protected RectTransform m_RectTransform;
-
- protected Material m_TargetMaterial;
-
- protected Vector3[] m_RectCorners = new Vector3[4];
- protected Vector3[] m_HandlePoints = new Vector3[4];
-
- protected virtual void OnEnable()
- {
- m_TextProp = serializedObject.FindProperty("m_text");
- m_IsRightToLeftProp = serializedObject.FindProperty("m_isRightToLeft");
- m_FontAssetProp = serializedObject.FindProperty("m_fontAsset");
- m_FontSharedMaterialProp = serializedObject.FindProperty("m_sharedMaterial");
-
- m_FontStyleProp = serializedObject.FindProperty("m_fontStyle");
-
- m_FontSizeProp = serializedObject.FindProperty("m_fontSize");
- m_FontSizeBaseProp = serializedObject.FindProperty("m_fontSizeBase");
-
- m_AutoSizingProp = serializedObject.FindProperty("m_enableAutoSizing");
- m_FontSizeMinProp = serializedObject.FindProperty("m_fontSizeMin");
- m_FontSizeMaxProp = serializedObject.FindProperty("m_fontSizeMax");
-
- m_LineSpacingMaxProp = serializedObject.FindProperty("m_lineSpacingMax");
- m_CharWidthMaxAdjProp = serializedObject.FindProperty("m_charWidthMaxAdj");
-
- // Colors & Gradient
- m_FontColorProp = serializedObject.FindProperty("m_fontColor");
- m_EnableVertexGradientProp = serializedObject.FindProperty("m_enableVertexGradient");
- m_FontColorGradientProp = serializedObject.FindProperty("m_fontColorGradient");
- m_FontColorGradientPresetProp = serializedObject.FindProperty("m_fontColorGradientPreset");
- m_OverrideHtmlColorProp = serializedObject.FindProperty("m_overrideHtmlColors");
-
- m_CharacterSpacingProp = serializedObject.FindProperty("m_characterSpacing");
- m_WordSpacingProp = serializedObject.FindProperty("m_wordSpacing");
- m_LineSpacingProp = serializedObject.FindProperty("m_lineSpacing");
- m_ParagraphSpacingProp = serializedObject.FindProperty("m_paragraphSpacing");
-
- m_TextAlignmentProp = serializedObject.FindProperty("m_textAlignment");
- m_HorizontalAlignmentProp = serializedObject.FindProperty("m_HorizontalAlignment");
- m_VerticalAlignmentProp = serializedObject.FindProperty("m_VerticalAlignment");
-
- m_HorizontalMappingProp = serializedObject.FindProperty("m_horizontalMapping");
- m_VerticalMappingProp = serializedObject.FindProperty("m_verticalMapping");
- m_UvLineOffsetProp = serializedObject.FindProperty("m_uvLineOffset");
-
- m_EnableWordWrappingProp = serializedObject.FindProperty("m_enableWordWrapping");
- m_WordWrappingRatiosProp = serializedObject.FindProperty("m_wordWrappingRatios");
- m_TextOverflowModeProp = serializedObject.FindProperty("m_overflowMode");
- m_PageToDisplayProp = serializedObject.FindProperty("m_pageToDisplay");
- m_LinkedTextComponentProp = serializedObject.FindProperty("m_linkedTextComponent");
- m_ParentLinkedTextComponentProp = serializedObject.FindProperty("parentLinkedComponent");
-
- m_EnableKerningProp = serializedObject.FindProperty("m_enableKerning");
-
- m_EnableExtraPaddingProp = serializedObject.FindProperty("m_enableExtraPadding");
- m_IsRichTextProp = serializedObject.FindProperty("m_isRichText");
- m_CheckPaddingRequiredProp = serializedObject.FindProperty("checkPaddingRequired");
- m_EnableEscapeCharacterParsingProp = serializedObject.FindProperty("m_parseCtrlCharacters");
- m_UseMaxVisibleDescenderProp = serializedObject.FindProperty("m_useMaxVisibleDescender");
-
- m_GeometrySortingOrderProp = serializedObject.FindProperty("m_geometrySortingOrder");
- m_IsTextObjectScaleStaticProp = serializedObject.FindProperty("m_IsTextObjectScaleStatic");
-
- m_SpriteAssetProp = serializedObject.FindProperty("m_spriteAsset");
-
- m_StyleSheetAssetProp = serializedObject.FindProperty("m_StyleSheet");
- m_TextStyleHashCodeProp = serializedObject.FindProperty("m_TextStyleHashCode");
-
- m_MarginProp = serializedObject.FindProperty("m_margin");
-
- m_HasFontAssetChangedProp = serializedObject.FindProperty("m_hasFontAssetChanged");
-
- m_ColorModeProp = serializedObject.FindProperty("m_colorMode");
-
- m_TextComponent = (TMP_Text)target;
- m_RectTransform = m_TextComponent.rectTransform;
-
- // Restore Previous Linked Text Component
- m_PreviousLinkedTextComponent = m_TextComponent.linkedTextComponent;
-
- // Create new Material Editor if one does not exists
- m_TargetMaterial = m_TextComponent.fontSharedMaterial;
-
- // Set material inspector visibility
- if (m_TargetMaterial != null)
- UnityEditorInternal.InternalEditorUtility.SetIsInspectorExpanded(m_TargetMaterial, Foldout.materialInspector);
-
- // Find all Material Presets matching the current Font Asset Material
- m_MaterialPresetNames = GetMaterialPresets();
-
- // Get Styles from Style Sheet
- if (!m_TextComponent.m_isWaitingOnResourceLoad)
- m_StyleNames = GetStyleNames();
-
- // Register to receive events when style sheets are modified.
- TMPro_EventManager.TEXT_STYLE_PROPERTY_EVENT.Add(ON_TEXT_STYLE_CHANGED);
-
- // Initialize the Event Listener for Undo Events.
- Undo.undoRedoPerformed += OnUndoRedo;
- }
-
- protected virtual void OnDisable()
- {
- // Set material inspector visibility
- if (m_TargetMaterial != null)
- Foldout.materialInspector = UnityEditorInternal.InternalEditorUtility.GetIsInspectorExpanded(m_TargetMaterial);
-
- if (Undo.undoRedoPerformed != null)
- Undo.undoRedoPerformed -= OnUndoRedo;
-
- // Unregister from style sheet related events.
- TMPro_EventManager.TEXT_STYLE_PROPERTY_EVENT.Remove(ON_TEXT_STYLE_CHANGED);
- }
-
- // Event received when Text Styles are changed.
- void ON_TEXT_STYLE_CHANGED(bool isChanged)
- {
- m_StyleNames = GetStyleNames();
- }
-
- public override void OnInspectorGUI()
- {
- // Make sure Multi selection only includes TMP Text objects.
- if (IsMixSelectionTypes()) return;
-
- serializedObject.Update();
-
- DrawTextInput();
-
- DrawMainSettings();
-
- DrawExtraSettings();
-
- EditorGUILayout.Space();
-
- if (serializedObject.ApplyModifiedProperties() || m_HavePropertiesChanged)
- {
- m_TextComponent.havePropertiesChanged = true;
- m_HavePropertiesChanged = false;
- EditorUtility.SetDirty(target);
- }
- }
-
- public void OnSceneGUI()
- {
- if (IsMixSelectionTypes()) return;
-
- // Margin Frame & Handles
- m_RectTransform.GetWorldCorners(m_RectCorners);
- Vector4 marginOffset = m_TextComponent.margin;
- Vector3 lossyScale = m_RectTransform.lossyScale;
-
- m_HandlePoints[0] = m_RectCorners[0] + m_RectTransform.TransformDirection(new Vector3(marginOffset.x * lossyScale.x, marginOffset.w * lossyScale.y, 0));
- m_HandlePoints[1] = m_RectCorners[1] + m_RectTransform.TransformDirection(new Vector3(marginOffset.x * lossyScale.x, -marginOffset.y * lossyScale.y, 0));
- m_HandlePoints[2] = m_RectCorners[2] + m_RectTransform.TransformDirection(new Vector3(-marginOffset.z * lossyScale.x, -marginOffset.y * lossyScale.y, 0));
- m_HandlePoints[3] = m_RectCorners[3] + m_RectTransform.TransformDirection(new Vector3(-marginOffset.z * lossyScale.x, marginOffset.w * lossyScale.y, 0));
-
- Handles.DrawSolidRectangleWithOutline(m_HandlePoints, new Color32(255, 255, 255, 0), new Color32(255, 255, 0, 255));
-
- // Draw & process FreeMoveHandles
-
- // LEFT HANDLE
- Vector3 oldLeft = (m_HandlePoints[0] + m_HandlePoints[1]) * 0.5f;
- Vector3 newLeft = Handles.FreeMoveHandle(oldLeft, Quaternion.identity, HandleUtility.GetHandleSize(m_RectTransform.position) * 0.05f, Vector3.zero, Handles.DotHandleCap);
- bool hasChanged = false;
- if (oldLeft != newLeft)
- {
- float delta = oldLeft.x - newLeft.x;
- marginOffset.x += -delta / lossyScale.x;
- //Debug.Log("Left Margin H0:" + handlePoints[0] + " H1:" + handlePoints[1]);
- hasChanged = true;
- }
-
- // TOP HANDLE
- Vector3 oldTop = (m_HandlePoints[1] + m_HandlePoints[2]) * 0.5f;
- Vector3 newTop = Handles.FreeMoveHandle(oldTop, Quaternion.identity, HandleUtility.GetHandleSize(m_RectTransform.position) * 0.05f, Vector3.zero, Handles.DotHandleCap);
- if (oldTop != newTop)
- {
- float delta = oldTop.y - newTop.y;
- marginOffset.y += delta / lossyScale.y;
- //Debug.Log("Top Margin H1:" + handlePoints[1] + " H2:" + handlePoints[2]);
- hasChanged = true;
- }
-
- // RIGHT HANDLE
- Vector3 oldRight = (m_HandlePoints[2] + m_HandlePoints[3]) * 0.5f;
- Vector3 newRight = Handles.FreeMoveHandle(oldRight, Quaternion.identity, HandleUtility.GetHandleSize(m_RectTransform.position) * 0.05f, Vector3.zero, Handles.DotHandleCap);
- if (oldRight != newRight)
- {
- float delta = oldRight.x - newRight.x;
- marginOffset.z += delta / lossyScale.x;
- hasChanged = true;
- //Debug.Log("Right Margin H2:" + handlePoints[2] + " H3:" + handlePoints[3]);
- }
-
- // BOTTOM HANDLE
- Vector3 oldBottom = (m_HandlePoints[3] + m_HandlePoints[0]) * 0.5f;
- Vector3 newBottom = Handles.FreeMoveHandle(oldBottom, Quaternion.identity, HandleUtility.GetHandleSize(m_RectTransform.position) * 0.05f, Vector3.zero, Handles.DotHandleCap);
- if (oldBottom != newBottom)
- {
- float delta = oldBottom.y - newBottom.y;
- marginOffset.w += -delta / lossyScale.y;
- hasChanged = true;
- //Debug.Log("Bottom Margin H0:" + handlePoints[0] + " H3:" + handlePoints[3]);
- }
-
- if (hasChanged)
- {
- Undo.RecordObjects(new Object[] {m_RectTransform, m_TextComponent }, "Margin Changes");
- m_TextComponent.margin = marginOffset;
- EditorUtility.SetDirty(target);
- }
- }
-
- protected void DrawTextInput()
- {
- EditorGUILayout.Space();
-
- Rect rect = EditorGUILayout.GetControlRect(false, 22);
- GUI.Label(rect, new GUIContent("Text Input"), TMP_UIStyleManager.sectionHeader);
-
- EditorGUI.indentLevel = 0;
-
- // If the text component is linked, disable the text input box.
- if (m_ParentLinkedTextComponentProp.objectReferenceValue != null)
- {
- EditorGUILayout.HelpBox("The Text Input Box is disabled due to this text component being linked to another.", MessageType.Info);
- }
- else
- {
- // Display RTL Toggle
- float labelWidth = EditorGUIUtility.labelWidth;
- EditorGUIUtility.labelWidth = 110f;
-
- m_IsRightToLeftProp.boolValue = EditorGUI.Toggle(new Rect(rect.width - 120, rect.y + 3, 130, 20), k_RtlToggleLabel, m_IsRightToLeftProp.boolValue);
-
- EditorGUIUtility.labelWidth = labelWidth;
-
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(m_TextProp, GUIContent.none);
-
- if (EditorGUI.EndChangeCheck())
- {
- m_TextComponent.m_inputSource = TMP_Text.TextInputSources.Text;
- m_TextComponent.m_isInputParsingRequired = true;
- m_HavePropertiesChanged = true;
- }
-
- if (m_IsRightToLeftProp.boolValue)
- {
- // Copy source text to RTL string
- m_RtlText = string.Empty;
- string sourceText = m_TextProp.stringValue;
-
- // Reverse Text displayed in Text Input Box
- for (int i = 0; i < sourceText.Length; i++)
- m_RtlText += sourceText[sourceText.Length - i - 1];
-
- GUILayout.Label("RTL Text Input");
-
- EditorGUI.BeginChangeCheck();
- m_RtlText = EditorGUILayout.TextArea(m_RtlText, TMP_UIStyleManager.wrappingTextArea, GUILayout.Height(EditorGUI.GetPropertyHeight(m_TextProp) - EditorGUIUtility.singleLineHeight), GUILayout.ExpandWidth(true));
-
- if (EditorGUI.EndChangeCheck())
- {
- // Convert RTL input
- sourceText = string.Empty;
-
- // Reverse Text displayed in Text Input Box
- for (int i = 0; i < m_RtlText.Length; i++)
- sourceText += m_RtlText[m_RtlText.Length - i - 1];
-
- m_TextProp.stringValue = sourceText;
- }
- }
-
- // TEXT STYLE
- if (m_StyleNames != null)
- {
- rect = EditorGUILayout.GetControlRect(false, 17);
-
- m_TextStyleIndexLookup.TryGetValue(m_TextStyleHashCodeProp.intValue, out m_StyleSelectionIndex);
-
- EditorGUI.BeginChangeCheck();
- m_StyleSelectionIndex = EditorGUI.Popup(rect, k_StyleLabel, m_StyleSelectionIndex, m_StyleNames);
- if (EditorGUI.EndChangeCheck())
- {
- m_TextStyleHashCodeProp.intValue = m_Styles[m_StyleSelectionIndex].hashCode;
- m_TextComponent.m_TextStyle = m_Styles[m_StyleSelectionIndex];
- m_HavePropertiesChanged = true;
- }
- }
- }
- }
-
- protected void DrawMainSettings()
- {
- // MAIN SETTINGS SECTION
- GUILayout.Label(new GUIContent("Main Settings"), TMP_UIStyleManager.sectionHeader);
-
- //EditorGUI.indentLevel += 1;
-
- DrawFont();
-
- DrawColor();
-
- DrawSpacing();
-
- DrawAlignment();
-
- DrawWrappingOverflow();
-
- DrawTextureMapping();
-
- //EditorGUI.indentLevel -= 1;
- }
-
- void DrawFont()
- {
- bool isFontAssetDirty = false;
-
- // FONT ASSET
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(m_FontAssetProp, k_FontAssetLabel);
- if (EditorGUI.EndChangeCheck())
- {
- m_HavePropertiesChanged = true;
- m_HasFontAssetChangedProp.boolValue = true;
-
- // Get new Material Presets for the new font asset
- m_MaterialPresetNames = GetMaterialPresets();
- m_MaterialPresetSelectionIndex = 0;
-
- isFontAssetDirty = true;
- }
-
- Rect rect;
-
- // MATERIAL PRESET
- if (m_MaterialPresetNames != null && !isFontAssetDirty )
- {
- EditorGUI.BeginChangeCheck();
- rect = EditorGUILayout.GetControlRect(false, 17);
-
- float oldHeight = EditorStyles.popup.fixedHeight;
- EditorStyles.popup.fixedHeight = rect.height;
-
- int oldSize = EditorStyles.popup.fontSize;
- EditorStyles.popup.fontSize = 11;
-
- if (m_FontSharedMaterialProp.objectReferenceValue != null)
- m_MaterialPresetIndexLookup.TryGetValue(m_FontSharedMaterialProp.objectReferenceValue.GetInstanceID(), out m_MaterialPresetSelectionIndex);
-
- m_MaterialPresetSelectionIndex = EditorGUI.Popup(rect, k_MaterialPresetLabel, m_MaterialPresetSelectionIndex, m_MaterialPresetNames);
- if (EditorGUI.EndChangeCheck())
- {
- m_FontSharedMaterialProp.objectReferenceValue = m_MaterialPresets[m_MaterialPresetSelectionIndex];
- m_HavePropertiesChanged = true;
- }
-
- EditorStyles.popup.fixedHeight = oldHeight;
- EditorStyles.popup.fontSize = oldSize;
- }
-
- // FONT STYLE
- EditorGUI.BeginChangeCheck();
-
- int v1, v2, v3, v4, v5, v6, v7;
-
- if (EditorGUIUtility.wideMode)
- {
- rect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight + 2f);
-
- EditorGUI.PrefixLabel(rect, k_FontStyleLabel);
-
- int styleValue = m_FontStyleProp.intValue;
-
- rect.x += EditorGUIUtility.labelWidth;
- rect.width -= EditorGUIUtility.labelWidth;
-
- rect.width = Mathf.Max(25f, rect.width / 7f);
-
- v1 = TMP_EditorUtility.EditorToggle(rect, (styleValue & 1) == 1, k_BoldLabel, TMP_UIStyleManager.alignmentButtonLeft) ? 1 : 0; // Bold
- rect.x += rect.width;
- v2 = TMP_EditorUtility.EditorToggle(rect, (styleValue & 2) == 2, k_ItalicLabel, TMP_UIStyleManager.alignmentButtonMid) ? 2 : 0; // Italics
- rect.x += rect.width;
- v3 = TMP_EditorUtility.EditorToggle(rect, (styleValue & 4) == 4, k_UnderlineLabel, TMP_UIStyleManager.alignmentButtonMid) ? 4 : 0; // Underline
- rect.x += rect.width;
- v7 = TMP_EditorUtility.EditorToggle(rect, (styleValue & 64) == 64, k_StrikethroughLabel, TMP_UIStyleManager.alignmentButtonRight) ? 64 : 0; // Strikethrough
- rect.x += rect.width;
-
- int selected = 0;
-
- EditorGUI.BeginChangeCheck();
- v4 = TMP_EditorUtility.EditorToggle(rect, (styleValue & 8) == 8, k_LowercaseLabel, TMP_UIStyleManager.alignmentButtonLeft) ? 8 : 0; // Lowercase
- if (EditorGUI.EndChangeCheck() && v4 > 0)
- {
- selected = v4;
- }
- rect.x += rect.width;
- EditorGUI.BeginChangeCheck();
- v5 = TMP_EditorUtility.EditorToggle(rect, (styleValue & 16) == 16, k_UppercaseLabel, TMP_UIStyleManager.alignmentButtonMid) ? 16 : 0; // Uppercase
- if (EditorGUI.EndChangeCheck() && v5 > 0)
- {
- selected = v5;
- }
- rect.x += rect.width;
- EditorGUI.BeginChangeCheck();
- v6 = TMP_EditorUtility.EditorToggle(rect, (styleValue & 32) == 32, k_SmallcapsLabel, TMP_UIStyleManager.alignmentButtonRight) ? 32 : 0; // Smallcaps
- if (EditorGUI.EndChangeCheck() && v6 > 0)
- {
- selected = v6;
- }
-
- if (selected > 0)
- {
- v4 = selected == 8 ? 8 : 0;
- v5 = selected == 16 ? 16 : 0;
- v6 = selected == 32 ? 32 : 0;
- }
- }
- else
- {
- rect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight + 2f);
-
- EditorGUI.PrefixLabel(rect, k_FontStyleLabel);
-
- int styleValue = m_FontStyleProp.intValue;
-
- rect.x += EditorGUIUtility.labelWidth;
- rect.width -= EditorGUIUtility.labelWidth;
- rect.width = Mathf.Max(25f, rect.width / 4f);
-
- v1 = TMP_EditorUtility.EditorToggle(rect, (styleValue & 1) == 1, k_BoldLabel, TMP_UIStyleManager.alignmentButtonLeft) ? 1 : 0; // Bold
- rect.x += rect.width;
- v2 = TMP_EditorUtility.EditorToggle(rect, (styleValue & 2) == 2, k_ItalicLabel, TMP_UIStyleManager.alignmentButtonMid) ? 2 : 0; // Italics
- rect.x += rect.width;
- v3 = TMP_EditorUtility.EditorToggle(rect, (styleValue & 4) == 4, k_UnderlineLabel, TMP_UIStyleManager.alignmentButtonMid) ? 4 : 0; // Underline
- rect.x += rect.width;
- v7 = TMP_EditorUtility.EditorToggle(rect, (styleValue & 64) == 64, k_StrikethroughLabel, TMP_UIStyleManager.alignmentButtonRight) ? 64 : 0; // Strikethrough
-
- rect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight + 2f);
-
- rect.x += EditorGUIUtility.labelWidth;
- rect.width -= EditorGUIUtility.labelWidth;
-
- rect.width = Mathf.Max(25f, rect.width / 4f);
-
- int selected = 0;
-
- EditorGUI.BeginChangeCheck();
- v4 = TMP_EditorUtility.EditorToggle(rect, (styleValue & 8) == 8, k_LowercaseLabel, TMP_UIStyleManager.alignmentButtonLeft) ? 8 : 0; // Lowercase
- if (EditorGUI.EndChangeCheck() && v4 > 0)
- {
- selected = v4;
- }
- rect.x += rect.width;
- EditorGUI.BeginChangeCheck();
- v5 = TMP_EditorUtility.EditorToggle(rect, (styleValue & 16) == 16, k_UppercaseLabel, TMP_UIStyleManager.alignmentButtonMid) ? 16 : 0; // Uppercase
- if (EditorGUI.EndChangeCheck() && v5 > 0)
- {
- selected = v5;
- }
- rect.x += rect.width;
- EditorGUI.BeginChangeCheck();
- v6 = TMP_EditorUtility.EditorToggle(rect, (styleValue & 32) == 32, k_SmallcapsLabel, TMP_UIStyleManager.alignmentButtonRight) ? 32 : 0; // Smallcaps
- if (EditorGUI.EndChangeCheck() && v6 > 0)
- {
- selected = v6;
- }
-
- if (selected > 0)
- {
- v4 = selected == 8 ? 8 : 0;
- v5 = selected == 16 ? 16 : 0;
- v6 = selected == 32 ? 32 : 0;
- }
- }
-
- if (EditorGUI.EndChangeCheck())
- {
- m_FontStyleProp.intValue = v1 + v2 + v3 + v4 + v5 + v6 + v7;
- m_HavePropertiesChanged = true;
- }
-
- // FONT SIZE
- EditorGUI.BeginChangeCheck();
-
- EditorGUI.BeginDisabledGroup(m_AutoSizingProp.boolValue);
- EditorGUILayout.PropertyField(m_FontSizeProp, k_FontSizeLabel, GUILayout.MaxWidth(EditorGUIUtility.labelWidth + 50f));
- EditorGUI.EndDisabledGroup();
-
- if (EditorGUI.EndChangeCheck())
- {
- float fontSize = Mathf.Clamp(m_FontSizeProp.floatValue, 0, 32767);
-
- m_FontSizeProp.floatValue = fontSize;
- m_FontSizeBaseProp.floatValue = fontSize;
- m_HavePropertiesChanged = true;
- }
-
- EditorGUI.indentLevel += 1;
-
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(m_AutoSizingProp, k_AutoSizeLabel);
- if (EditorGUI.EndChangeCheck())
- {
- if (m_AutoSizingProp.boolValue == false)
- m_FontSizeProp.floatValue = m_FontSizeBaseProp.floatValue;
-
- m_HavePropertiesChanged = true;
- }
-
- // Show auto sizing options
- if (m_AutoSizingProp.boolValue)
- {
- rect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight);
-
- EditorGUI.PrefixLabel(rect, k_AutoSizeOptionsLabel);
-
- int previousIndent = EditorGUI.indentLevel;
-
- EditorGUI.indentLevel = 0;
-
- rect.width = (rect.width - EditorGUIUtility.labelWidth) / 4f;
- rect.x += EditorGUIUtility.labelWidth;
-
- EditorGUIUtility.labelWidth = 24;
- EditorGUI.BeginChangeCheck();
- EditorGUI.PropertyField(rect, m_FontSizeMinProp, k_MinLabel);
- if (EditorGUI.EndChangeCheck())
- {
- float minSize = m_FontSizeMinProp.floatValue;
-
- minSize = Mathf.Max(0, minSize);
-
- m_FontSizeMinProp.floatValue = Mathf.Min(minSize, m_FontSizeMaxProp.floatValue);
- m_HavePropertiesChanged = true;
- }
- rect.x += rect.width;
-
- EditorGUIUtility.labelWidth = 27;
- EditorGUI.BeginChangeCheck();
- EditorGUI.PropertyField(rect, m_FontSizeMaxProp, k_MaxLabel);
- if (EditorGUI.EndChangeCheck())
- {
- float maxSize = Mathf.Clamp(m_FontSizeMaxProp.floatValue, 0, 32767);
-
- m_FontSizeMaxProp.floatValue = Mathf.Max(m_FontSizeMinProp.floatValue, maxSize);
- m_HavePropertiesChanged = true;
- }
- rect.x += rect.width;
-
- EditorGUI.BeginChangeCheck();
- EditorGUIUtility.labelWidth = 36;
- EditorGUI.PropertyField(rect, m_CharWidthMaxAdjProp, k_WdLabel);
- rect.x += rect.width;
- EditorGUIUtility.labelWidth = 28;
- EditorGUI.PropertyField(rect, m_LineSpacingMaxProp, k_LineLabel);
-
- EditorGUIUtility.labelWidth = 0;
-
- if (EditorGUI.EndChangeCheck())
- {
- m_CharWidthMaxAdjProp.floatValue = Mathf.Clamp(m_CharWidthMaxAdjProp.floatValue, 0, 50);
- m_LineSpacingMaxProp.floatValue = Mathf.Min(0, m_LineSpacingMaxProp.floatValue);
- m_HavePropertiesChanged = true;
- }
-
- EditorGUI.indentLevel = previousIndent;
- }
-
- EditorGUI.indentLevel -= 1;
-
-
-
- EditorGUILayout.Space();
- }
-
- void DrawColor()
- {
- // FACE VERTEX COLOR
- EditorGUI.BeginChangeCheck();
- Color vertexColor = EditorGUILayout.ColorField(k_BaseColorLabel, m_FontColorProp.colorValue, false, true, false);
- if (EditorGUI.EndChangeCheck())
- {
- m_FontColorProp.colorValue = vertexColor;
- m_HavePropertiesChanged = true;
- }
-
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(m_EnableVertexGradientProp, k_ColorGradientLabel);
- if (EditorGUI.EndChangeCheck())
- {
- m_HavePropertiesChanged = true;
- }
-
- EditorGUIUtility.fieldWidth = 0;
-
- if (m_EnableVertexGradientProp.boolValue)
- {
- EditorGUI.indentLevel += 1;
-
- EditorGUI.BeginChangeCheck();
-
- EditorGUILayout.PropertyField(m_FontColorGradientPresetProp, k_ColorPresetLabel);
-
- SerializedObject obj = null;
-
- SerializedProperty colorMode;
-
- SerializedProperty topLeft;
- SerializedProperty topRight;
- SerializedProperty bottomLeft;
- SerializedProperty bottomRight;
-
- if (m_FontColorGradientPresetProp.objectReferenceValue == null)
- {
- colorMode = m_ColorModeProp;
- topLeft = m_FontColorGradientProp.FindPropertyRelative("topLeft");
- topRight = m_FontColorGradientProp.FindPropertyRelative("topRight");
- bottomLeft = m_FontColorGradientProp.FindPropertyRelative("bottomLeft");
- bottomRight = m_FontColorGradientProp.FindPropertyRelative("bottomRight");
- }
- else
- {
- obj = new SerializedObject(m_FontColorGradientPresetProp.objectReferenceValue);
- colorMode = obj.FindProperty("colorMode");
- topLeft = obj.FindProperty("topLeft");
- topRight = obj.FindProperty("topRight");
- bottomLeft = obj.FindProperty("bottomLeft");
- bottomRight = obj.FindProperty("bottomRight");
- }
-
- EditorGUILayout.PropertyField(colorMode, k_ColorModeLabel);
-
- var rect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight * (EditorGUIUtility.wideMode ? 1 : 2));
-
- EditorGUI.PrefixLabel(rect, k_CorenerColorsLabel);
-
- rect.x += EditorGUIUtility.labelWidth;
- rect.width = rect.width - EditorGUIUtility.labelWidth;
-
- switch ((ColorMode)colorMode.enumValueIndex)
- {
- case ColorMode.Single:
- TMP_EditorUtility.DrawColorProperty(rect, topLeft);
-
- topRight.colorValue = topLeft.colorValue;
- bottomLeft.colorValue = topLeft.colorValue;
- bottomRight.colorValue = topLeft.colorValue;
- break;
- case ColorMode.HorizontalGradient:
- rect.width /= 2f;
-
- TMP_EditorUtility.DrawColorProperty(rect, topLeft);
-
- rect.x += rect.width;
-
- TMP_EditorUtility.DrawColorProperty(rect, topRight);
-
- bottomLeft.colorValue = topLeft.colorValue;
- bottomRight.colorValue = topRight.colorValue;
- break;
- case ColorMode.VerticalGradient:
- TMP_EditorUtility.DrawColorProperty(rect, topLeft);
-
- rect = EditorGUILayout.GetControlRect(false, EditorGUIUtility.singleLineHeight * (EditorGUIUtility.wideMode ? 1 : 2));
- rect.x += EditorGUIUtility.labelWidth;
-
- TMP_EditorUtility.DrawColorProperty(rect, bottomLeft);
-
- topRight.colorValue = topLeft.colorValue;
- bottomRight.colorValue = bottomLeft.colorValue;
- break;
- case ColorMode.FourCornersGradient:
- rect.width /= 2f;
-
- TMP_EditorUtility.DrawColorProperty(rect, topLeft);
-
- rect.x += rect.width;
-
- TMP_EditorUtility.DrawColorProperty(rect, topRight);
-
- rect = EditorGUILayout.GetControlRect(false, EditorGUIUtility.singleLineHeight * (EditorGUIUtility.wideMode ? 1 : 2));
- rect.x += EditorGUIUtility.labelWidth;
- rect.width = (rect.width - EditorGUIUtility.labelWidth) / 2f;
-
- TMP_EditorUtility.DrawColorProperty(rect, bottomLeft);
-
- rect.x += rect.width;
-
- TMP_EditorUtility.DrawColorProperty(rect, bottomRight);
- break;
- }
-
- if (EditorGUI.EndChangeCheck())
- {
- m_HavePropertiesChanged = true;
- if (obj != null)
- {
- obj.ApplyModifiedProperties();
- TMPro_EventManager.ON_COLOR_GRADIENT_PROPERTY_CHANGED(m_FontColorGradientPresetProp.objectReferenceValue as TMP_ColorGradient);
- }
- }
-
- EditorGUI.indentLevel -= 1;
- }
-
- EditorGUILayout.PropertyField(m_OverrideHtmlColorProp, k_OverrideTagsLabel);
-
- EditorGUILayout.Space();
- }
-
- void DrawSpacing()
- {
- // CHARACTER, LINE & PARAGRAPH SPACING
- EditorGUI.BeginChangeCheck();
-
- Rect rect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight);
-
- EditorGUI.PrefixLabel(rect, k_SpacingOptionsLabel);
-
- int oldIndent = EditorGUI.indentLevel;
- EditorGUI.indentLevel = 0;
-
- rect.x += EditorGUIUtility.labelWidth;
- rect.width = (rect.width - EditorGUIUtility.labelWidth - 3f) / 2f;
-
- EditorGUIUtility.labelWidth = Mathf.Min(rect.width * 0.55f, 80f);
-
- EditorGUI.PropertyField(rect, m_CharacterSpacingProp, k_CharacterSpacingLabel);
- rect.x += rect.width + 3f;
- EditorGUI.PropertyField(rect, m_WordSpacingProp, k_WordSpacingLabel);
-
- rect = EditorGUILayout.GetControlRect(false, EditorGUIUtility.singleLineHeight);
- EditorGUIUtility.labelWidth = 0;
- rect.x += EditorGUIUtility.labelWidth;
- rect.width = (rect.width - EditorGUIUtility.labelWidth -3f) / 2f;
- EditorGUIUtility.labelWidth = Mathf.Min(rect.width * 0.55f, 80f);
-
- EditorGUI.PropertyField(rect, m_LineSpacingProp, k_LineSpacingLabel);
- rect.x += rect.width + 3f;
- EditorGUI.PropertyField(rect, m_ParagraphSpacingProp, k_ParagraphSpacingLabel);
-
- EditorGUIUtility.labelWidth = 0;
- EditorGUI.indentLevel = oldIndent;
-
- if (EditorGUI.EndChangeCheck())
- {
- m_HavePropertiesChanged = true;
- }
-
- EditorGUILayout.Space();
- }
-
- void DrawAlignment()
- {
- // TEXT ALIGNMENT
- EditorGUI.BeginChangeCheck();
-
- Rect rect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.currentViewWidth > 504 ? 20 : 40 + 3);
-
- EditorGUI.PrefixLabel(rect, k_AlignmentLabel);
- rect.x += EditorGUIUtility.labelWidth;
-
- EditorGUI.PropertyField(rect, m_HorizontalAlignmentProp, GUIContent.none);
- EditorGUI.PropertyField(rect, m_VerticalAlignmentProp, GUIContent.none);
-
- // WRAPPING RATIOS shown if Justified mode is selected.
- if (((HorizontalAlignmentOptions)m_HorizontalAlignmentProp.intValue & HorizontalAlignmentOptions.Justified) == HorizontalAlignmentOptions.Justified || ((HorizontalAlignmentOptions)m_HorizontalAlignmentProp.intValue & HorizontalAlignmentOptions.Flush) == HorizontalAlignmentOptions.Flush)
- DrawPropertySlider(k_WrapMixLabel, m_WordWrappingRatiosProp);
-
- if (EditorGUI.EndChangeCheck())
- m_HavePropertiesChanged = true;
-
- EditorGUILayout.Space();
- }
-
- void DrawWrappingOverflow()
- {
- // TEXT WRAPPING
- EditorGUI.BeginChangeCheck();
- int wrapSelection = EditorGUILayout.Popup(k_WrappingLabel, m_EnableWordWrappingProp.boolValue ? 1 : 0, k_WrappingOptions);
- if (EditorGUI.EndChangeCheck())
- {
- m_EnableWordWrappingProp.boolValue = wrapSelection == 1;
- m_HavePropertiesChanged = true;
- m_TextComponent.m_isInputParsingRequired = true;
- }
-
- // TEXT OVERFLOW
- EditorGUI.BeginChangeCheck();
-
- if ((TextOverflowModes)m_TextOverflowModeProp.enumValueIndex == TextOverflowModes.Linked)
- {
- EditorGUILayout.BeginHorizontal();
-
- float fieldWidth = EditorGUIUtility.fieldWidth;
- EditorGUIUtility.fieldWidth = 65;
- EditorGUILayout.PropertyField(m_TextOverflowModeProp, k_OverflowLabel);
- EditorGUIUtility.fieldWidth = fieldWidth;
-
- EditorGUILayout.PropertyField(m_LinkedTextComponentProp, GUIContent.none);
-
- EditorGUILayout.EndHorizontal();
-
- if (GUI.changed)
- {
- TMP_Text linkedComponent = m_LinkedTextComponentProp.objectReferenceValue as TMP_Text;
-
- if (linkedComponent == null)
- {
- m_LinkedTextComponentProp.objectReferenceValue = null;
-
- if (m_PreviousLinkedTextComponent != null)
- m_TextComponent.ReleaseLinkedTextComponent(m_PreviousLinkedTextComponent);
- }
- else if (m_TextComponent.IsSelfOrLinkedAncestor(linkedComponent))
- {
- m_LinkedTextComponentProp.objectReferenceValue = m_PreviousLinkedTextComponent;
- }
- else
- {
- if (m_PreviousLinkedTextComponent != null)
- m_TextComponent.ReleaseLinkedTextComponent(m_PreviousLinkedTextComponent);
-
- m_LinkedTextComponentProp.objectReferenceValue = linkedComponent;
- linkedComponent.parentLinkedComponent = m_TextComponent;
- m_PreviousLinkedTextComponent = linkedComponent;
- }
- }
- }
- else if ((TextOverflowModes)m_TextOverflowModeProp.enumValueIndex == TextOverflowModes.Page)
- {
- EditorGUILayout.BeginHorizontal();
- EditorGUILayout.PropertyField(m_TextOverflowModeProp, k_OverflowLabel);
- EditorGUILayout.PropertyField(m_PageToDisplayProp, GUIContent.none);
- EditorGUILayout.EndHorizontal();
-
- if (m_PreviousLinkedTextComponent)
- {
- m_TextComponent.ReleaseLinkedTextComponent(m_PreviousLinkedTextComponent);
-
- m_TextComponent.linkedTextComponent = null;
- }
- }
- else
- {
- EditorGUILayout.PropertyField(m_TextOverflowModeProp, k_OverflowLabel);
-
- if (m_PreviousLinkedTextComponent)
- {
- m_TextComponent.ReleaseLinkedTextComponent(m_PreviousLinkedTextComponent);
-
- m_TextComponent.linkedTextComponent = null;
- }
- }
-
- if (EditorGUI.EndChangeCheck())
- {
- m_HavePropertiesChanged = true;
- m_TextComponent.m_isInputParsingRequired = true;
- }
-
- EditorGUILayout.Space();
- }
-
- protected abstract void DrawExtraSettings();
-
- protected void DrawMargins()
- {
- EditorGUI.BeginChangeCheck();
- DrawMarginProperty(m_MarginProp, k_MarginsLabel);
- if (EditorGUI.EndChangeCheck())
- {
- m_HavePropertiesChanged = true;
- }
-
- EditorGUILayout.Space();
- }
-
- protected void DrawGeometrySorting()
- {
- EditorGUI.BeginChangeCheck();
-
- EditorGUILayout.PropertyField(m_GeometrySortingOrderProp, k_GeometrySortingLabel);
-
- if (EditorGUI.EndChangeCheck())
- m_HavePropertiesChanged = true;
-
- EditorGUILayout.Space();
- }
-
- protected void DrawIsTextObjectScaleStatic()
- {
- EditorGUI.BeginChangeCheck();
-
- EditorGUILayout.PropertyField(m_IsTextObjectScaleStaticProp, k_IsTextObjectScaleStatic);
-
- if (EditorGUI.EndChangeCheck())
- {
- m_TextComponent.isTextObjectScaleStatic = m_IsTextObjectScaleStaticProp.boolValue;
- m_HavePropertiesChanged = true;
- }
-
- EditorGUILayout.Space();
- }
-
-
- protected void DrawRichText()
- {
- EditorGUI.BeginChangeCheck();
-
- EditorGUILayout.PropertyField(m_IsRichTextProp, k_RichTextLabel);
- if (EditorGUI.EndChangeCheck())
- m_HavePropertiesChanged = true;
- }
-
- protected void DrawParsing()
- {
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(m_EnableEscapeCharacterParsingProp, k_EscapeCharactersLabel);
- EditorGUILayout.PropertyField(m_UseMaxVisibleDescenderProp, k_VisibleDescenderLabel);
-
- if (EditorGUI.EndChangeCheck())
- m_HavePropertiesChanged = true;
-
- EditorGUILayout.Space();
- }
-
- protected void DrawSpriteAsset()
- {
- EditorGUI.BeginChangeCheck();
-
- EditorGUILayout.PropertyField(m_SpriteAssetProp, k_SpriteAssetLabel, true);
-
- if (EditorGUI.EndChangeCheck())
- m_HavePropertiesChanged = true;
-
- EditorGUILayout.Space();
- }
-
- protected void DrawStyleSheet()
- {
- EditorGUI.BeginChangeCheck();
-
- EditorGUILayout.PropertyField(m_StyleSheetAssetProp, k_StyleSheetAssetLabel, true);
-
- if (EditorGUI.EndChangeCheck())
- {
- m_StyleNames = GetStyleNames();
- m_HavePropertiesChanged = true;
- }
-
- EditorGUILayout.Space();
- }
-
- protected void DrawTextureMapping()
- {
- // TEXTURE MAPPING OPTIONS
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(m_HorizontalMappingProp, k_HorizontalMappingLabel);
- EditorGUILayout.PropertyField(m_VerticalMappingProp, k_VerticalMappingLabel);
- if (EditorGUI.EndChangeCheck())
- {
- m_HavePropertiesChanged = true;
- }
-
- // UV OPTIONS
- if (m_HorizontalMappingProp.enumValueIndex > 0)
- {
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(m_UvLineOffsetProp, k_LineOffsetLabel, GUILayout.MinWidth(70f));
- if (EditorGUI.EndChangeCheck())
- {
- m_HavePropertiesChanged = true;
- }
- }
-
- EditorGUILayout.Space();
- }
-
- protected void DrawKerning()
- {
- // KERNING
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(m_EnableKerningProp, k_KerningLabel);
- if (EditorGUI.EndChangeCheck())
- {
- m_HavePropertiesChanged = true;
- }
- }
-
- protected void DrawPadding()
- {
- // EXTRA PADDING
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(m_EnableExtraPaddingProp, k_PaddingLabel);
- if (EditorGUI.EndChangeCheck())
- {
- m_HavePropertiesChanged = true;
- m_CheckPaddingRequiredProp.boolValue = true;
- }
- }
-
- ///
- /// Method to retrieve the material presets that match the currently selected font asset.
- ///
- protected GUIContent[] GetMaterialPresets()
- {
- TMP_FontAsset fontAsset = m_FontAssetProp.objectReferenceValue as TMP_FontAsset;
- if (fontAsset == null) return null;
-
- m_MaterialPresets = TMP_EditorUtility.FindMaterialReferences(fontAsset);
- m_MaterialPresetNames = new GUIContent[m_MaterialPresets.Length];
-
- m_MaterialPresetIndexLookup.Clear();
-
- for (int i = 0; i < m_MaterialPresetNames.Length; i++)
- {
- m_MaterialPresetNames[i] = new GUIContent(m_MaterialPresets[i].name);
-
- m_MaterialPresetIndexLookup.Add(m_MaterialPresets[i].GetInstanceID(), i);
-
- //if (m_TargetMaterial.GetInstanceID() == m_MaterialPresets[i].GetInstanceID())
- // m_MaterialPresetSelectionIndex = i;
- }
-
- m_IsPresetListDirty = false;
-
- return m_MaterialPresetNames;
- }
-
- protected GUIContent[] GetStyleNames()
- {
- k_AvailableStyles.Clear();
- m_TextStyleIndexLookup.Clear();
- m_Styles.Clear();
-
- // First style on the list is always the Normal default style.
- TMP_Style styleNormal = TMP_Style.NormalStyle;
-
- m_Styles.Add(styleNormal);
- m_TextStyleIndexLookup.Add(styleNormal.hashCode, 0);
-
- k_AvailableStyles.Add(styleNormal.hashCode, styleNormal);
-
- // Get styles from Style Sheet potentially assigned to the text object.
- TMP_StyleSheet localStyleSheet = (TMP_StyleSheet)m_StyleSheetAssetProp.objectReferenceValue;
-
- if (localStyleSheet != null)
- {
- int styleCount = localStyleSheet.styles.Count;
-
- for (int i = 0; i < styleCount; i++)
- {
- TMP_Style style = localStyleSheet.styles[i];
-
- if (k_AvailableStyles.ContainsKey(style.hashCode) == false)
- {
- k_AvailableStyles.Add(style.hashCode, style);
- m_Styles.Add(style);
- m_TextStyleIndexLookup.Add(style.hashCode, m_TextStyleIndexLookup.Count);
- }
- }
- }
-
- // Get styles from TMP Settings' default style sheet.
- TMP_StyleSheet globalStyleSheet = TMP_Settings.defaultStyleSheet;
-
- if (globalStyleSheet != null)
- {
- int styleCount = globalStyleSheet.styles.Count;
-
- for (int i = 0; i < styleCount; i++)
- {
- TMP_Style style = globalStyleSheet.styles[i];
-
- if (k_AvailableStyles.ContainsKey(style.hashCode) == false)
- {
- k_AvailableStyles.Add(style.hashCode, style);
- m_Styles.Add(style);
- m_TextStyleIndexLookup.Add(style.hashCode, m_TextStyleIndexLookup.Count);
- }
- }
- }
-
- // Create array that will contain the list of available styles.
- GUIContent[] styleNames = k_AvailableStyles.Values.Select(item => new GUIContent(item.name)).ToArray();
-
- // Set text style index
- m_TextStyleIndexLookup.TryGetValue(m_TextStyleHashCodeProp.intValue, out m_StyleSelectionIndex);
-
- return styleNames;
- }
-
- // DRAW MARGIN PROPERTY
- protected void DrawMarginProperty(SerializedProperty property, GUIContent label)
- {
- Rect rect = EditorGUILayout.GetControlRect(false, 2 * 18);
-
- EditorGUI.BeginProperty(rect, label, property);
-
- Rect pos0 = new Rect(rect.x, rect.y + 2, rect.width - 15, 18);
-
- float width = rect.width + 3;
- pos0.width = EditorGUIUtility.labelWidth;
- EditorGUI.PrefixLabel(pos0, label);
-
- Vector4 margins = property.vector4Value;
-
- float widthB = width - EditorGUIUtility.labelWidth;
- float fieldWidth = widthB / 4;
- pos0.width = Mathf.Max(fieldWidth - 5, 45f);
-
- // Labels
- pos0.x = EditorGUIUtility.labelWidth + 15;
- margins.x = DrawMarginField(pos0, "Left", margins.x);
-
- pos0.x += fieldWidth;
- margins.y = DrawMarginField(pos0, "Top", margins.y);
-
- pos0.x += fieldWidth;
- margins.z = DrawMarginField(pos0, "Right", margins.z);
-
- pos0.x += fieldWidth;
- margins.w = DrawMarginField(pos0, "Bottom", margins.w);
-
- property.vector4Value = margins;
-
- EditorGUI.EndProperty();
- }
-
- float DrawMarginField(Rect position, string label, float value)
- {
- int controlId = GUIUtility.GetControlID(FocusType.Keyboard, position);
- EditorGUI.PrefixLabel(position, controlId, new GUIContent(label));
-
- Rect dragZone = new Rect(position.x, position.y, position.width, position.height);
- position.y += EditorGUIUtility.singleLineHeight;
-
- return EditorGUI.DoFloatField(EditorGUI.s_RecycledEditor, position, dragZone, controlId, value, EditorGUI.kFloatFieldFormatString, EditorStyles.numberField, true);
- }
-
- protected void DrawPropertySlider(GUIContent label, SerializedProperty property)
- {
- Rect rect = EditorGUILayout.GetControlRect(false, 17);
-
- GUIContent content = label ?? GUIContent.none;
- EditorGUI.Slider(new Rect(rect.x, rect.y, rect.width, rect.height), property, 0.0f, 1.0f, content);
- }
-
- protected abstract bool IsMixSelectionTypes();
-
- // Special Handling of Undo / Redo Events.
- protected abstract void OnUndoRedo();
-
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_BaseEditorPanel.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_BaseEditorPanel.cs.meta
deleted file mode 100644
index 87bd7391..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_BaseEditorPanel.cs.meta
+++ /dev/null
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 91950f78729ab144aa36e94690b28fad
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_BaseShaderGUI.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_BaseShaderGUI.cs
deleted file mode 100644
index 5fd33ce5..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_BaseShaderGUI.cs
+++ /dev/null
@@ -1,551 +0,0 @@
-using UnityEngine;
-using UnityEditor;
-
-namespace TMPro.EditorUtilities
-{
- /// Base class for TextMesh Pro shader GUIs.
- public abstract class TMP_BaseShaderGUI : ShaderGUI
- {
- /// Representation of a #pragma shader_feature.
- /// It is assumed that the first feature option is for no keyword (underscores).
- protected class ShaderFeature
- {
- public string undoLabel;
-
- public GUIContent label;
-
- /// The keyword labels, for display. Include the no-keyword as the first option.
- public GUIContent[] keywordLabels;
-
- /// The shader keywords. Exclude the no-keyword option.
- public string[] keywords;
-
- int m_State;
-
- public bool Active
- {
- get { return m_State >= 0; }
- }
-
- public int State
- {
- get { return m_State; }
- }
-
- public void ReadState(Material material)
- {
- for (int i = 0; i < keywords.Length; i++)
- {
- if (material.IsKeywordEnabled(keywords[i]))
- {
- m_State = i;
- return;
- }
- }
-
- m_State = -1;
- }
-
- public void SetActive(bool active, Material material)
- {
- m_State = active ? 0 : -1;
- SetStateKeywords(material);
- }
-
- public void DoPopup(MaterialEditor editor, Material material)
- {
- EditorGUI.BeginChangeCheck();
- int selection = EditorGUILayout.Popup(label, m_State + 1, keywordLabels);
- if (EditorGUI.EndChangeCheck())
- {
- m_State = selection - 1;
- editor.RegisterPropertyChangeUndo(undoLabel);
- SetStateKeywords(material);
- }
- }
-
- void SetStateKeywords(Material material)
- {
- for (int i = 0; i < keywords.Length; i++)
- {
- if (i == m_State)
- {
- material.EnableKeyword(keywords[i]);
- }
- else
- {
- material.DisableKeyword(keywords[i]);
- }
- }
- }
- }
-
- static GUIContent s_TempLabel = new GUIContent();
-
- protected static bool s_DebugExtended;
-
- static int s_UndoRedoCount, s_LastSeenUndoRedoCount;
-
- static float[][] s_TempFloats =
- {
- null, new float[1], new float[2], new float[3], new float[4]
- };
-
- protected static GUIContent[] s_XywhVectorLabels =
- {
- new GUIContent("X"),
- new GUIContent("Y"),
- new GUIContent("W", "Width"),
- new GUIContent("H", "Height")
- };
-
- protected static GUIContent[] s_LbrtVectorLabels =
- {
- new GUIContent("L", "Left"),
- new GUIContent("B", "Bottom"),
- new GUIContent("R", "Right"),
- new GUIContent("T", "Top")
- };
-
- protected static GUIContent[] s_CullingTypeLabels =
- {
- new GUIContent("Off"),
- new GUIContent("Front"),
- new GUIContent("Back")
- };
-
- static TMP_BaseShaderGUI()
- {
- // Keep track of how many undo/redo events happened.
- Undo.undoRedoPerformed += () => s_UndoRedoCount += 1;
- }
-
- bool m_IsNewGUI = true;
-
- float m_DragAndDropMinY;
-
- protected MaterialEditor m_Editor;
-
- protected Material m_Material;
-
- protected MaterialProperty[] m_Properties;
-
- void PrepareGUI()
- {
- m_IsNewGUI = false;
- ShaderUtilities.GetShaderPropertyIDs();
-
- // New GUI just got constructed. This happens in response to a selection,
- // but also after undo/redo events.
- if (s_LastSeenUndoRedoCount != s_UndoRedoCount)
- {
- // There's been at least one undo/redo since the last time this GUI got constructed.
- // Maybe the undo/redo was for this material? Assume that is was.
- TMPro_EventManager.ON_MATERIAL_PROPERTY_CHANGED(true, m_Material as Material);
- }
-
- s_LastSeenUndoRedoCount = s_UndoRedoCount;
- }
-
- public override void OnGUI(MaterialEditor materialEditor, MaterialProperty[] properties)
- {
- m_Editor = materialEditor;
- m_Material = materialEditor.target as Material;
- this.m_Properties = properties;
-
- if (m_IsNewGUI)
- {
- PrepareGUI();
- }
-
- DoDragAndDropBegin();
- EditorGUI.BeginChangeCheck();
- DoGUI();
- if (EditorGUI.EndChangeCheck())
- {
- TMPro_EventManager.ON_MATERIAL_PROPERTY_CHANGED(true, m_Material);
- }
-
- DoDragAndDropEnd();
- }
-
- /// Override this method to create the specific shader GUI.
- protected abstract void DoGUI();
-
- static string[] s_PanelStateLabel = new string[] { "\t- Click to collapse -", "\t- Click to expand -" };
-
- protected bool BeginPanel(string panel, bool expanded)
- {
- EditorGUI.indentLevel = 0;
-
- EditorGUILayout.BeginVertical(EditorStyles.helpBox);
- Rect r = EditorGUI.IndentedRect(GUILayoutUtility.GetRect(20, 18));
- r.x += 20;
- r.width += 6;
-
- bool enabled = GUI.enabled;
- GUI.enabled = true;
- expanded = TMP_EditorUtility.EditorToggle(r, expanded, new GUIContent(panel), TMP_UIStyleManager.panelTitle);
- r.width -= 30;
- EditorGUI.LabelField(r, new GUIContent(expanded ? s_PanelStateLabel[0] : s_PanelStateLabel[1]), TMP_UIStyleManager.rightLabel);
- GUI.enabled = enabled;
-
- EditorGUI.indentLevel += 1;
- EditorGUI.BeginDisabledGroup(false);
-
- return expanded;
- }
-
- protected bool BeginPanel(string panel, ShaderFeature feature, bool expanded, bool readState = true)
- {
- EditorGUI.indentLevel = 0;
-
- if (readState)
- {
- feature.ReadState(m_Material);
- }
-
- EditorGUI.BeginChangeCheck();
-
- EditorGUILayout.BeginVertical(EditorStyles.helpBox);
- GUILayout.BeginHorizontal();
-
- Rect r = EditorGUI.IndentedRect(GUILayoutUtility.GetRect(20, 20, GUILayout.Width(20f)));
- bool active = EditorGUI.Toggle(r, feature.Active);
-
- if (EditorGUI.EndChangeCheck())
- {
- m_Editor.RegisterPropertyChangeUndo(feature.undoLabel);
- feature.SetActive(active, m_Material);
- }
-
- r = EditorGUI.IndentedRect(GUILayoutUtility.GetRect(20, 18));
- r.width += 6;
-
- bool enabled = GUI.enabled;
- GUI.enabled = true;
- expanded = TMP_EditorUtility.EditorToggle(r, expanded, new GUIContent(panel), TMP_UIStyleManager.panelTitle);
- r.width -= 10;
- EditorGUI.LabelField(r, new GUIContent(expanded ? s_PanelStateLabel[0] : s_PanelStateLabel[1]), TMP_UIStyleManager.rightLabel);
- GUI.enabled = enabled;
-
- GUILayout.EndHorizontal();
-
- EditorGUI.indentLevel += 1;
- EditorGUI.BeginDisabledGroup(!active);
-
- return expanded;
- }
-
- public void EndPanel()
- {
- EditorGUI.EndDisabledGroup();
- EditorGUI.indentLevel -= 1;
- EditorGUILayout.EndVertical();
- }
-
- MaterialProperty BeginProperty(string name)
- {
- MaterialProperty property = FindProperty(name, m_Properties);
- EditorGUI.BeginChangeCheck();
- EditorGUI.showMixedValue = property.hasMixedValue;
- m_Editor.BeginAnimatedCheck(Rect.zero, property);
-
- return property;
- }
-
- bool EndProperty()
- {
- m_Editor.EndAnimatedCheck();
- EditorGUI.showMixedValue = false;
- return EditorGUI.EndChangeCheck();
- }
-
- protected void DoPopup(string name, string label, GUIContent[] options)
- {
- MaterialProperty property = BeginProperty(name);
- s_TempLabel.text = label;
- int index = EditorGUILayout.Popup(s_TempLabel, (int)property.floatValue, options);
- if (EndProperty())
- {
- property.floatValue = index;
- }
- }
-
- protected void DoCubeMap(string name, string label)
- {
- DoTexture(name, label, typeof(Cubemap));
- }
-
- protected void DoTexture2D(string name, string label, bool withTilingOffset = false, string[] speedNames = null)
- {
- DoTexture(name, label, typeof(Texture2D), withTilingOffset, speedNames);
- }
-
- void DoTexture(string name, string label, System.Type type, bool withTilingOffset = false, string[] speedNames = null)
- {
- MaterialProperty property = FindProperty(name, m_Properties);
- m_Editor.BeginAnimatedCheck(Rect.zero, property);
-
- Rect rect = EditorGUILayout.GetControlRect(true, 60f);
- float totalWidth = rect.width;
- rect.width = EditorGUIUtility.labelWidth + 60f;
- s_TempLabel.text = label;
-
- EditorGUI.BeginChangeCheck();
- Object tex = EditorGUI.ObjectField(rect, s_TempLabel, property.textureValue, type, false);
- if (EditorGUI.EndChangeCheck())
- {
- property.textureValue = tex as Texture;
- }
-
- rect.x += rect.width + 4f;
- rect.width = totalWidth - rect.width - 4f;
- rect.height = EditorGUIUtility.singleLineHeight;
-
- if (withTilingOffset)
- {
- DoTilingOffset(rect, property);
- rect.y += (rect.height + 2f) * 2f;
- }
-
- m_Editor.EndAnimatedCheck();
-
- if (speedNames != null)
- {
- DoUVSpeed(rect, speedNames);
- }
- }
-
- void DoTilingOffset(Rect rect, MaterialProperty property)
- {
- float labelWidth = EditorGUIUtility.labelWidth;
- int indentLevel = EditorGUI.indentLevel;
- EditorGUI.indentLevel = 0;
- EditorGUIUtility.labelWidth = Mathf.Min(40f, rect.width * 0.20f);
-
- Vector4 vector = property.textureScaleAndOffset;
-
- bool changed = false;
- float[] values = s_TempFloats[2];
-
- s_TempLabel.text = "Tiling";
- Rect vectorRect = EditorGUI.PrefixLabel(rect, s_TempLabel);
- values[0] = vector.x;
- values[1] = vector.y;
-
- EditorGUI.BeginChangeCheck();
- EditorGUI.MultiFloatField(vectorRect, s_XywhVectorLabels, values);
- if (EditorGUI.EndChangeCheck())
- {
- vector.x = values[0];
- vector.y = values[1];
- changed = true;
- }
-
- rect.y += rect.height + 2f;
- s_TempLabel.text = "Offset";
- vectorRect = EditorGUI.PrefixLabel(rect, s_TempLabel);
- values[0] = vector.z;
- values[1] = vector.w;
-
- EditorGUI.BeginChangeCheck();
- EditorGUI.MultiFloatField(vectorRect, s_XywhVectorLabels, values);
- if (EditorGUI.EndChangeCheck())
- {
- vector.z = values[0];
- vector.w = values[1];
- changed = true;
- }
-
- if (changed)
- {
- property.textureScaleAndOffset = vector;
- }
-
- EditorGUIUtility.labelWidth = labelWidth;
- EditorGUI.indentLevel = indentLevel;
- }
-
- protected void DoUVSpeed(Rect rect, string[] names)
- {
- float labelWidth = EditorGUIUtility.labelWidth;
- int indentLevel = EditorGUI.indentLevel;
- EditorGUI.indentLevel = 0;
- EditorGUIUtility.labelWidth = Mathf.Min(40f, rect.width * 0.20f);
-
- s_TempLabel.text = "Speed";
- rect = EditorGUI.PrefixLabel(rect, s_TempLabel);
-
- EditorGUIUtility.labelWidth = 13f;
- rect.width = rect.width * 0.5f - 1f;
- DoFloat(rect, names[0], "X");
- rect.x += rect.width + 2f;
- DoFloat(rect, names[1], "Y");
- EditorGUIUtility.labelWidth = labelWidth;
- EditorGUI.indentLevel = indentLevel;
- }
-
- protected void DoToggle(string name, string label)
- {
- MaterialProperty property = BeginProperty(name);
- s_TempLabel.text = label;
- bool value = EditorGUILayout.Toggle(s_TempLabel, property.floatValue == 1f);
- if (EndProperty())
- {
- property.floatValue = value ? 1f : 0f;
- }
- }
-
- protected void DoFloat(string name, string label)
- {
- MaterialProperty property = BeginProperty(name);
- Rect rect = EditorGUILayout.GetControlRect();
- rect.width = EditorGUIUtility.labelWidth + 55f;
- s_TempLabel.text = label;
- float value = EditorGUI.FloatField(rect, s_TempLabel, property.floatValue);
- if (EndProperty())
- {
- property.floatValue = value;
- }
- }
-
- protected void DoColor(string name, string label)
- {
- MaterialProperty property = BeginProperty(name);
- s_TempLabel.text = label;
- Color value = EditorGUI.ColorField(EditorGUILayout.GetControlRect(), s_TempLabel, property.colorValue, false, true, true);
- if (EndProperty())
- {
- property.colorValue = value;
- }
- }
-
- void DoFloat(Rect rect, string name, string label)
- {
- MaterialProperty property = BeginProperty(name);
- s_TempLabel.text = label;
- float value = EditorGUI.FloatField(rect, s_TempLabel, property.floatValue);
- if (EndProperty())
- {
- property.floatValue = value;
- }
- }
-
- protected void DoSlider(string name, string label)
- {
- MaterialProperty property = BeginProperty(name);
- Vector2 range = property.rangeLimits;
- s_TempLabel.text = label;
- float value = EditorGUI.Slider(
- EditorGUILayout.GetControlRect(), s_TempLabel, property.floatValue, range.x, range.y
- );
- if (EndProperty())
- {
- property.floatValue = value;
- }
- }
-
- protected void DoVector3(string name, string label)
- {
- MaterialProperty property = BeginProperty(name);
- s_TempLabel.text = label;
- Vector4 value = EditorGUILayout.Vector3Field(s_TempLabel, property.vectorValue);
- if (EndProperty())
- {
- property.vectorValue = value;
- }
- }
-
- protected void DoVector(string name, string label, GUIContent[] subLabels)
- {
- MaterialProperty property = BeginProperty(name);
- Rect rect = EditorGUILayout.GetControlRect();
- s_TempLabel.text = label;
- rect = EditorGUI.PrefixLabel(rect, s_TempLabel);
- Vector4 vector = property.vectorValue;
-
- float[] values = s_TempFloats[subLabels.Length];
- for (int i = 0; i < subLabels.Length; i++)
- {
- values[i] = vector[i];
- }
-
- EditorGUI.MultiFloatField(rect, subLabels, values);
- if (EndProperty())
- {
- for (int i = 0; i < subLabels.Length; i++)
- {
- vector[i] = values[i];
- }
-
- property.vectorValue = vector;
- }
- }
-
- void DoDragAndDropBegin()
- {
- m_DragAndDropMinY = GUILayoutUtility.GetRect(0f, 0f, GUILayout.ExpandWidth(true)).y;
- }
-
- void DoDragAndDropEnd()
- {
- Rect rect = GUILayoutUtility.GetRect(0f, 0f, GUILayout.ExpandWidth(true));
- Event evt = Event.current;
- if (evt.type == EventType.DragUpdated)
- {
- DragAndDrop.visualMode = DragAndDropVisualMode.Generic;
- evt.Use();
- }
- else if (
- evt.type == EventType.DragPerform &&
- Rect.MinMaxRect(rect.xMin, m_DragAndDropMinY, rect.xMax, rect.yMax).Contains(evt.mousePosition)
- )
- {
- DragAndDrop.AcceptDrag();
- evt.Use();
- Material droppedMaterial = DragAndDrop.objectReferences[0] as Material;
- if (droppedMaterial && droppedMaterial != m_Material)
- {
- PerformDrop(droppedMaterial);
- }
- }
- }
-
- void PerformDrop(Material droppedMaterial)
- {
- Texture droppedTex = droppedMaterial.GetTexture(ShaderUtilities.ID_MainTex);
- if (!droppedTex)
- {
- return;
- }
-
- Texture currentTex = m_Material.GetTexture(ShaderUtilities.ID_MainTex);
- TMP_FontAsset requiredFontAsset = null;
- if (droppedTex != currentTex)
- {
- requiredFontAsset = TMP_EditorUtility.FindMatchingFontAsset(droppedMaterial);
- if (!requiredFontAsset)
- {
- return;
- }
- }
-
- foreach (GameObject o in Selection.gameObjects)
- {
- if (requiredFontAsset)
- {
- TMP_Text textComponent = o.GetComponent();
- if (textComponent)
- {
- Undo.RecordObject(textComponent, "Font Asset Change");
- textComponent.font = requiredFontAsset;
- }
- }
-
- TMPro_EventManager.ON_DRAG_AND_DROP_MATERIAL_CHANGED(o, m_Material, droppedMaterial);
- EditorUtility.SetDirty(o);
- }
- }
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_BaseShaderGUI.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_BaseShaderGUI.cs.meta
deleted file mode 100644
index f07bd856..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_BaseShaderGUI.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 438efd46088d408d8a53f707fa68d976
-timeCreated: 1469844810
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_BitmapShaderGUI.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_BitmapShaderGUI.cs
deleted file mode 100644
index be399599..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_BitmapShaderGUI.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using UnityEngine;
-using UnityEditor;
-
-namespace TMPro.EditorUtilities
-{
- public class TMP_BitmapShaderGUI : TMP_BaseShaderGUI
- {
- static bool s_Face = true;
-
- protected override void DoGUI()
- {
- s_Face = BeginPanel("Face", s_Face);
- if (s_Face)
- {
- DoFacePanel();
- }
-
- EndPanel();
-
- s_DebugExtended = BeginPanel("Debug Settings", s_DebugExtended);
- if (s_DebugExtended)
- {
- DoDebugPanel();
- }
-
- EndPanel();
- }
-
- void DoFacePanel()
- {
- EditorGUI.indentLevel += 1;
- if (m_Material.HasProperty(ShaderUtilities.ID_FaceTex))
- {
- DoColor("_FaceColor", "Color");
- DoTexture2D("_FaceTex", "Texture", true);
- }
- else
- {
- DoColor("_Color", "Color");
- DoSlider("_DiffusePower", "Diffuse Power");
- }
-
- EditorGUI.indentLevel -= 1;
-
- EditorGUILayout.Space();
- }
-
- void DoDebugPanel()
- {
- EditorGUI.indentLevel += 1;
- DoTexture2D("_MainTex", "Font Atlas");
- if (m_Material.HasProperty(ShaderUtilities.ID_VertexOffsetX))
- {
- if (m_Material.HasProperty(ShaderUtilities.ID_Padding))
- {
- EditorGUILayout.Space();
- DoFloat("_Padding", "Padding");
- }
-
- EditorGUILayout.Space();
- DoFloat("_VertexOffsetX", "Offset X");
- DoFloat("_VertexOffsetY", "Offset Y");
- }
-
- if (m_Material.HasProperty(ShaderUtilities.ID_MaskSoftnessX))
- {
- EditorGUILayout.Space();
- DoFloat("_MaskSoftnessX", "Softness X");
- DoFloat("_MaskSoftnessY", "Softness Y");
- DoVector("_ClipRect", "Clip Rect", s_LbrtVectorLabels);
- }
-
- if (m_Material.HasProperty(ShaderUtilities.ID_StencilID))
- {
- EditorGUILayout.Space();
- DoFloat("_Stencil", "Stencil ID");
- DoFloat("_StencilComp", "Stencil Comp");
- }
-
- if (m_Material.HasProperty(ShaderUtilities.ShaderTag_CullMode))
- {
- EditorGUILayout.Space();
- DoPopup("_CullMode", "Cull Mode", s_CullingTypeLabels);
- }
-
- EditorGUILayout.Space();
-
- EditorGUI.indentLevel -= 1;
-
- EditorGUILayout.Space();
- }
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_BitmapShaderGUI.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_BitmapShaderGUI.cs.meta
deleted file mode 100644
index 6d0e0529..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_BitmapShaderGUI.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 806de5a9211448c8b65c8435ebb48dd4
-timeCreated: 1469998850
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_CharacterPropertyDrawer.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_CharacterPropertyDrawer.cs
deleted file mode 100644
index 98f32c7a..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_CharacterPropertyDrawer.cs
+++ /dev/null
@@ -1,235 +0,0 @@
-using UnityEngine;
-using UnityEngine.TextCore;
-using UnityEngine.TextCore.LowLevel;
-using UnityEditor;
-using System.Collections;
-
-
-namespace TMPro.EditorUtilities
-{
- [CustomPropertyDrawer(typeof(TMP_Character))]
- public class TMP_CharacterPropertyDrawer : PropertyDrawer
- {
- private string k_ColorProperty = "_Color";
-
- int m_GlyphSelectedForEditing = -1;
-
- public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
- {
- SerializedProperty prop_Unicode = property.FindPropertyRelative("m_Unicode");
- SerializedProperty prop_GlyphIndex = property.FindPropertyRelative("m_GlyphIndex");
- SerializedProperty prop_Scale = property.FindPropertyRelative("m_Scale");
-
-
- GUIStyle style = new GUIStyle(EditorStyles.label);
- style.richText = true;
-
- EditorGUIUtility.labelWidth = 40f;
- EditorGUIUtility.fieldWidth = 50;
-
- Rect rect = new Rect(position.x + 50, position.y, position.width, 49);
-
- // Display non-editable fields
- if (GUI.enabled == false)
- {
- int unicode = prop_Unicode.intValue;
- EditorGUI.LabelField(new Rect(rect.x, rect.y, 120f, 18), new GUIContent("Unicode: 0x" + unicode.ToString("X") + ""), style);
- EditorGUI.LabelField(new Rect(rect.x + 115, rect.y, 120f, 18), unicode <= 0xFFFF ? new GUIContent("UTF16: \\u" + unicode.ToString("X4") + "") : new GUIContent("UTF32: \\U" + unicode.ToString("X8") + ""), style);
- EditorGUI.LabelField(new Rect(rect.x, rect.y + 18, 120, 18), new GUIContent("Glyph ID: " + prop_GlyphIndex.intValue + ""), style);
- EditorGUI.LabelField(new Rect(rect.x, rect.y + 36, 80, 18), new GUIContent("Scale: " + prop_Scale.floatValue + ""), style);
-
- // Draw Glyph (if exists)
- DrawGlyph(position, property);
- }
- else // Display editable fields
- {
- EditorGUIUtility.labelWidth = 55f;
- GUI.SetNextControlName("Unicode Input");
- EditorGUI.BeginChangeCheck();
- string unicode = EditorGUI.TextField(new Rect(rect.x, rect.y, 120, 18), "Unicode:", prop_Unicode.intValue.ToString("X"));
-
- if (GUI.GetNameOfFocusedControl() == "Unicode Input")
- {
- //Filter out unwanted characters.
- char chr = Event.current.character;
- if ((chr < '0' || chr > '9') && (chr < 'a' || chr > 'f') && (chr < 'A' || chr > 'F'))
- {
- Event.current.character = '\0';
- }
- }
-
- if (EditorGUI.EndChangeCheck())
- {
- // Update Unicode value
- prop_Unicode.intValue = TMP_TextUtilities.StringHexToInt(unicode);
- }
-
- // Cache current glyph index in case it needs to be restored if the new glyph index is invalid.
- int currentGlyphIndex = prop_GlyphIndex.intValue;
-
- EditorGUIUtility.labelWidth = 59f;
- EditorGUI.BeginChangeCheck();
- EditorGUI.DelayedIntField(new Rect(rect.x, rect.y + 18, 100, 18), prop_GlyphIndex, new GUIContent("Glyph ID:"));
- if (EditorGUI.EndChangeCheck())
- {
- // Get a reference to the font asset
- TMP_FontAsset fontAsset = property.serializedObject.targetObject as TMP_FontAsset;
-
- // Make sure new glyph index is valid.
- int elementIndex = fontAsset.glyphTable.FindIndex(item => item.index == prop_GlyphIndex.intValue);
-
- if (elementIndex == -1)
- prop_GlyphIndex.intValue = currentGlyphIndex;
- else
- fontAsset.IsFontAssetLookupTablesDirty = true;
- }
-
- int glyphIndex = prop_GlyphIndex.intValue;
-
- // Reset glyph selection if new character has been selected.
- if (GUI.enabled && m_GlyphSelectedForEditing != glyphIndex)
- m_GlyphSelectedForEditing = -1;
-
- // Display button to edit the glyph data.
- if (GUI.Button(new Rect(rect.x + 120, rect.y + 18, 75, 18), new GUIContent("Edit Glyph")))
- {
- if (m_GlyphSelectedForEditing == -1)
- m_GlyphSelectedForEditing = glyphIndex;
- else
- m_GlyphSelectedForEditing = -1;
-
- // Button clicks should not result in potential change.
- GUI.changed = false;
- }
-
- // Show the glyph property drawer if selected
- if (glyphIndex == m_GlyphSelectedForEditing && GUI.enabled)
- {
- // Get a reference to the font asset
- TMP_FontAsset fontAsset = property.serializedObject.targetObject as TMP_FontAsset;
-
- if (fontAsset != null)
- {
- // Get the index of the glyph in the font asset glyph table.
- int elementIndex = fontAsset.glyphTable.FindIndex(item => item.index == glyphIndex);
-
- if (elementIndex != -1)
- {
- SerializedProperty prop_GlyphTable = property.serializedObject.FindProperty("m_GlyphTable");
- SerializedProperty prop_Glyph = prop_GlyphTable.GetArrayElementAtIndex(elementIndex);
-
- SerializedProperty prop_GlyphMetrics = prop_Glyph.FindPropertyRelative("m_Metrics");
- SerializedProperty prop_GlyphRect = prop_Glyph.FindPropertyRelative("m_GlyphRect");
-
- Rect newRect = EditorGUILayout.GetControlRect(false, 115);
- EditorGUI.DrawRect(new Rect(newRect.x + 52, newRect.y - 20, newRect.width - 52, newRect.height - 5), new Color(0.1f, 0.1f, 0.1f, 0.45f));
- EditorGUI.DrawRect(new Rect(newRect.x + 53, newRect.y - 19, newRect.width - 54, newRect.height - 7), new Color(0.3f, 0.3f, 0.3f, 0.8f));
-
- // Display GlyphRect
- newRect.x += 55;
- newRect.y -= 18;
- newRect.width += 5;
- EditorGUI.PropertyField(newRect, prop_GlyphRect);
-
- // Display GlyphMetrics
- newRect.y += 45;
- EditorGUI.PropertyField(newRect, prop_GlyphMetrics);
-
- rect.y += 120;
- }
- }
- }
-
- EditorGUIUtility.labelWidth = 39f;
- EditorGUI.PropertyField(new Rect(rect.x, rect.y + 36, 80, 18), prop_Scale, new GUIContent("Scale:"));
-
- // Draw Glyph (if exists)
- DrawGlyph(position, property);
- }
- }
-
- public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
- {
- return 58;
- }
-
- void DrawGlyph(Rect position, SerializedProperty property)
- {
- // Get a reference to the atlas texture
- TMP_FontAsset fontAsset = property.serializedObject.targetObject as TMP_FontAsset;
-
- if (fontAsset == null)
- return;
-
- // Get a reference to the Glyph Table
- SerializedProperty prop_GlyphTable = property.serializedObject.FindProperty("m_GlyphTable");
- int glyphIndex = property.FindPropertyRelative("m_GlyphIndex").intValue;
- int elementIndex = fontAsset.glyphTable.FindIndex(item => item.index == glyphIndex);
-
- // Return if we can't find the glyph
- if (elementIndex == -1)
- return;
-
- SerializedProperty prop_Glyph = prop_GlyphTable.GetArrayElementAtIndex(elementIndex);
-
- // Get reference to atlas texture.
- int atlasIndex = prop_Glyph.FindPropertyRelative("m_AtlasIndex").intValue;
- Texture2D atlasTexture = fontAsset.atlasTextures.Length > atlasIndex ? fontAsset.atlasTextures[atlasIndex] : null;
-
- if (atlasTexture == null)
- return;
-
- Material mat;
- if (((GlyphRasterModes)fontAsset.atlasRenderMode & GlyphRasterModes.RASTER_MODE_BITMAP) == GlyphRasterModes.RASTER_MODE_BITMAP)
- {
- mat = TMP_FontAssetEditor.internalBitmapMaterial;
-
- if (mat == null)
- return;
-
- mat.mainTexture = atlasTexture;
- mat.SetColor(k_ColorProperty, Color.white);
- }
- else
- {
- mat = TMP_FontAssetEditor.internalSDFMaterial;
-
- if (mat == null)
- return;
-
- mat.mainTexture = atlasTexture;
- mat.SetFloat(ShaderUtilities.ID_GradientScale, fontAsset.atlasPadding + 1);
- }
-
- // Draw glyph
- Rect glyphDrawPosition = new Rect(position.x, position.y, 48, 58);
-
- SerializedProperty glyphRectProperty = prop_Glyph.FindPropertyRelative("m_GlyphRect");
-
- int padding = fontAsset.atlasPadding;
-
- int glyphOriginX = glyphRectProperty.FindPropertyRelative("m_X").intValue - padding;
- int glyphOriginY = glyphRectProperty.FindPropertyRelative("m_Y").intValue - padding;
- int glyphWidth = glyphRectProperty.FindPropertyRelative("m_Width").intValue + padding * 2;
- int glyphHeight = glyphRectProperty.FindPropertyRelative("m_Height").intValue + padding * 2;
-
- float normalizedHeight = fontAsset.faceInfo.ascentLine - fontAsset.faceInfo.descentLine;
- float scale = glyphDrawPosition.width / normalizedHeight;
-
- // Compute the normalized texture coordinates
- Rect texCoords = new Rect((float)glyphOriginX / atlasTexture.width, (float)glyphOriginY / atlasTexture.height, (float)glyphWidth / atlasTexture.width, (float)glyphHeight / atlasTexture.height);
-
- if (Event.current.type == EventType.Repaint)
- {
- glyphDrawPosition.x += (glyphDrawPosition.width - glyphWidth * scale) / 2;
- glyphDrawPosition.y += (glyphDrawPosition.height - glyphHeight * scale) / 2;
- glyphDrawPosition.width = glyphWidth * scale;
- glyphDrawPosition.height = glyphHeight * scale;
-
- // Could switch to using the default material of the font asset which would require passing scale to the shader.
- Graphics.DrawTexture(glyphDrawPosition, atlasTexture, texCoords, 0, 0, 0, 0, new Color(1f, 1f, 1f), mat);
- }
- }
-
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_CharacterPropertyDrawer.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_CharacterPropertyDrawer.cs.meta
deleted file mode 100644
index 3bf78921..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_CharacterPropertyDrawer.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 01ada73c4792aba4c937ff5d92cce866
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ColorGradientAssetMenu.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ColorGradientAssetMenu.cs
deleted file mode 100644
index d7ca885d..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ColorGradientAssetMenu.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using UnityEditor;
-using UnityEngine;
-using System.IO;
-using System.Collections;
-
-
-
-namespace TMPro.EditorUtilities
-{
-
- public static class TMP_ColorGradientAssetMenu
- {
- [MenuItem("Assets/Create/TextMeshPro/Color Gradient", false, 115)]
- public static void CreateColorGradient(MenuCommand context)
- {
- string filePath;
-
- if (Selection.assetGUIDs.Length == 0)
- filePath = "Assets/New TMP Color Gradient.asset";
- else
- filePath = AssetDatabase.GUIDToAssetPath(Selection.assetGUIDs[0]);
-
- if (Directory.Exists(filePath))
- {
- filePath += "/New TMP Color Gradient.asset";
- }
- else
- {
- filePath = Path.GetDirectoryName(filePath) + "/New TMP Color Gradient.asset";
- }
-
- filePath = AssetDatabase.GenerateUniqueAssetPath(filePath);
-
- // Create new Color Gradient Asset.
- TMP_ColorGradient colorGradient = ScriptableObject.CreateInstance();
-
- // Create Asset
- AssetDatabase.CreateAsset(colorGradient, filePath);
-
- //EditorUtility.SetDirty(colorGradient);
-
- AssetDatabase.SaveAssets();
-
- AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(colorGradient));
-
- EditorUtility.FocusProjectWindow();
- EditorGUIUtility.PingObject(colorGradient);
- }
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ColorGradientAssetMenu.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ColorGradientAssetMenu.cs.meta
deleted file mode 100644
index a2201ee6..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ColorGradientAssetMenu.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: d9647b571c5e44729b71d756b3d55317
-timeCreated: 1468187791
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ColorGradientEditor.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ColorGradientEditor.cs
deleted file mode 100644
index ca79435f..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ColorGradientEditor.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-using UnityEngine;
-using UnityEditor;
-using System.Collections;
-
-
-namespace TMPro.EditorUtilities
-{
- [CustomEditor(typeof(TMP_ColorGradient))]
- public class TMP_ColorGradientEditor : Editor
- {
- SerializedProperty m_ColorMode;
- SerializedProperty m_TopLeftColor;
- SerializedProperty m_TopRightColor;
- SerializedProperty m_BottomLeftColor;
- SerializedProperty m_BottomRightColor;
-
- void OnEnable()
- {
- m_ColorMode = serializedObject.FindProperty("colorMode");
- m_TopLeftColor = serializedObject.FindProperty("topLeft");
- m_TopRightColor = serializedObject.FindProperty("topRight");
- m_BottomLeftColor = serializedObject.FindProperty("bottomLeft");
- m_BottomRightColor = serializedObject.FindProperty("bottomRight");
- }
-
- public override void OnInspectorGUI()
- {
- serializedObject.Update();
-
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(m_ColorMode, new GUIContent("Color Mode"));
- if (EditorGUI.EndChangeCheck())
- {
- switch ((ColorMode)m_ColorMode.enumValueIndex)
- {
- case ColorMode.Single:
- m_TopRightColor.colorValue = m_TopLeftColor.colorValue;
- m_BottomLeftColor.colorValue = m_TopLeftColor.colorValue;
- m_BottomRightColor.colorValue = m_TopLeftColor.colorValue;
- break;
- case ColorMode.HorizontalGradient:
- m_BottomLeftColor.colorValue = m_TopLeftColor.colorValue;
- m_BottomRightColor.colorValue = m_TopRightColor.colorValue;
- break;
- case ColorMode.VerticalGradient:
- m_TopRightColor.colorValue = m_TopLeftColor.colorValue;
- m_BottomRightColor.colorValue = m_BottomLeftColor.colorValue;
- break;
- }
- }
- Rect rect;
- switch ((ColorMode)m_ColorMode.enumValueIndex)
- {
- case ColorMode.Single:
- EditorGUI.BeginChangeCheck();
- rect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight * (EditorGUIUtility.wideMode ? 1 : 2));
- EditorGUI.PrefixLabel(rect, new GUIContent("Colors"));
- rect.x += EditorGUIUtility.labelWidth;
- rect.width = (rect.width - EditorGUIUtility.labelWidth) / (EditorGUIUtility.wideMode ? 1f : 2f);
- TMP_EditorUtility.DrawColorProperty(rect, m_TopLeftColor);
- if (EditorGUI.EndChangeCheck())
- {
- m_TopRightColor.colorValue = m_TopLeftColor.colorValue;
- m_BottomLeftColor.colorValue = m_TopLeftColor.colorValue;
- m_BottomRightColor.colorValue = m_TopLeftColor.colorValue;
- }
- break;
-
- case ColorMode.HorizontalGradient:
- rect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight * (EditorGUIUtility.wideMode ? 1 : 2));
- EditorGUI.PrefixLabel(rect, new GUIContent("Colors"));
- rect.x += EditorGUIUtility.labelWidth;
- rect.width = (rect.width - EditorGUIUtility.labelWidth) / 2f;
-
- EditorGUI.BeginChangeCheck();
- TMP_EditorUtility.DrawColorProperty(rect, m_TopLeftColor);
- if (EditorGUI.EndChangeCheck())
- {
- m_BottomLeftColor.colorValue = m_TopLeftColor.colorValue;
- }
-
- rect.x += rect.width;
-
- EditorGUI.BeginChangeCheck();
- TMP_EditorUtility.DrawColorProperty(rect, m_TopRightColor);
- if (EditorGUI.EndChangeCheck())
- {
- m_BottomRightColor.colorValue = m_TopRightColor.colorValue;
- }
- break;
-
- case ColorMode.VerticalGradient:
- rect = EditorGUILayout.GetControlRect(false, EditorGUIUtility.singleLineHeight * (EditorGUIUtility.wideMode ? 1 : 2));
- EditorGUI.PrefixLabel(rect, new GUIContent("Colors"));
- rect.x += EditorGUIUtility.labelWidth;
- rect.width = (rect.width - EditorGUIUtility.labelWidth) / (EditorGUIUtility.wideMode ? 1f : 2f);
- rect.height = EditorGUIUtility.singleLineHeight * (EditorGUIUtility.wideMode ? 1 : 2);
-
- EditorGUI.BeginChangeCheck();
- TMP_EditorUtility.DrawColorProperty(rect, m_TopLeftColor);
- if (EditorGUI.EndChangeCheck())
- {
- m_TopRightColor.colorValue = m_TopLeftColor.colorValue;
- }
-
- rect = EditorGUILayout.GetControlRect(false, EditorGUIUtility.singleLineHeight * (EditorGUIUtility.wideMode ? 1 : 2));
- rect.x += EditorGUIUtility.labelWidth;
- rect.width = (rect.width - EditorGUIUtility.labelWidth) / (EditorGUIUtility.wideMode ? 1f : 2f);
- rect.height = EditorGUIUtility.singleLineHeight * (EditorGUIUtility.wideMode ? 1 : 2);
-
- EditorGUI.BeginChangeCheck();
- TMP_EditorUtility.DrawColorProperty(rect, m_BottomLeftColor);
- if (EditorGUI.EndChangeCheck())
- {
- m_BottomRightColor.colorValue = m_BottomLeftColor.colorValue;
- }
- break;
-
- case ColorMode.FourCornersGradient:
- rect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight * (EditorGUIUtility.wideMode ? 1 : 2));
- EditorGUI.PrefixLabel(rect, new GUIContent("Colors"));
- rect.x += EditorGUIUtility.labelWidth;
- rect.width = (rect.width - EditorGUIUtility.labelWidth) / 2f;
- rect.height = EditorGUIUtility.singleLineHeight * (EditorGUIUtility.wideMode ? 1 : 2);
-
- TMP_EditorUtility.DrawColorProperty(rect, m_TopLeftColor);
- rect.x += rect.width;
- TMP_EditorUtility.DrawColorProperty(rect, m_TopRightColor);
-
- rect = EditorGUILayout.GetControlRect(false, EditorGUIUtility.singleLineHeight * (EditorGUIUtility.wideMode ? 1 : 2));
- rect.x += EditorGUIUtility.labelWidth;
- rect.width = (rect.width - EditorGUIUtility.labelWidth) / 2f;
- rect.height = EditorGUIUtility.singleLineHeight * (EditorGUIUtility.wideMode ? 1 : 2);
-
- TMP_EditorUtility.DrawColorProperty(rect, m_BottomLeftColor);
- rect.x += rect.width;
- TMP_EditorUtility.DrawColorProperty(rect, m_BottomRightColor);
- break;
- }
-
- if (serializedObject.ApplyModifiedProperties())
- TMPro_EventManager.ON_COLOR_GRADIENT_PROPERTY_CHANGED(target as TMP_ColorGradient);
-
- }
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ColorGradientEditor.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ColorGradientEditor.cs.meta
deleted file mode 100644
index dc58116c..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ColorGradientEditor.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: fcc60c1d6bb544d9b712b652f418ff3a
-timeCreated: 1468400050
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_DropdownEditor.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_DropdownEditor.cs
deleted file mode 100644
index 48f8e2b4..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_DropdownEditor.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using UnityEngine;
-using UnityEditor;
-using UnityEditor.UI;
-using UnityEngine.UI;
-
-namespace TMPro.EditorUtilities
-{
- [CustomEditor(typeof(TMP_Dropdown), true)]
- [CanEditMultipleObjects]
- public class DropdownEditor : SelectableEditor
- {
- SerializedProperty m_Template;
- SerializedProperty m_CaptionText;
- SerializedProperty m_CaptionImage;
- SerializedProperty m_Placeholder;
- SerializedProperty m_ItemText;
- SerializedProperty m_ItemImage;
- SerializedProperty m_OnSelectionChanged;
- SerializedProperty m_Value;
- SerializedProperty m_AlphaFadeSpeed;
- SerializedProperty m_Options;
-
- protected override void OnEnable()
- {
- base.OnEnable();
- m_Template = serializedObject.FindProperty("m_Template");
- m_CaptionText = serializedObject.FindProperty("m_CaptionText");
- m_CaptionImage = serializedObject.FindProperty("m_CaptionImage");
- m_Placeholder = serializedObject.FindProperty("m_Placeholder");
- m_ItemText = serializedObject.FindProperty("m_ItemText");
- m_ItemImage = serializedObject.FindProperty("m_ItemImage");
- m_OnSelectionChanged = serializedObject.FindProperty("m_OnValueChanged");
- m_Value = serializedObject.FindProperty("m_Value");
- m_AlphaFadeSpeed = serializedObject.FindProperty("m_AlphaFadeSpeed");
- m_Options = serializedObject.FindProperty("m_Options");
- }
-
- public override void OnInspectorGUI()
- {
- base.OnInspectorGUI();
- EditorGUILayout.Space();
-
- serializedObject.Update();
- EditorGUILayout.PropertyField(m_Template);
- EditorGUILayout.PropertyField(m_CaptionText);
- EditorGUILayout.PropertyField(m_CaptionImage);
- EditorGUILayout.PropertyField(m_Placeholder);
- EditorGUILayout.PropertyField(m_ItemText);
- EditorGUILayout.PropertyField(m_ItemImage);
- EditorGUILayout.PropertyField(m_Value);
- EditorGUILayout.PropertyField(m_AlphaFadeSpeed);
- EditorGUILayout.PropertyField(m_Options);
- EditorGUILayout.PropertyField(m_OnSelectionChanged);
- serializedObject.ApplyModifiedProperties();
- }
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_DropdownEditor.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_DropdownEditor.cs.meta
deleted file mode 100644
index 75030cfd..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_DropdownEditor.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 6dbcf248c987476181a37f01a1814975
-timeCreated: 1446377461
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorCoroutine.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorCoroutine.cs
deleted file mode 100644
index e0056039..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorCoroutine.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEditor;
-using UnityEngine;
-
-
-namespace TMPro.EditorUtilities
-{
- ///
- /// Simple implementation of coroutine working in the Unity Editor.
- ///
- public class TMP_EditorCoroutine
- {
- //private static Dictionary s_ActiveCoroutines;
-
- readonly IEnumerator coroutine;
-
- ///
- /// Constructor
- ///
- ///
- TMP_EditorCoroutine(IEnumerator routine)
- {
- this.coroutine = routine;
- }
-
-
- ///
- /// Starts a new EditorCoroutine.
- ///
- /// Coroutine
- /// new EditorCoroutine
- public static TMP_EditorCoroutine StartCoroutine(IEnumerator routine)
- {
- TMP_EditorCoroutine coroutine = new TMP_EditorCoroutine(routine);
- coroutine.Start();
-
- // Add coroutine to tracking list
- //if (s_ActiveCoroutines == null)
- // s_ActiveCoroutines = new Dictionary();
-
- // Add new instance of editor coroutine to dictionary.
- //s_ActiveCoroutines.Add(coroutine.GetHashCode(), coroutine);
-
- return coroutine;
- }
-
-
- ///
- /// Clear delegate list
- ///
- //public static void StopAllEditorCoroutines()
- //{
- // EditorApplication.update = null;
- //}
-
-
- ///
- /// Register callback for editor updates
- ///
- void Start()
- {
- EditorApplication.update += EditorUpdate;
- }
-
-
- ///
- /// Unregister callback for editor updates.
- ///
- public void Stop()
- {
- if (EditorApplication.update != null)
- EditorApplication.update -= EditorUpdate;
-
- //s_ActiveCoroutines.Remove(this.GetHashCode());
- }
-
-
- ///
- /// Delegate function called on editor updates.
- ///
- void EditorUpdate()
- {
- // Stop editor coroutine if it does not continue.
- if (coroutine.MoveNext() == false)
- Stop();
-
- // Process the different types of EditorCoroutines.
- if (coroutine.Current != null)
- {
-
- }
- }
- }
-}
\ No newline at end of file
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorCoroutine.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorCoroutine.cs.meta
deleted file mode 100644
index 16e03fa8..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorCoroutine.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 27a0335dab59ec542aadd6636a5b4ebd
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorPanel.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorPanel.cs
deleted file mode 100644
index a03494f0..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorPanel.cs
+++ /dev/null
@@ -1,191 +0,0 @@
-using UnityEngine;
-using UnityEditor;
-using UnityEditor.Presets;
-
-namespace TMPro.EditorUtilities
-{
-
- [CustomEditor(typeof(TextMeshPro), true), CanEditMultipleObjects]
- public class TMP_EditorPanel : TMP_BaseEditorPanel
- {
- static readonly GUIContent k_SortingLayerLabel = new GUIContent("Sorting Layer", "Name of the Renderer's sorting layer.");
- static readonly GUIContent k_OrderInLayerLabel = new GUIContent("Order in Layer", "Renderer's order within a sorting layer.");
- static readonly GUIContent k_OrthographicLabel = new GUIContent("Orthographic Mode", "Should be enabled when using an orthographic camera. Instructs the shader to not perform any perspective correction.");
- static readonly GUIContent k_VolumetricLabel = new GUIContent("Volumetric Setup", "Use cubes rather than quads to render the text. Allows for volumetric rendering when combined with a compatible shader.");
-
- private static string[] k_SortingLayerNames;
- bool IsPreset;
-
- SerializedProperty m_IsVolumetricTextProp;
- SerializedProperty m_IsOrthographicProp;
- Renderer m_Renderer;
-
- protected override void OnEnable()
- {
- base.OnEnable();
-
- // Determine if the inspected object is a Preset
- IsPreset = (int)(target as Component).gameObject.hideFlags == 93;
-
- m_IsOrthographicProp = serializedObject.FindProperty("m_isOrthographic");
-
- m_IsVolumetricTextProp = serializedObject.FindProperty("m_isVolumetricText");
-
- m_Renderer = m_TextComponent.GetComponent();
-
- // Populate Sorting Layer Names
- k_SortingLayerNames = SortingLayerHelper.sortingLayerNames;
- }
-
- protected override void DrawExtraSettings()
- {
- Rect rect = EditorGUILayout.GetControlRect(false, 24);
-
- if (GUI.Button(rect, new GUIContent("Extra Settings"), TMP_UIStyleManager.sectionHeader))
- Foldout.extraSettings = !Foldout.extraSettings;
-
- GUI.Label(rect, (Foldout.extraSettings ? "" : k_UiStateLabel[1]), TMP_UIStyleManager.rightLabel);
-
- if (Foldout.extraSettings)
- {
- //EditorGUI.indentLevel += 1;
-
- DrawMargins();
-
- DrawSortingLayer();
-
- DrawGeometrySorting();
-
- DrawIsTextObjectScaleStatic();
-
- DrawOrthographicMode();
-
- DrawRichText();
-
- DrawParsing();
-
- DrawSpriteAsset();
-
- DrawStyleSheet();
-
- //DrawVolumetricSetup();
-
- DrawKerning();
-
- DrawPadding();
-
- //EditorGUI.indentLevel -= 1;
- }
- }
-
- protected void DrawSortingLayer()
- {
- Undo.RecordObject(m_Renderer, "Sorting Layer Change");
-
- EditorGUI.BeginChangeCheck();
-
- TextMeshPro textComponent = (TextMeshPro)m_TextComponent;
-
- // Look up the layer name using the current layer ID
- string oldName = IsPreset ? SortingLayer.IDToName(textComponent._SortingLayerID) : SortingLayer.IDToName(textComponent.sortingLayerID);
-
- // Use the name to look up our array index into the names list
- int oldLayerIndex = System.Array.IndexOf(k_SortingLayerNames, oldName);
-
- // Show the pop-up for the names
- EditorGUIUtility.fieldWidth = 0f;
- int newLayerIndex = EditorGUILayout.Popup(k_SortingLayerLabel, oldLayerIndex, k_SortingLayerNames);
-
- // If the index changes, look up the ID for the new index to store as the new ID
- if (newLayerIndex != oldLayerIndex)
- UpdateTargetsSortingLayerID(SortingLayer.NameToID(k_SortingLayerNames[newLayerIndex]));
-
- // Get value from internal property if target is a Preset otherwise from the public property
- int oldSortingOrder = IsPreset ? textComponent._SortingOrder : textComponent.sortingOrder;
-
- int newSortingLayerOrder = EditorGUILayout.IntField(k_OrderInLayerLabel, oldSortingOrder);
-
- if (newSortingLayerOrder != textComponent.sortingOrder)
- UpdateTargetsSortingOrder(newSortingLayerOrder);
-
- if (EditorGUI.EndChangeCheck())
- m_HavePropertiesChanged = true;
-
- EditorGUILayout.Space();
- }
-
- protected void DrawOrthographicMode()
- {
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(m_IsOrthographicProp, k_OrthographicLabel);
- if (EditorGUI.EndChangeCheck())
- m_HavePropertiesChanged = true;
- }
-
- protected void DrawVolumetricSetup()
- {
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(m_IsVolumetricTextProp, k_VolumetricLabel);
- if (EditorGUI.EndChangeCheck())
- {
- m_HavePropertiesChanged = true;
- m_TextComponent.textInfo.ResetVertexLayout(m_IsVolumetricTextProp.boolValue);
- }
-
- EditorGUILayout.Space();
- }
-
- // Method to handle multi object selection
- protected override bool IsMixSelectionTypes()
- {
- GameObject[] objects = Selection.gameObjects;
- if (objects.Length > 1)
- {
- for (int i = 0; i < objects.Length; i++)
- {
- if (objects[i].GetComponent() == null)
- return true;
- }
- }
- return false;
- }
-
- protected override void OnUndoRedo()
- {
- int undoEventId = Undo.GetCurrentGroup();
- int lastUndoEventId = s_EventId;
-
- if (undoEventId != lastUndoEventId)
- {
- for (int i = 0; i < targets.Length; i++)
- {
- //Debug.Log("Undo & Redo Performed detected in Editor Panel. Event ID:" + Undo.GetCurrentGroup());
- TMPro_EventManager.ON_TEXTMESHPRO_PROPERTY_CHANGED(true, targets[i] as TextMeshPro);
- s_EventId = undoEventId;
- }
- }
- }
-
- void UpdateTargetsSortingLayerID(int sortingLayerID)
- {
- for (int i = 0; i < targets.Length; i++)
- {
- var textComponent = (TextMeshPro)targets[i];
-
- if (textComponent != null)
- textComponent.sortingLayerID = sortingLayerID;
- }
- }
-
- void UpdateTargetsSortingOrder(int sortingOrder)
- {
- for (int i = 0; i < targets.Length; i++)
- {
- var textComponent = (TextMeshPro)targets[i];
-
- if (textComponent != null)
- textComponent.sortingOrder = sortingOrder;
- }
- }
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorPanel.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorPanel.cs.meta
deleted file mode 100644
index 54fd8048..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorPanel.cs.meta
+++ /dev/null
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 34f6695d37a94370a3697f6b068f5d5e
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorPanelUI.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorPanelUI.cs
deleted file mode 100644
index c5085463..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorPanelUI.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-using UnityEngine;
-using UnityEngine.UI;
-using UnityEditor;
-
-namespace TMPro.EditorUtilities
-{
-
- [CustomEditor(typeof(TextMeshProUGUI), true), CanEditMultipleObjects]
- public class TMP_EditorPanelUI : TMP_BaseEditorPanel
- {
- static readonly GUIContent k_RaycastTargetLabel = new GUIContent("Raycast Target", "Whether the text blocks raycasts from the Graphic Raycaster.");
- static readonly GUIContent k_MaskableLabel = new GUIContent("Maskable", "Determines if the text object will be affected by UI Mask.");
-
- SerializedProperty m_RaycastTargetProp;
- private SerializedProperty m_MaskableProp;
-
- protected override void OnEnable()
- {
- base.OnEnable();
- m_RaycastTargetProp = serializedObject.FindProperty("m_RaycastTarget");
- m_MaskableProp = serializedObject.FindProperty("m_Maskable");
- }
-
- protected override void DrawExtraSettings()
- {
- Rect rect = EditorGUILayout.GetControlRect(false, 24);
-
- if (GUI.Button(rect, new GUIContent("Extra Settings"), TMP_UIStyleManager.sectionHeader))
- Foldout.extraSettings = !Foldout.extraSettings;
-
- GUI.Label(rect, (Foldout.extraSettings ? k_UiStateLabel[0] : k_UiStateLabel[1]), TMP_UIStyleManager.rightLabel);
- if (Foldout.extraSettings)
- {
- //EditorGUI.indentLevel += 1;
-
- DrawMargins();
-
- DrawGeometrySorting();
-
- DrawIsTextObjectScaleStatic();
-
- DrawRichText();
-
- DrawRaycastTarget();
-
- DrawMaskable();
-
- DrawParsing();
-
- DrawSpriteAsset();
-
- DrawStyleSheet();
-
- DrawKerning();
-
- DrawPadding();
-
- //EditorGUI.indentLevel -= 1;
- }
- }
-
- protected void DrawRaycastTarget()
- {
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(m_RaycastTargetProp, k_RaycastTargetLabel);
- if (EditorGUI.EndChangeCheck())
- {
- // Change needs to propagate to the child sub objects.
- Graphic[] graphicComponents = m_TextComponent.GetComponentsInChildren();
- for (int i = 1; i < graphicComponents.Length; i++)
- graphicComponents[i].raycastTarget = m_RaycastTargetProp.boolValue;
-
- m_HavePropertiesChanged = true;
- }
- }
-
- protected void DrawMaskable()
- {
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(m_MaskableProp, k_MaskableLabel);
- if (EditorGUI.EndChangeCheck())
- {
- m_TextComponent.maskable = m_MaskableProp.boolValue;
-
- // Change needs to propagate to the child sub objects.
- MaskableGraphic[] maskableGraphics = m_TextComponent.GetComponentsInChildren();
- for (int i = 1; i < maskableGraphics.Length; i++)
- maskableGraphics[i].maskable = m_MaskableProp.boolValue;
-
- m_HavePropertiesChanged = true;
- }
- }
-
- // Method to handle multi object selection
- protected override bool IsMixSelectionTypes()
- {
- GameObject[] objects = Selection.gameObjects;
- if (objects.Length > 1)
- {
- for (int i = 0; i < objects.Length; i++)
- {
- if (objects[i].GetComponent() == null)
- return true;
- }
- }
- return false;
- }
- protected override void OnUndoRedo()
- {
- int undoEventId = Undo.GetCurrentGroup();
- int lastUndoEventId = s_EventId;
-
- if (undoEventId != lastUndoEventId)
- {
- for (int i = 0; i < targets.Length; i++)
- {
- //Debug.Log("Undo & Redo Performed detected in Editor Panel. Event ID:" + Undo.GetCurrentGroup());
- TMPro_EventManager.ON_TEXTMESHPRO_UGUI_PROPERTY_CHANGED(true, targets[i] as TextMeshProUGUI);
- s_EventId = undoEventId;
- }
- }
- }
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorPanelUI.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorPanelUI.cs.meta
deleted file mode 100644
index ea3b36b3..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorPanelUI.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 21c0044a7f964773be90d197a78e4703
-timeCreated: 1443571501
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorUtility.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorUtility.cs
deleted file mode 100644
index 8869dd3e..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorUtility.cs
+++ /dev/null
@@ -1,451 +0,0 @@
-using UnityEngine;
-using UnityEditor;
-using System.Text;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-
-
-namespace TMPro.EditorUtilities
-{
-
- public static class TMP_EditorUtility
- {
- ///
- /// Returns the relative path of the package.
- ///
- public static string packageRelativePath
- {
- get
- {
- if (string.IsNullOrEmpty(m_PackagePath))
- m_PackagePath = GetPackageRelativePath();
-
- return m_PackagePath;
- }
- }
- [SerializeField]
- private static string m_PackagePath;
-
- ///
- /// Returns the fully qualified path of the package.
- ///
- public static string packageFullPath
- {
- get
- {
- if (string.IsNullOrEmpty(m_PackageFullPath))
- m_PackageFullPath = GetPackageFullPath();
-
- return m_PackageFullPath;
- }
- }
- [SerializeField]
- private static string m_PackageFullPath;
-
-
- // Static Fields Related to locating the TextMesh Pro Asset
- private static string folderPath = "Not Found";
-
- private static EditorWindow Gameview;
- private static bool isInitialized = false;
-
- private static void GetGameview()
- {
- System.Reflection.Assembly assembly = typeof(UnityEditor.EditorWindow).Assembly;
- System.Type type = assembly.GetType("UnityEditor.GameView");
- Gameview = EditorWindow.GetWindow(type);
- }
-
-
- public static void RepaintAll()
- {
- if (isInitialized == false)
- {
- GetGameview();
- isInitialized = true;
- }
-
- SceneView.RepaintAll();
- Gameview.Repaint();
- }
-
-
- ///
- /// Create and return a new asset in a smart location based on the current selection and then select it.
- ///
- ///
- /// Name of the new asset. Do not include the .asset extension.
- ///
- ///
- /// The new asset.
- ///
- public static T CreateAsset(string name) where T : ScriptableObject
- {
- string path = AssetDatabase.GetAssetPath(Selection.activeObject);
- if (path.Length == 0)
- {
- // no asset selected, place in asset root
- path = "Assets/" + name + ".asset";
- }
- else if (Directory.Exists(path))
- {
- // place in currently selected directory
- path += "/" + name + ".asset";
- }
- else {
- // place in current selection's containing directory
- path = Path.GetDirectoryName(path) + "/" + name + ".asset";
- }
- T asset = ScriptableObject.CreateInstance();
- AssetDatabase.CreateAsset(asset, AssetDatabase.GenerateUniqueAssetPath(path));
- EditorUtility.FocusProjectWindow();
- Selection.activeObject = asset;
- return asset;
- }
-
-
-
- // Function used to find all materials which reference a font atlas so we can update all their references.
- public static Material[] FindMaterialReferences(TMP_FontAsset fontAsset)
- {
- List refs = new List();
- Material mat = fontAsset.material;
- refs.Add(mat);
-
- // Get materials matching the search pattern.
- string searchPattern = "t:Material" + " " + fontAsset.name.Split(new char[] { ' ' })[0];
- string[] materialAssetGUIDs = AssetDatabase.FindAssets(searchPattern);
-
- for (int i = 0; i < materialAssetGUIDs.Length; i++)
- {
- string materialPath = AssetDatabase.GUIDToAssetPath(materialAssetGUIDs[i]);
- Material targetMaterial = AssetDatabase.LoadAssetAtPath(materialPath);
-
- if (targetMaterial.HasProperty(ShaderUtilities.ID_MainTex) && targetMaterial.GetTexture(ShaderUtilities.ID_MainTex) != null && mat.GetTexture(ShaderUtilities.ID_MainTex) != null && targetMaterial.GetTexture(ShaderUtilities.ID_MainTex).GetInstanceID() == mat.GetTexture(ShaderUtilities.ID_MainTex).GetInstanceID())
- {
- if (!refs.Contains(targetMaterial))
- refs.Add(targetMaterial);
- }
- else
- {
- // TODO: Find a more efficient method to unload resources.
- //Resources.UnloadAsset(targetMaterial.GetTexture(ShaderUtilities.ID_MainTex));
- }
- }
-
- return refs.ToArray();
- }
-
-
- // Function used to find the Font Asset which matches the given Material Preset and Font Atlas Texture.
- public static TMP_FontAsset FindMatchingFontAsset(Material mat)
- {
- if (mat.GetTexture(ShaderUtilities.ID_MainTex) == null) return null;
-
- // Find the dependent assets of this material.
- string[] dependentAssets = AssetDatabase.GetDependencies(AssetDatabase.GetAssetPath(mat), false);
-
- for (int i = 0; i < dependentAssets.Length; i++)
- {
- TMP_FontAsset fontAsset = AssetDatabase.LoadAssetAtPath(dependentAssets[i]);
- if (fontAsset != null)
- return fontAsset;
- }
-
- return null;
- }
-
-
- private static string GetPackageRelativePath()
- {
- // Check for potential UPM package
- string packagePath = Path.GetFullPath("Packages/com.unity.textmeshpro");
- if (Directory.Exists(packagePath))
- {
- return "Packages/com.unity.textmeshpro";
- }
-
- packagePath = Path.GetFullPath("Assets/..");
- if (Directory.Exists(packagePath))
- {
- // Search default location for development package
- if (Directory.Exists(packagePath + "/Assets/Packages/com.unity.TextMeshPro/Editor Resources"))
- {
- return "Assets/Packages/com.unity.TextMeshPro";
- }
-
- // Search for default location of normal TextMesh Pro AssetStore package
- if (Directory.Exists(packagePath + "/Assets/TextMesh Pro/Editor Resources"))
- {
- return "Assets/TextMesh Pro";
- }
-
- // Search for potential alternative locations in the user project
- string[] matchingPaths = Directory.GetDirectories(packagePath, "TextMesh Pro", SearchOption.AllDirectories);
- packagePath = ValidateLocation(matchingPaths, packagePath);
- if (packagePath != null) return packagePath;
- }
-
- return null;
- }
-
- private static string GetPackageFullPath()
- {
- // Check for potential UPM package
- string packagePath = Path.GetFullPath("Packages/com.unity.textmeshpro");
- if (Directory.Exists(packagePath))
- {
- return packagePath;
- }
-
- packagePath = Path.GetFullPath("Assets/..");
- if (Directory.Exists(packagePath))
- {
- // Search default location for development package
- if (Directory.Exists(packagePath + "/Assets/Packages/com.unity.TextMeshPro/Editor Resources"))
- {
- return packagePath + "/Assets/Packages/com.unity.TextMeshPro";
- }
-
- // Search for default location of normal TextMesh Pro AssetStore package
- if (Directory.Exists(packagePath + "/Assets/TextMesh Pro/Editor Resources"))
- {
- return packagePath + "/Assets/TextMesh Pro";
- }
-
- // Search for potential alternative locations in the user project
- string[] matchingPaths = Directory.GetDirectories(packagePath, "TextMesh Pro", SearchOption.AllDirectories);
- string path = ValidateLocation(matchingPaths, packagePath);
- if (path != null) return packagePath + path;
- }
-
- return null;
- }
-
-
- ///
- /// Method to validate the location of the asset folder by making sure the GUISkins folder exists.
- ///
- ///
- ///
- private static string ValidateLocation(string[] paths, string projectPath)
- {
- for (int i = 0; i < paths.Length; i++)
- {
- // Check if any of the matching directories contain a GUISkins directory.
- if (Directory.Exists(paths[i] + "/Editor Resources"))
- {
- folderPath = paths[i].Replace(projectPath, "");
- folderPath = folderPath.TrimStart('\\', '/');
- return folderPath;
- }
- }
-
- return null;
- }
-
-
- ///
- /// Function which returns a string containing a sequence of Decimal character ranges.
- ///
- ///
- ///
- public static string GetDecimalCharacterSequence(int[] characterSet)
- {
- if (characterSet == null || characterSet.Length == 0)
- return string.Empty;
-
- string characterSequence = string.Empty;
- int count = characterSet.Length;
- int first = characterSet[0];
- int last = first;
-
- for (int i = 1; i < count; i++)
- {
- if (characterSet[i - 1] + 1 == characterSet[i])
- {
- last = characterSet[i];
- }
- else
- {
- if (first == last)
- characterSequence += first + ",";
- else
- characterSequence += first + "-" + last + ",";
-
- first = last = characterSet[i];
- }
-
- }
-
- // handle the final group
- if (first == last)
- characterSequence += first;
- else
- characterSequence += first + "-" + last;
-
- return characterSequence;
- }
-
-
- ///
- /// Function which returns a string containing a sequence of Unicode (Hex) character ranges.
- ///
- ///
- ///
- public static string GetUnicodeCharacterSequence(int[] characterSet)
- {
- if (characterSet == null || characterSet.Length == 0)
- return string.Empty;
-
- string characterSequence = string.Empty;
- int count = characterSet.Length;
- int first = characterSet[0];
- int last = first;
-
- for (int i = 1; i < count; i++)
- {
- if (characterSet[i - 1] + 1 == characterSet[i])
- {
- last = characterSet[i];
- }
- else
- {
- if (first == last)
- characterSequence += first.ToString("X2") + ",";
- else
- characterSequence += first.ToString("X2") + "-" + last.ToString("X2") + ",";
-
- first = last = characterSet[i];
- }
-
- }
-
- // handle the final group
- if (first == last)
- characterSequence += first.ToString("X2");
- else
- characterSequence += first.ToString("X2") + "-" + last.ToString("X2");
-
- return characterSequence;
- }
-
-
- ///
- ///
- ///
- ///
- ///
- ///
- public static void DrawBox(Rect rect, float thickness, Color color)
- {
- EditorGUI.DrawRect(new Rect(rect.x - thickness, rect.y + thickness, rect.width + thickness * 2, thickness), color);
- EditorGUI.DrawRect(new Rect(rect.x - thickness, rect.y + thickness, thickness, rect.height - thickness * 2), color);
- EditorGUI.DrawRect(new Rect(rect.x - thickness, rect.y + rect.height - thickness * 2, rect.width + thickness * 2, thickness), color);
- EditorGUI.DrawRect(new Rect(rect.x + rect.width, rect.y + thickness, thickness, rect.height - thickness * 2), color);
- }
-
-
- ///
- /// Function to return the horizontal alignment grid value.
- ///
- ///
- ///
- public static int GetHorizontalAlignmentGridValue(int value)
- {
- if ((value & 0x1) == 0x1)
- return 0;
- else if ((value & 0x2) == 0x2)
- return 1;
- else if ((value & 0x4) == 0x4)
- return 2;
- else if ((value & 0x8) == 0x8)
- return 3;
- else if ((value & 0x10) == 0x10)
- return 4;
- else if ((value & 0x20) == 0x20)
- return 5;
-
- return 0;
- }
-
- ///
- /// Function to return the vertical alignment grid value.
- ///
- ///
- ///
- public static int GetVerticalAlignmentGridValue(int value)
- {
- if ((value & 0x100) == 0x100)
- return 0;
- if ((value & 0x200) == 0x200)
- return 1;
- if ((value & 0x400) == 0x400)
- return 2;
- if ((value & 0x800) == 0x800)
- return 3;
- if ((value & 0x1000) == 0x1000)
- return 4;
- if ((value & 0x2000) == 0x2000)
- return 5;
-
- return 0;
- }
-
- public static void DrawColorProperty(Rect rect, SerializedProperty property)
- {
- int oldIndent = EditorGUI.indentLevel;
- EditorGUI.indentLevel = 0;
- if (EditorGUIUtility.wideMode)
- {
- EditorGUI.PropertyField(new Rect(rect.x, rect.y, 50f, rect.height), property, GUIContent.none);
- rect.x += 50f;
- rect.width = Mathf.Min(100f, rect.width - 55f);
- }
- else
- {
- rect.height /= 2f;
- rect.width = Mathf.Min(100f, rect.width - 5f);
- EditorGUI.PropertyField(rect, property, GUIContent.none);
- rect.y += rect.height;
- }
-
- EditorGUI.BeginChangeCheck();
- string colorString = EditorGUI.TextField(rect, string.Format("#{0}", ColorUtility.ToHtmlStringRGBA(property.colorValue)));
- if (EditorGUI.EndChangeCheck())
- {
- Color color;
- if (ColorUtility.TryParseHtmlString(colorString, out color))
- {
- property.colorValue = color;
- }
- }
- EditorGUI.indentLevel = oldIndent;
- }
-
- public static bool EditorToggle(Rect position, bool value, GUIContent content, GUIStyle style)
- {
- var id = GUIUtility.GetControlID(content, FocusType.Keyboard, position);
- var evt = Event.current;
-
- // Toggle selected toggle on space or return key
- if (GUIUtility.keyboardControl == id && evt.type == EventType.KeyDown && (evt.keyCode == KeyCode.Space || evt.keyCode == KeyCode.Return || evt.keyCode == KeyCode.KeypadEnter))
- {
- value = !value;
- evt.Use();
- GUI.changed = true;
- }
-
- if (evt.type == EventType.MouseDown && position.Contains(Event.current.mousePosition))
- {
- GUIUtility.keyboardControl = id;
- EditorGUIUtility.editingTextField = false;
- HandleUtility.Repaint();
- }
-
- return GUI.Toggle(position, id, value, content, style);
- }
-
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorUtility.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorUtility.cs.meta
deleted file mode 100644
index 5088b1bd..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_EditorUtility.cs.meta
+++ /dev/null
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 2300e75732d74890b38a8ff257a3ae15
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_FontAssetEditor.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_FontAssetEditor.cs
deleted file mode 100644
index 8cf9a79d..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_FontAssetEditor.cs
+++ /dev/null
@@ -1,1717 +0,0 @@
-using UnityEngine;
-using UnityEditor;
-using UnityEditorInternal;
-using System.Collections.Generic;
-using UnityEngine.TextCore;
-using UnityEngine.TextCore.LowLevel;
-using UnityEditor.TextCore.LowLevel;
-
-
-namespace TMPro.EditorUtilities
-{
-
- [CustomPropertyDrawer(typeof(TMP_FontWeightPair))]
- public class FontWeightDrawer : PropertyDrawer
- {
- public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
- {
- SerializedProperty prop_regular = property.FindPropertyRelative("regularTypeface");
- SerializedProperty prop_italic = property.FindPropertyRelative("italicTypeface");
-
- float width = position.width;
-
- position.width = EditorGUIUtility.labelWidth;
- EditorGUI.LabelField(position, label);
-
- int oldIndent = EditorGUI.indentLevel;
- EditorGUI.indentLevel = 0;
-
- // NORMAL TYPEFACE
- if (label.text[0] == '4') GUI.enabled = false;
- position.x += position.width; position.width = (width - position.width) / 2;
- EditorGUI.PropertyField(position, prop_regular, GUIContent.none);
-
- // ITALIC TYPEFACE
- GUI.enabled = true;
- position.x += position.width;
- EditorGUI.PropertyField(position, prop_italic, GUIContent.none);
-
- EditorGUI.indentLevel = oldIndent;
- }
- }
-
- [CustomEditor(typeof(TMP_FontAsset))]
- public class TMP_FontAssetEditor : Editor
- {
- private struct UI_PanelState
- {
- public static bool faceInfoPanel = true;
- public static bool generationSettingsPanel = true;
- public static bool fontAtlasInfoPanel = true;
- public static bool fontWeightPanel = true;
- public static bool fallbackFontAssetPanel = true;
- public static bool glyphTablePanel = false;
- public static bool characterTablePanel = false;
- public static bool fontFeatureTablePanel = false;
- }
-
- private struct AtlasSettings
- {
- public GlyphRenderMode glyphRenderMode;
- public int pointSize;
- public int padding;
- public int atlasWidth;
- public int atlasHeight;
- }
-
- ///
- /// Material used to display SDF glyphs in the Character and Glyph tables.
- ///
- internal static Material internalSDFMaterial
- {
- get
- {
- if (s_InternalSDFMaterial == null)
- {
- Shader shader = Shader.Find("Hidden/TMP/Internal/Editor/Distance Field SSD");
-
- if (shader != null)
- s_InternalSDFMaterial = new Material(shader);
- }
-
- return s_InternalSDFMaterial;
- }
- }
- static Material s_InternalSDFMaterial;
-
- ///
- /// Material used to display Bitmap glyphs in the Character and Glyph tables.
- ///
- internal static Material internalBitmapMaterial
- {
- get
- {
- if (s_InternalBitmapMaterial == null)
- {
- Shader shader = Shader.Find("Hidden/Internal-GUITextureClipText");
-
- if (shader != null)
- s_InternalBitmapMaterial = new Material(shader);
- }
-
- return s_InternalBitmapMaterial;
- }
- }
- static Material s_InternalBitmapMaterial;
-
- private static string[] s_UiStateLabel = new string[] { "(Click to collapse) ", "(Click to expand) " };
- private GUIContent[] m_AtlasResolutionLabels = { new GUIContent("8"), new GUIContent("16"), new GUIContent("32"), new GUIContent("64"), new GUIContent("128"), new GUIContent("256"), new GUIContent("512"), new GUIContent("1024"), new GUIContent("2048"), new GUIContent("4096"), new GUIContent("8192") };
- private int[] m_AtlasResolutions = { 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192 };
-
- private struct Warning
- {
- public bool isEnabled;
- public double expirationTime;
- }
-
- private int m_CurrentGlyphPage = 0;
- private int m_CurrentCharacterPage = 0;
- private int m_CurrentKerningPage = 0;
-
- private int m_SelectedGlyphRecord = -1;
- private int m_SelectedCharacterRecord = -1;
- private int m_SelectedAdjustmentRecord = -1;
-
- private string m_dstGlyphID;
- private string m_dstUnicode;
- private const string k_placeholderUnicodeHex = "New Unicode (Hex)";
- private string m_unicodeHexLabel = k_placeholderUnicodeHex;
- private const string k_placeholderGlyphID = "New Glyph ID";
- private string m_GlyphIDLabel = k_placeholderGlyphID;
-
- private Warning m_AddGlyphWarning;
- private Warning m_AddCharacterWarning;
- private bool m_DisplayDestructiveChangeWarning;
- private AtlasSettings m_AtlasSettings;
- private bool m_MaterialPresetsRequireUpdate;
-
- private string m_GlyphSearchPattern;
- private List m_GlyphSearchList;
-
- private string m_CharacterSearchPattern;
- private List m_CharacterSearchList;
-
- private string m_KerningTableSearchPattern;
- private List m_KerningTableSearchList;
-
- private bool m_isSearchDirty;
-
- private const string k_UndoRedo = "UndoRedoPerformed";
-
- private SerializedProperty m_AtlasPopulationMode_prop;
- private SerializedProperty font_atlas_prop;
- private SerializedProperty font_material_prop;
-
- private SerializedProperty m_AtlasRenderMode_prop;
- private SerializedProperty m_SamplingPointSize_prop;
- private SerializedProperty m_AtlasPadding_prop;
- private SerializedProperty m_AtlasWidth_prop;
- private SerializedProperty m_AtlasHeight_prop;
- private SerializedProperty m_IsMultiAtlasTexturesEnabled_prop;
-
- private SerializedProperty fontWeights_prop;
-
- //private SerializedProperty fallbackFontAssets_prop;
- private ReorderableList m_list;
-
- private SerializedProperty font_normalStyle_prop;
- private SerializedProperty font_normalSpacing_prop;
-
- private SerializedProperty font_boldStyle_prop;
- private SerializedProperty font_boldSpacing_prop;
-
- private SerializedProperty font_italicStyle_prop;
- private SerializedProperty font_tabSize_prop;
-
- private SerializedProperty m_FaceInfo_prop;
- private SerializedProperty m_GlyphTable_prop;
- private SerializedProperty m_CharacterTable_prop;
-
- private TMP_FontFeatureTable m_FontFeatureTable;
- private SerializedProperty m_FontFeatureTable_prop;
- private SerializedProperty m_GlyphPairAdjustmentRecords_prop;
-
- private TMP_SerializedPropertyHolder m_SerializedPropertyHolder;
- private SerializedProperty m_EmptyGlyphPairAdjustmentRecord_prop;
-
- private TMP_FontAsset m_fontAsset;
-
- private Material[] m_materialPresets;
-
- private bool isAssetDirty = false;
-
- private int errorCode;
-
- private System.DateTime timeStamp;
-
-
- public void OnEnable()
- {
- m_FaceInfo_prop = serializedObject.FindProperty("m_FaceInfo");
-
- font_atlas_prop = serializedObject.FindProperty("m_AtlasTextures").GetArrayElementAtIndex(0);
- font_material_prop = serializedObject.FindProperty("material");
-
- m_AtlasPopulationMode_prop = serializedObject.FindProperty("m_AtlasPopulationMode");
- m_AtlasRenderMode_prop = serializedObject.FindProperty("m_AtlasRenderMode");
- m_SamplingPointSize_prop = m_FaceInfo_prop.FindPropertyRelative("m_PointSize");
- m_AtlasPadding_prop = serializedObject.FindProperty("m_AtlasPadding");
- m_AtlasWidth_prop = serializedObject.FindProperty("m_AtlasWidth");
- m_AtlasHeight_prop = serializedObject.FindProperty("m_AtlasHeight");
- m_IsMultiAtlasTexturesEnabled_prop = serializedObject.FindProperty("m_IsMultiAtlasTexturesEnabled");
-
- fontWeights_prop = serializedObject.FindProperty("m_FontWeightTable");
-
- m_list = new ReorderableList(serializedObject, serializedObject.FindProperty("m_FallbackFontAssetTable"), true, true, true, true);
-
- m_list.drawElementCallback = (Rect rect, int index, bool isActive, bool isFocused) =>
- {
- var element = m_list.serializedProperty.GetArrayElementAtIndex(index);
- rect.y += 2;
- EditorGUI.PropertyField(new Rect(rect.x, rect.y, rect.width, EditorGUIUtility.singleLineHeight), element, GUIContent.none);
- };
-
- m_list.drawHeaderCallback = rect =>
- {
- EditorGUI.LabelField(rect, "Fallback List");
- };
-
- // Clean up fallback list in the event if contains null elements.
- CleanFallbackFontAssetTable();
-
- font_normalStyle_prop = serializedObject.FindProperty("normalStyle");
- font_normalSpacing_prop = serializedObject.FindProperty("normalSpacingOffset");
-
- font_boldStyle_prop = serializedObject.FindProperty("boldStyle");
- font_boldSpacing_prop = serializedObject.FindProperty("boldSpacing");
-
- font_italicStyle_prop = serializedObject.FindProperty("italicStyle");
- font_tabSize_prop = serializedObject.FindProperty("tabSize");
-
- m_CharacterTable_prop = serializedObject.FindProperty("m_CharacterTable");
- m_GlyphTable_prop = serializedObject.FindProperty("m_GlyphTable");
-
- m_FontFeatureTable_prop = serializedObject.FindProperty("m_FontFeatureTable");
- m_GlyphPairAdjustmentRecords_prop = m_FontFeatureTable_prop.FindPropertyRelative("m_GlyphPairAdjustmentRecords");
-
- m_fontAsset = target as TMP_FontAsset;
- m_FontFeatureTable = m_fontAsset.fontFeatureTable;
-
- // Upgrade Font Feature Table if necessary
- if (m_fontAsset.m_KerningTable != null && m_fontAsset.m_KerningTable.kerningPairs != null && m_fontAsset.m_KerningTable.kerningPairs.Count > 0)
- m_fontAsset.ReadFontAssetDefinition();
-
- // Create serialized object to allow us to use a serialized property of an empty kerning pair.
- m_SerializedPropertyHolder = CreateInstance();
- m_SerializedPropertyHolder.fontAsset = m_fontAsset;
- SerializedObject internalSerializedObject = new SerializedObject(m_SerializedPropertyHolder);
- m_EmptyGlyphPairAdjustmentRecord_prop = internalSerializedObject.FindProperty("glyphPairAdjustmentRecord");
-
- m_materialPresets = TMP_EditorUtility.FindMaterialReferences(m_fontAsset);
-
- m_GlyphSearchList = new List();
- m_KerningTableSearchList = new List();
-
- // Sort Font Asset Tables
- m_fontAsset.SortAllTables();
- }
-
-
- public void OnDisable()
- {
- // Revert changes if user closes or changes selection without having made a choice.
- if (m_DisplayDestructiveChangeWarning)
- {
- m_DisplayDestructiveChangeWarning = false;
- RestoreAtlasGenerationSettings();
- GUIUtility.keyboardControl = 0;
-
- serializedObject.ApplyModifiedProperties();
- }
- }
-
-
- public override void OnInspectorGUI()
- {
- //Debug.Log("OnInspectorGUI Called.");
-
- Event currentEvent = Event.current;
-
- serializedObject.Update();
-
- Rect rect = EditorGUILayout.GetControlRect(false, 24);
- float labelWidth = EditorGUIUtility.labelWidth;
- float fieldWidth = EditorGUIUtility.fieldWidth;
-
- // FACE INFO PANEL
- #region Face info
- GUI.Label(rect, new GUIContent("Face Info - v" + m_fontAsset.version), TMP_UIStyleManager.sectionHeader);
-
- rect.x += rect.width - 132f;
- rect.y += 2;
- rect.width = 130f;
- rect.height = 18f;
- if (GUI.Button(rect, new GUIContent("Update Atlas Texture")))
- {
- TMPro_FontAssetCreatorWindow.ShowFontAtlasCreatorWindow(target as TMP_FontAsset);
- }
-
- EditorGUI.indentLevel = 1;
- GUI.enabled = false; // Lock UI
-
- // TODO : Consider creating a property drawer for these.
- EditorGUILayout.PropertyField(m_FaceInfo_prop.FindPropertyRelative("m_FamilyName"));
- EditorGUILayout.PropertyField(m_FaceInfo_prop.FindPropertyRelative("m_StyleName"));
- EditorGUILayout.PropertyField(m_FaceInfo_prop.FindPropertyRelative("m_PointSize"));
-
- GUI.enabled = true;
-
- EditorGUILayout.PropertyField(m_FaceInfo_prop.FindPropertyRelative("m_Scale"));
- EditorGUILayout.PropertyField(m_FaceInfo_prop.FindPropertyRelative("m_LineHeight"));
-
- EditorGUILayout.PropertyField(m_FaceInfo_prop.FindPropertyRelative("m_AscentLine"));
- EditorGUILayout.PropertyField(m_FaceInfo_prop.FindPropertyRelative("m_CapLine"));
- EditorGUILayout.PropertyField(m_FaceInfo_prop.FindPropertyRelative("m_MeanLine"));
- EditorGUILayout.PropertyField(m_FaceInfo_prop.FindPropertyRelative("m_Baseline"));
- EditorGUILayout.PropertyField(m_FaceInfo_prop.FindPropertyRelative("m_DescentLine"));
- EditorGUILayout.PropertyField(m_FaceInfo_prop.FindPropertyRelative("m_UnderlineOffset"));
- EditorGUILayout.PropertyField(m_FaceInfo_prop.FindPropertyRelative("m_UnderlineThickness"));
- EditorGUILayout.PropertyField(m_FaceInfo_prop.FindPropertyRelative("m_StrikethroughOffset"));
- //EditorGUILayout.PropertyField(m_FaceInfo_prop.FindPropertyRelative("strikethroughThickness"));
- EditorGUILayout.PropertyField(m_FaceInfo_prop.FindPropertyRelative("m_SuperscriptOffset"));
- EditorGUILayout.PropertyField(m_FaceInfo_prop.FindPropertyRelative("m_SuperscriptSize"));
- EditorGUILayout.PropertyField(m_FaceInfo_prop.FindPropertyRelative("m_SubscriptOffset"));
- EditorGUILayout.PropertyField(m_FaceInfo_prop.FindPropertyRelative("m_SubscriptSize"));
- EditorGUILayout.PropertyField(m_FaceInfo_prop.FindPropertyRelative("m_TabWidth"));
- // TODO : Add clamping for some of these values.
- //subSize_prop.floatValue = Mathf.Clamp(subSize_prop.floatValue, 0.25f, 1f);
-
- EditorGUILayout.Space();
- #endregion
-
- // GENERATION SETTINGS
- #region Generation Settings
- rect = EditorGUILayout.GetControlRect(false, 24);
-
- if (GUI.Button(rect, new GUIContent("Generation Settings"), TMP_UIStyleManager.sectionHeader))
- UI_PanelState.generationSettingsPanel = !UI_PanelState.generationSettingsPanel;
-
- GUI.Label(rect, (UI_PanelState.generationSettingsPanel ? "" : s_UiStateLabel[1]), TMP_UIStyleManager.rightLabel);
-
- if (UI_PanelState.generationSettingsPanel)
- {
- EditorGUI.indentLevel = 1;
-
- EditorGUI.BeginChangeCheck();
- Font sourceFont = (Font)EditorGUILayout.ObjectField("Source Font File", m_fontAsset.m_SourceFontFile_EditorRef, typeof(Font), false);
- if (EditorGUI.EndChangeCheck())
- {
- string guid = AssetDatabase.AssetPathToGUID(AssetDatabase.GetAssetPath(sourceFont));
- m_fontAsset.m_SourceFontFileGUID = guid;
- m_fontAsset.m_SourceFontFile_EditorRef = sourceFont;
- }
-
- EditorGUI.BeginDisabledGroup(sourceFont == null);
- {
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(m_AtlasPopulationMode_prop, new GUIContent("Atlas Population Mode"));
- if (EditorGUI.EndChangeCheck())
- {
- serializedObject.ApplyModifiedProperties();
-
- bool isDatabaseRefreshRequired = false;
-
- if (m_AtlasPopulationMode_prop.intValue == 0)
- {
- m_fontAsset.sourceFontFile = null;
-
- //Set atlas textures to non readable.
- for (int i = 0; i < m_fontAsset.atlasTextures.Length; i++)
- {
- Texture2D tex = m_fontAsset.atlasTextures[i];
-
- if (tex != null && tex.isReadable)
- FontEngineEditorUtilities.SetAtlasTextureIsReadable(tex, false);
- }
-
- Debug.Log("Atlas Population mode set to [Static].");
- }
- else if (m_AtlasPopulationMode_prop.intValue == 1)
- {
- if (m_fontAsset.m_SourceFontFile_EditorRef.dynamic == false)
- {
- Debug.LogWarning("Please set the [" + m_fontAsset.name + "] font to dynamic mode as this is required for Dynamic SDF support.", m_fontAsset.m_SourceFontFile_EditorRef);
- m_AtlasPopulationMode_prop.intValue = 0;
-
- serializedObject.ApplyModifiedProperties();
- }
- else
- {
- m_fontAsset.sourceFontFile = m_fontAsset.m_SourceFontFile_EditorRef;
-
- // Set atlas textures to non readable.
- for (int i = 0; i < m_fontAsset.atlasTextures.Length; i++)
- {
- Texture2D tex = m_fontAsset.atlasTextures[i];
-
- if (tex != null && tex.isReadable == false)
- FontEngineEditorUtilities.SetAtlasTextureIsReadable(tex, true);
- }
-
- Debug.Log("Atlas Population mode set to [Dynamic].");
- }
- }
-
- if (isDatabaseRefreshRequired)
- AssetDatabase.Refresh();
-
- serializedObject.Update();
- isAssetDirty = true;
- }
-
- // Save state of atlas settings
- if (m_DisplayDestructiveChangeWarning == false)
- {
- SavedAtlasGenerationSettings();
- //Undo.RegisterCompleteObjectUndo(m_fontAsset, "Font Asset Changes");
- }
-
- EditorGUI.BeginDisabledGroup(m_AtlasPopulationMode_prop.intValue == (int)AtlasPopulationMode.Static);
- {
- EditorGUI.BeginChangeCheck();
- // TODO: Switch shaders depending on GlyphRenderMode.
- EditorGUILayout.PropertyField(m_AtlasRenderMode_prop);
- EditorGUILayout.PropertyField(m_SamplingPointSize_prop, new GUIContent("Sampling Point Size"));
- if (EditorGUI.EndChangeCheck())
- {
- m_DisplayDestructiveChangeWarning = true;
- }
-
- // Changes to these properties require updating Material Presets for this font asset.
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(m_AtlasPadding_prop, new GUIContent("Padding"));
- EditorGUILayout.IntPopup(m_AtlasWidth_prop, m_AtlasResolutionLabels, m_AtlasResolutions, new GUIContent("Atlas Width"));
- EditorGUILayout.IntPopup(m_AtlasHeight_prop, m_AtlasResolutionLabels, m_AtlasResolutions, new GUIContent("Atlas Height"));
- EditorGUILayout.PropertyField(m_IsMultiAtlasTexturesEnabled_prop, new GUIContent("Multi Atlas Textures", "Determines if the font asset will store glyphs in multiple atlas textures."));
- if (EditorGUI.EndChangeCheck())
- {
- m_MaterialPresetsRequireUpdate = true;
- m_DisplayDestructiveChangeWarning = true;
- }
-
- if (m_DisplayDestructiveChangeWarning)
- {
- // These changes are destructive on the font asset
- rect = EditorGUILayout.GetControlRect(false, 60);
- rect.x += 15;
- rect.width -= 15;
- EditorGUI.HelpBox(rect, "Changing these settings will clear the font asset's character, glyph and texture data.", MessageType.Warning);
-
- if (GUI.Button(new Rect(rect.width - 140, rect.y + 36, 80, 18), new GUIContent("Apply")))
- {
- m_DisplayDestructiveChangeWarning = false;
-
- // Update face info is sampling point size was changed.
- if (m_AtlasSettings.pointSize != m_SamplingPointSize_prop.intValue)
- {
- FontEngine.LoadFontFace(m_fontAsset.sourceFontFile, m_SamplingPointSize_prop.intValue);
- m_fontAsset.faceInfo = FontEngine.GetFaceInfo();
- }
-
- // Update material
- m_fontAsset.material.SetFloat(ShaderUtilities.ID_TextureWidth, m_AtlasWidth_prop.intValue);
- m_fontAsset.material.SetFloat(ShaderUtilities.ID_TextureHeight, m_AtlasHeight_prop.intValue);
- m_fontAsset.material.SetFloat(ShaderUtilities.ID_GradientScale, m_AtlasPadding_prop.intValue + 1);
-
- // Update material presets if any of the relevant properties have been changed.
- if (m_MaterialPresetsRequireUpdate)
- {
- m_MaterialPresetsRequireUpdate = false;
-
- Material[] materialPresets = TMP_EditorUtility.FindMaterialReferences(m_fontAsset);
- for (int i = 0; i < materialPresets.Length; i++)
- {
- Material mat = materialPresets[i];
-
- mat.SetFloat(ShaderUtilities.ID_TextureWidth, m_AtlasWidth_prop.intValue);
- mat.SetFloat(ShaderUtilities.ID_TextureHeight, m_AtlasHeight_prop.intValue);
- mat.SetFloat(ShaderUtilities.ID_GradientScale, m_AtlasPadding_prop.intValue + 1);
- }
- }
-
- m_fontAsset.UpdateFontAssetData();
- GUIUtility.keyboardControl = 0;
- isAssetDirty = true;
-
- // Update Font Asset Creation Settings to reflect new changes.
- UpdateFontAssetCreationSettings();
-
- // TODO: Clear undo buffers.
- //Undo.ClearUndo(m_fontAsset);
- }
-
- if (GUI.Button(new Rect(rect.width - 56, rect.y + 36, 80, 18), new GUIContent("Revert")))
- {
- m_DisplayDestructiveChangeWarning = false;
- RestoreAtlasGenerationSettings();
- GUIUtility.keyboardControl = 0;
-
- // TODO: Clear undo buffers.
- //Undo.ClearUndo(m_fontAsset);
- }
- }
- }
- EditorGUI.EndDisabledGroup();
- }
- EditorGUI.EndDisabledGroup();
- EditorGUILayout.Space();
- }
- #endregion
-
- // ATLAS & MATERIAL PANEL
- #region Atlas & Material
- rect = EditorGUILayout.GetControlRect(false, 24);
-
- if (GUI.Button(rect, new GUIContent("Atlas & Material"), TMP_UIStyleManager.sectionHeader))
- UI_PanelState.fontAtlasInfoPanel = !UI_PanelState.fontAtlasInfoPanel;
-
- GUI.Label(rect, (UI_PanelState.fontAtlasInfoPanel ? "" : s_UiStateLabel[1]), TMP_UIStyleManager.rightLabel);
-
- if (UI_PanelState.fontAtlasInfoPanel)
- {
- EditorGUI.indentLevel = 1;
-
- GUI.enabled = false;
- EditorGUILayout.PropertyField(font_atlas_prop, new GUIContent("Font Atlas"));
- EditorGUILayout.PropertyField(font_material_prop, new GUIContent("Font Material"));
- GUI.enabled = true;
- EditorGUILayout.Space();
- }
- #endregion
-
- string evt_cmd = Event.current.commandName; // Get Current Event CommandName to check for Undo Events
-
- // FONT WEIGHT PANEL
- #region Font Weights
- rect = EditorGUILayout.GetControlRect(false, 24);
-
- if (GUI.Button(rect, new GUIContent("Font Weights", "The Font Assets that will be used for different font weights and the settings used to simulate a typeface when no asset is available."), TMP_UIStyleManager.sectionHeader))
- UI_PanelState.fontWeightPanel = !UI_PanelState.fontWeightPanel;
-
- GUI.Label(rect, (UI_PanelState.fontWeightPanel ? "" : s_UiStateLabel[1]), TMP_UIStyleManager.rightLabel);
-
- if (UI_PanelState.fontWeightPanel)
- {
- EditorGUIUtility.labelWidth *= 0.75f;
- EditorGUIUtility.fieldWidth *= 0.25f;
-
- EditorGUILayout.BeginVertical();
- EditorGUI.indentLevel = 1;
- rect = EditorGUILayout.GetControlRect(true);
- rect.x += EditorGUIUtility.labelWidth;
- rect.width = (rect.width - EditorGUIUtility.labelWidth) / 2f;
- GUI.Label(rect, "Regular Typeface", EditorStyles.label);
- rect.x += rect.width;
- GUI.Label(rect, "Italic Typeface", EditorStyles.label);
-
- EditorGUI.indentLevel = 1;
-
- EditorGUILayout.PropertyField(fontWeights_prop.GetArrayElementAtIndex(1), new GUIContent("100 - Thin"));
- EditorGUILayout.PropertyField(fontWeights_prop.GetArrayElementAtIndex(2), new GUIContent("200 - Extra-Light"));
- EditorGUILayout.PropertyField(fontWeights_prop.GetArrayElementAtIndex(3), new GUIContent("300 - Light"));
- EditorGUILayout.PropertyField(fontWeights_prop.GetArrayElementAtIndex(4), new GUIContent("400 - Regular"));
- EditorGUILayout.PropertyField(fontWeights_prop.GetArrayElementAtIndex(5), new GUIContent("500 - Medium"));
- EditorGUILayout.PropertyField(fontWeights_prop.GetArrayElementAtIndex(6), new GUIContent("600 - Semi-Bold"));
- EditorGUILayout.PropertyField(fontWeights_prop.GetArrayElementAtIndex(7), new GUIContent("700 - Bold"));
- EditorGUILayout.PropertyField(fontWeights_prop.GetArrayElementAtIndex(8), new GUIContent("800 - Heavy"));
- EditorGUILayout.PropertyField(fontWeights_prop.GetArrayElementAtIndex(9), new GUIContent("900 - Black"));
-
- EditorGUILayout.EndVertical();
-
- EditorGUILayout.Space();
-
- EditorGUILayout.BeginVertical();
-
- EditorGUILayout.BeginHorizontal();
- EditorGUILayout.PropertyField(font_normalStyle_prop, new GUIContent("Normal Weight"));
- font_normalStyle_prop.floatValue = Mathf.Clamp(font_normalStyle_prop.floatValue, -3.0f, 3.0f);
- if (GUI.changed || evt_cmd == k_UndoRedo)
- {
- GUI.changed = false;
-
- // Modify the material property on matching material presets.
- for (int i = 0; i < m_materialPresets.Length; i++)
- m_materialPresets[i].SetFloat("_WeightNormal", font_normalStyle_prop.floatValue);
- }
-
- EditorGUILayout.PropertyField(font_boldStyle_prop, new GUIContent("Bold Weight"));
- font_boldStyle_prop.floatValue = Mathf.Clamp(font_boldStyle_prop.floatValue, -3.0f, 3.0f);
- if (GUI.changed || evt_cmd == k_UndoRedo)
- {
- GUI.changed = false;
-
- // Modify the material property on matching material presets.
- for (int i = 0; i < m_materialPresets.Length; i++)
- m_materialPresets[i].SetFloat("_WeightBold", font_boldStyle_prop.floatValue);
- }
- EditorGUILayout.EndHorizontal();
-
- EditorGUILayout.BeginHorizontal();
- EditorGUILayout.PropertyField(font_normalSpacing_prop, new GUIContent("Spacing Offset"));
- font_normalSpacing_prop.floatValue = Mathf.Clamp(font_normalSpacing_prop.floatValue, -100, 100);
- if (GUI.changed || evt_cmd == k_UndoRedo)
- {
- GUI.changed = false;
- }
-
- EditorGUILayout.PropertyField(font_boldSpacing_prop, new GUIContent("Bold Spacing"));
- font_boldSpacing_prop.floatValue = Mathf.Clamp(font_boldSpacing_prop.floatValue, 0, 100);
- if (GUI.changed || evt_cmd == k_UndoRedo)
- {
- GUI.changed = false;
- }
- EditorGUILayout.EndHorizontal();
-
- EditorGUILayout.BeginHorizontal();
- EditorGUILayout.PropertyField(font_italicStyle_prop, new GUIContent("Italic Style"));
- font_italicStyle_prop.intValue = Mathf.Clamp(font_italicStyle_prop.intValue, 15, 60);
-
- EditorGUILayout.PropertyField(font_tabSize_prop, new GUIContent("Tab Multiple"));
- EditorGUILayout.EndHorizontal();
- EditorGUILayout.EndVertical();
- EditorGUILayout.Space();
- }
-
- EditorGUIUtility.labelWidth = 0;
- EditorGUIUtility.fieldWidth = 0;
- #endregion
-
- // FALLBACK FONT ASSETS
- #region Fallback Font Asset
- rect = EditorGUILayout.GetControlRect(false, 24);
- EditorGUI.indentLevel = 0;
- if (GUI.Button(rect, new GUIContent("Fallback Font Assets", "Select the Font Assets that will be searched and used as fallback when characters are missing from this font asset."), TMP_UIStyleManager.sectionHeader))
- UI_PanelState.fallbackFontAssetPanel = !UI_PanelState.fallbackFontAssetPanel;
-
- GUI.Label(rect, (UI_PanelState.fallbackFontAssetPanel ? "" : s_UiStateLabel[1]), TMP_UIStyleManager.rightLabel);
-
- if (UI_PanelState.fallbackFontAssetPanel)
- {
- EditorGUIUtility.labelWidth = 120;
- EditorGUI.indentLevel = 0;
-
- m_list.DoLayoutList();
- EditorGUILayout.Space();
- }
- #endregion
-
- // CHARACTER TABLE TABLE
- #region Character Table
- EditorGUIUtility.labelWidth = labelWidth;
- EditorGUIUtility.fieldWidth = fieldWidth;
- EditorGUI.indentLevel = 0;
- rect = EditorGUILayout.GetControlRect(false, 24);
-
- int characterCount = m_fontAsset.characterTable.Count;
-
- if (GUI.Button(rect, new GUIContent("Character Table [" + characterCount + "]" + (rect.width > 320 ? " Characters" : ""), "List of characters contained in this font asset."), TMP_UIStyleManager.sectionHeader))
- UI_PanelState.characterTablePanel = !UI_PanelState.characterTablePanel;
-
- GUI.Label(rect, (UI_PanelState.characterTablePanel ? "" : s_UiStateLabel[1]), TMP_UIStyleManager.rightLabel);
-
- if (UI_PanelState.characterTablePanel)
- {
- int arraySize = m_CharacterTable_prop.arraySize;
- int itemsPerPage = 15;
-
- // Display Glyph Management Tools
- EditorGUILayout.BeginVertical(EditorStyles.helpBox);
- {
- // Search Bar implementation
- #region DISPLAY SEARCH BAR
- EditorGUILayout.BeginHorizontal();
- {
- EditorGUIUtility.labelWidth = 130f;
- EditorGUI.BeginChangeCheck();
- string searchPattern = EditorGUILayout.TextField("Character Search", m_CharacterSearchPattern, "SearchTextField");
- if (EditorGUI.EndChangeCheck() || m_isSearchDirty)
- {
- if (string.IsNullOrEmpty(searchPattern) == false)
- {
- m_CharacterSearchPattern = searchPattern;
-
- // Search Character Table for potential matches
- SearchCharacterTable (m_CharacterSearchPattern, ref m_CharacterSearchList);
- }
- else
- m_CharacterSearchPattern = null;
-
- m_isSearchDirty = false;
- }
-
- string styleName = string.IsNullOrEmpty(m_CharacterSearchPattern) ? "SearchCancelButtonEmpty" : "SearchCancelButton";
- if (GUILayout.Button(GUIContent.none, styleName))
- {
- GUIUtility.keyboardControl = 0;
- m_CharacterSearchPattern = string.Empty;
- }
- }
- EditorGUILayout.EndHorizontal();
- #endregion
-
- // Display Page Navigation
- if (!string.IsNullOrEmpty(m_CharacterSearchPattern))
- arraySize = m_CharacterSearchList.Count;
-
- DisplayPageNavigation(ref m_CurrentCharacterPage, arraySize, itemsPerPage);
- }
- EditorGUILayout.EndVertical();
-
- // Display Character Table Elements
- if (arraySize > 0)
- {
- // Display each character entry using the CharacterPropertyDrawer.
- for (int i = itemsPerPage * m_CurrentCharacterPage; i < arraySize && i < itemsPerPage * (m_CurrentCharacterPage + 1); i++)
- {
- // Define the start of the selection region of the element.
- Rect elementStartRegion = GUILayoutUtility.GetRect(0f, 0f, GUILayout.ExpandWidth(true));
-
- int elementIndex = i;
- if (!string.IsNullOrEmpty(m_CharacterSearchPattern))
- elementIndex = m_CharacterSearchList[i];
-
- SerializedProperty characterProperty = m_CharacterTable_prop.GetArrayElementAtIndex(elementIndex);
-
- EditorGUILayout.BeginVertical(EditorStyles.helpBox);
-
- EditorGUI.BeginDisabledGroup(i != m_SelectedCharacterRecord);
- {
- EditorGUILayout.PropertyField(characterProperty);
- }
- EditorGUI.EndDisabledGroup();
-
- EditorGUILayout.EndVertical();
-
- // Define the end of the selection region of the element.
- Rect elementEndRegion = GUILayoutUtility.GetRect(0f, 0f, GUILayout.ExpandWidth(true));
-
- // Check for Item selection
- Rect selectionArea = new Rect(elementStartRegion.x, elementStartRegion.y, elementEndRegion.width, elementEndRegion.y - elementStartRegion.y);
- if (DoSelectionCheck(selectionArea))
- {
- if (m_SelectedCharacterRecord == i)
- m_SelectedCharacterRecord = -1;
- else
- {
- m_SelectedCharacterRecord = i;
- m_AddCharacterWarning.isEnabled = false;
- m_unicodeHexLabel = k_placeholderUnicodeHex;
- GUIUtility.keyboardControl = 0;
- }
- }
-
- // Draw Selection Highlight and Glyph Options
- if (m_SelectedCharacterRecord == i)
- {
- TMP_EditorUtility.DrawBox(selectionArea, 2f, new Color32(40, 192, 255, 255));
-
- // Draw Glyph management options
- Rect controlRect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight * 1f);
- float optionAreaWidth = controlRect.width * 0.6f;
- float btnWidth = optionAreaWidth / 3;
-
- Rect position = new Rect(controlRect.x + controlRect.width * .4f, controlRect.y, btnWidth, controlRect.height);
-
- // Copy Selected Glyph to Target Glyph ID
- GUI.enabled = !string.IsNullOrEmpty(m_dstUnicode);
- if (GUI.Button(position, new GUIContent("Copy to")))
- {
- GUIUtility.keyboardControl = 0;
-
- // Convert Hex Value to Decimal
- int dstGlyphID = TMP_TextUtilities.StringHexToInt(m_dstUnicode);
-
- //Add new glyph at target Unicode hex id.
- if (!AddNewCharacter(elementIndex, dstGlyphID))
- {
- m_AddCharacterWarning.isEnabled = true;
- m_AddCharacterWarning.expirationTime = EditorApplication.timeSinceStartup + 1;
- }
-
- m_dstUnicode = string.Empty;
- m_isSearchDirty = true;
-
- TMPro_EventManager.ON_FONT_PROPERTY_CHANGED(true, m_fontAsset);
- }
-
- // Target Glyph ID
- GUI.enabled = true;
- position.x += btnWidth;
-
- GUI.SetNextControlName("CharacterID_Input");
- m_dstUnicode = EditorGUI.TextField(position, m_dstUnicode);
-
- // Placeholder text
- EditorGUI.LabelField(position, new GUIContent(m_unicodeHexLabel, "The Unicode (Hex) ID of the duplicated Character"), TMP_UIStyleManager.label);
-
- // Only filter the input when the destination glyph ID text field has focus.
- if (GUI.GetNameOfFocusedControl() == "CharacterID_Input")
- {
- m_unicodeHexLabel = string.Empty;
-
- //Filter out unwanted characters.
- char chr = Event.current.character;
- if ((chr < '0' || chr > '9') && (chr < 'a' || chr > 'f') && (chr < 'A' || chr > 'F'))
- {
- Event.current.character = '\0';
- }
- }
- else
- {
- m_unicodeHexLabel = k_placeholderUnicodeHex;
- //m_dstUnicode = string.Empty;
- }
-
-
- // Remove Glyph
- position.x += btnWidth;
- if (GUI.Button(position, "Remove"))
- {
- GUIUtility.keyboardControl = 0;
-
- RemoveCharacterFromList(elementIndex);
-
- isAssetDirty = true;
- m_SelectedCharacterRecord = -1;
- m_isSearchDirty = true;
- break;
- }
-
- if (m_AddCharacterWarning.isEnabled && EditorApplication.timeSinceStartup < m_AddCharacterWarning.expirationTime)
- {
- EditorGUILayout.HelpBox("The Destination Character ID already exists", MessageType.Warning);
- }
-
- }
- }
- }
-
- DisplayPageNavigation(ref m_CurrentCharacterPage, arraySize, itemsPerPage);
-
- EditorGUILayout.Space();
- }
- #endregion
-
- // GLYPH TABLE
- #region Glyph Table
- EditorGUIUtility.labelWidth = labelWidth;
- EditorGUIUtility.fieldWidth = fieldWidth;
- EditorGUI.indentLevel = 0;
- rect = EditorGUILayout.GetControlRect(false, 24);
-
- GUIStyle glyphPanelStyle = new GUIStyle(EditorStyles.helpBox);
-
- int glyphCount = m_fontAsset.glyphTable.Count;
-
- if (GUI.Button(rect, new GUIContent("Glyph Table [" + glyphCount + "]" + (rect.width > 275 ? " Glyphs" : ""), "List of glyphs contained in this font asset."), TMP_UIStyleManager.sectionHeader))
- UI_PanelState.glyphTablePanel = !UI_PanelState.glyphTablePanel;
-
- GUI.Label(rect, (UI_PanelState.glyphTablePanel ? "" : s_UiStateLabel[1]), TMP_UIStyleManager.rightLabel);
-
- if (UI_PanelState.glyphTablePanel)
- {
- int arraySize = m_GlyphTable_prop.arraySize;
- int itemsPerPage = 15;
-
- // Display Glyph Management Tools
- EditorGUILayout.BeginVertical(EditorStyles.helpBox);
- {
- // Search Bar implementation
- #region DISPLAY SEARCH BAR
- EditorGUILayout.BeginHorizontal();
- {
- EditorGUIUtility.labelWidth = 130f;
- EditorGUI.BeginChangeCheck();
- string searchPattern = EditorGUILayout.TextField("Glyph Search", m_GlyphSearchPattern, "SearchTextField");
- if (EditorGUI.EndChangeCheck() || m_isSearchDirty)
- {
- if (string.IsNullOrEmpty(searchPattern) == false)
- {
- m_GlyphSearchPattern = searchPattern;
-
- // Search Glyph Table for potential matches
- SearchGlyphTable(m_GlyphSearchPattern, ref m_GlyphSearchList);
- }
- else
- m_GlyphSearchPattern = null;
-
- m_isSearchDirty = false;
- }
-
- string styleName = string.IsNullOrEmpty(m_GlyphSearchPattern) ? "SearchCancelButtonEmpty" : "SearchCancelButton";
- if (GUILayout.Button(GUIContent.none, styleName))
- {
- GUIUtility.keyboardControl = 0;
- m_GlyphSearchPattern = string.Empty;
- }
- }
- EditorGUILayout.EndHorizontal();
- #endregion
-
- // Display Page Navigation
- if (!string.IsNullOrEmpty(m_GlyphSearchPattern))
- arraySize = m_GlyphSearchList.Count;
-
- DisplayPageNavigation(ref m_CurrentGlyphPage, arraySize, itemsPerPage);
- }
- EditorGUILayout.EndVertical();
-
- // Display Glyph Table Elements
-
- if (arraySize > 0)
- {
- // Display each GlyphInfo entry using the GlyphInfo property drawer.
- for (int i = itemsPerPage * m_CurrentGlyphPage; i < arraySize && i < itemsPerPage * (m_CurrentGlyphPage + 1); i++)
- {
- // Define the start of the selection region of the element.
- Rect elementStartRegion = GUILayoutUtility.GetRect(0f, 0f, GUILayout.ExpandWidth(true));
-
- int elementIndex = i;
- if (!string.IsNullOrEmpty(m_GlyphSearchPattern))
- elementIndex = m_GlyphSearchList[i];
-
- SerializedProperty glyphProperty = m_GlyphTable_prop.GetArrayElementAtIndex(elementIndex);
-
- EditorGUILayout.BeginVertical(glyphPanelStyle);
-
- using (new EditorGUI.DisabledScope(i != m_SelectedGlyphRecord))
- {
- EditorGUILayout.PropertyField(glyphProperty);
- }
-
- EditorGUILayout.EndVertical();
-
- // Define the end of the selection region of the element.
- Rect elementEndRegion = GUILayoutUtility.GetRect(0f, 0f, GUILayout.ExpandWidth(true));
-
- // Check for Item selection
- Rect selectionArea = new Rect(elementStartRegion.x, elementStartRegion.y, elementEndRegion.width, elementEndRegion.y - elementStartRegion.y);
- if (DoSelectionCheck(selectionArea))
- {
- if (m_SelectedGlyphRecord == i)
- m_SelectedGlyphRecord = -1;
- else
- {
- m_SelectedGlyphRecord = i;
- m_AddGlyphWarning.isEnabled = false;
- m_unicodeHexLabel = k_placeholderUnicodeHex;
- GUIUtility.keyboardControl = 0;
- }
- }
-
- // Draw Selection Highlight and Glyph Options
- if (m_SelectedGlyphRecord == i)
- {
- TMP_EditorUtility.DrawBox(selectionArea, 2f, new Color32(40, 192, 255, 255));
-
- // Draw Glyph management options
- Rect controlRect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight * 1f);
- float optionAreaWidth = controlRect.width * 0.6f;
- float btnWidth = optionAreaWidth / 3;
-
- Rect position = new Rect(controlRect.x + controlRect.width * .4f, controlRect.y, btnWidth, controlRect.height);
-
- // Copy Selected Glyph to Target Glyph ID
- GUI.enabled = !string.IsNullOrEmpty(m_dstGlyphID);
- if (GUI.Button(position, new GUIContent("Copy to")))
- {
- GUIUtility.keyboardControl = 0;
- int dstGlyphID;
-
- // Convert Hex Value to Decimal
- int.TryParse(m_dstGlyphID, out dstGlyphID);
-
- //Add new glyph at target Unicode hex id.
- if (!AddNewGlyph(elementIndex, dstGlyphID))
- {
- m_AddGlyphWarning.isEnabled = true;
- m_AddGlyphWarning.expirationTime = EditorApplication.timeSinceStartup + 1;
- }
-
- m_dstGlyphID = string.Empty;
- m_isSearchDirty = true;
-
- TMPro_EventManager.ON_FONT_PROPERTY_CHANGED(true, m_fontAsset);
- }
-
- // Target Glyph ID
- GUI.enabled = true;
- position.x += btnWidth;
-
- GUI.SetNextControlName("GlyphID_Input");
- m_dstGlyphID = EditorGUI.TextField(position, m_dstGlyphID);
-
- // Placeholder text
- EditorGUI.LabelField(position, new GUIContent(m_GlyphIDLabel, "The Glyph ID of the duplicated Glyph"), TMP_UIStyleManager.label);
-
- // Only filter the input when the destination glyph ID text field has focus.
- if (GUI.GetNameOfFocusedControl() == "GlyphID_Input")
- {
- m_GlyphIDLabel = string.Empty;
-
- //Filter out unwanted characters.
- char chr = Event.current.character;
- if ((chr < '0' || chr > '9'))
- {
- Event.current.character = '\0';
- }
- }
- else
- {
- m_GlyphIDLabel = k_placeholderGlyphID;
- //m_dstGlyphID = string.Empty;
- }
-
- // Remove Glyph
- position.x += btnWidth;
- if (GUI.Button(position, "Remove"))
- {
- GUIUtility.keyboardControl = 0;
-
- RemoveGlyphFromList(elementIndex);
-
- isAssetDirty = true;
- m_SelectedGlyphRecord = -1;
- m_isSearchDirty = true;
- break;
- }
-
- if (m_AddGlyphWarning.isEnabled && EditorApplication.timeSinceStartup < m_AddGlyphWarning.expirationTime)
- {
- EditorGUILayout.HelpBox("The Destination Glyph ID already exists", MessageType.Warning);
- }
-
- }
- }
- }
-
- DisplayPageNavigation(ref m_CurrentGlyphPage, arraySize, itemsPerPage);
-
- EditorGUILayout.Space();
- }
- #endregion
-
- // FONT FEATURE TABLE
- #region Font Feature Table
- EditorGUIUtility.labelWidth = labelWidth;
- EditorGUIUtility.fieldWidth = fieldWidth;
- EditorGUI.indentLevel = 0;
- rect = EditorGUILayout.GetControlRect(false, 24);
-
- int adjustmentPairCount = m_fontAsset.fontFeatureTable.glyphPairAdjustmentRecords.Count;
-
- if (GUI.Button(rect, new GUIContent("Glyph Adjustment Table [" + adjustmentPairCount + "]" + (rect.width > 340 ? " Records" : ""), "List of glyph adjustment / advanced kerning pairs."), TMP_UIStyleManager.sectionHeader))
- UI_PanelState.fontFeatureTablePanel = !UI_PanelState.fontFeatureTablePanel;
-
- GUI.Label(rect, (UI_PanelState.fontFeatureTablePanel ? "" : s_UiStateLabel[1]), TMP_UIStyleManager.rightLabel);
-
- if (UI_PanelState.fontFeatureTablePanel)
- {
- int arraySize = m_GlyphPairAdjustmentRecords_prop.arraySize;
- int itemsPerPage = 20;
-
- // Display Kerning Pair Management Tools
- EditorGUILayout.BeginVertical(EditorStyles.helpBox);
- {
- // Search Bar implementation
- #region DISPLAY SEARCH BAR
- EditorGUILayout.BeginHorizontal();
- {
- EditorGUIUtility.labelWidth = 150f;
- EditorGUI.BeginChangeCheck();
- string searchPattern = EditorGUILayout.TextField("Adjustment Pair Search", m_KerningTableSearchPattern, "SearchTextField");
- if (EditorGUI.EndChangeCheck() || m_isSearchDirty)
- {
- if (string.IsNullOrEmpty(searchPattern) == false)
- {
- m_KerningTableSearchPattern = searchPattern;
-
- // Search Glyph Table for potential matches
- SearchKerningTable(m_KerningTableSearchPattern, ref m_KerningTableSearchList);
- }
- else
- m_KerningTableSearchPattern = null;
-
- m_isSearchDirty = false;
- }
-
- string styleName = string.IsNullOrEmpty(m_KerningTableSearchPattern) ? "SearchCancelButtonEmpty" : "SearchCancelButton";
- if (GUILayout.Button(GUIContent.none, styleName))
- {
- GUIUtility.keyboardControl = 0;
- m_KerningTableSearchPattern = string.Empty;
- }
- }
- EditorGUILayout.EndHorizontal();
- #endregion
-
- // Display Page Navigation
- if (!string.IsNullOrEmpty(m_KerningTableSearchPattern))
- arraySize = m_KerningTableSearchList.Count;
-
- DisplayPageNavigation(ref m_CurrentKerningPage, arraySize, itemsPerPage);
- }
- EditorGUILayout.EndVertical();
-
- if (arraySize > 0)
- {
- // Display each GlyphInfo entry using the GlyphInfo property drawer.
- for (int i = itemsPerPage * m_CurrentKerningPage; i < arraySize && i < itemsPerPage * (m_CurrentKerningPage + 1); i++)
- {
- // Define the start of the selection region of the element.
- Rect elementStartRegion = GUILayoutUtility.GetRect(0f, 0f, GUILayout.ExpandWidth(true));
-
- int elementIndex = i;
- if (!string.IsNullOrEmpty(m_KerningTableSearchPattern))
- elementIndex = m_KerningTableSearchList[i];
-
- SerializedProperty pairAdjustmentRecordProperty = m_GlyphPairAdjustmentRecords_prop.GetArrayElementAtIndex(elementIndex);
-
- EditorGUILayout.BeginVertical(EditorStyles.helpBox);
-
- using (new EditorGUI.DisabledScope(i != m_SelectedAdjustmentRecord))
- {
- EditorGUILayout.PropertyField(pairAdjustmentRecordProperty, new GUIContent("Selectable"));
- }
-
- EditorGUILayout.EndVertical();
-
- // Define the end of the selection region of the element.
- Rect elementEndRegion = GUILayoutUtility.GetRect(0f, 0f, GUILayout.ExpandWidth(true));
-
- // Check for Item selection
- Rect selectionArea = new Rect(elementStartRegion.x, elementStartRegion.y, elementEndRegion.width, elementEndRegion.y - elementStartRegion.y);
- if (DoSelectionCheck(selectionArea))
- {
- if (m_SelectedAdjustmentRecord == i)
- {
- m_SelectedAdjustmentRecord = -1;
- }
- else
- {
- m_SelectedAdjustmentRecord = i;
- GUIUtility.keyboardControl = 0;
- }
- }
-
- // Draw Selection Highlight and Kerning Pair Options
- if (m_SelectedAdjustmentRecord == i)
- {
- TMP_EditorUtility.DrawBox(selectionArea, 2f, new Color32(40, 192, 255, 255));
-
- // Draw Glyph management options
- Rect controlRect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight * 1f);
- float optionAreaWidth = controlRect.width;
- float btnWidth = optionAreaWidth / 4;
-
- Rect position = new Rect(controlRect.x + controlRect.width - btnWidth, controlRect.y, btnWidth, controlRect.height);
-
- // Remove Kerning pair
- GUI.enabled = true;
- if (GUI.Button(position, "Remove"))
- {
- GUIUtility.keyboardControl = 0;
-
- RemoveAdjustmentPairFromList(i);
-
- isAssetDirty = true;
- m_SelectedAdjustmentRecord = -1;
- m_isSearchDirty = true;
- break;
- }
- }
- }
- }
-
- DisplayPageNavigation(ref m_CurrentKerningPage, arraySize, itemsPerPage);
-
- GUILayout.Space(5);
-
- // Add new kerning pair
- EditorGUILayout.BeginVertical(EditorStyles.helpBox);
- {
- EditorGUILayout.PropertyField(m_EmptyGlyphPairAdjustmentRecord_prop);
- }
- EditorGUILayout.EndVertical();
-
- if (GUILayout.Button("Add New Glyph Adjustment Record"))
- {
- SerializedProperty firstAdjustmentRecordProperty = m_EmptyGlyphPairAdjustmentRecord_prop.FindPropertyRelative("m_FirstAdjustmentRecord");
- SerializedProperty secondAdjustmentRecordProperty = m_EmptyGlyphPairAdjustmentRecord_prop.FindPropertyRelative("m_SecondAdjustmentRecord");
-
- uint firstGlyphIndex = (uint)firstAdjustmentRecordProperty.FindPropertyRelative("m_GlyphIndex").intValue;
- uint secondGlyphIndex = (uint)secondAdjustmentRecordProperty.FindPropertyRelative("m_GlyphIndex").intValue;
-
- TMP_GlyphValueRecord firstValueRecord = GetValueRecord(firstAdjustmentRecordProperty.FindPropertyRelative("m_GlyphValueRecord"));
- TMP_GlyphValueRecord secondValueRecord = GetValueRecord(secondAdjustmentRecordProperty.FindPropertyRelative("m_GlyphValueRecord"));
-
- errorCode = -1;
- uint pairKey = secondGlyphIndex << 16 | firstGlyphIndex;
- if (m_FontFeatureTable.m_GlyphPairAdjustmentRecordLookupDictionary.ContainsKey(pairKey) == false)
- {
- TMP_GlyphPairAdjustmentRecord adjustmentRecord = new TMP_GlyphPairAdjustmentRecord(new TMP_GlyphAdjustmentRecord(firstGlyphIndex, firstValueRecord), new TMP_GlyphAdjustmentRecord(secondGlyphIndex, secondValueRecord));
- m_FontFeatureTable.m_GlyphPairAdjustmentRecords.Add(adjustmentRecord);
- m_FontFeatureTable.m_GlyphPairAdjustmentRecordLookupDictionary.Add(pairKey, adjustmentRecord);
- errorCode = 0;
- }
-
- // Add glyphs and characters
- TMP_Character character;
-
- uint firstCharacter = m_SerializedPropertyHolder.firstCharacter;
- if (!m_fontAsset.characterLookupTable.ContainsKey(firstCharacter))
- m_fontAsset.TryAddCharacterInternal(firstCharacter, out character);
-
- uint secondCharacter = m_SerializedPropertyHolder.secondCharacter;
- if (!m_fontAsset.characterLookupTable.ContainsKey(secondCharacter))
- m_fontAsset.TryAddCharacterInternal(secondCharacter, out character);
-
- // Sort Kerning Pairs & Reload Font Asset if new kerning pair was added.
- if (errorCode != -1)
- {
- m_FontFeatureTable.SortGlyphPairAdjustmentRecords();
- serializedObject.ApplyModifiedProperties();
- isAssetDirty = true;
- m_isSearchDirty = true;
- }
- else
- {
- timeStamp = System.DateTime.Now.AddSeconds(5);
- }
-
- // Clear Add Kerning Pair Panel
- // TODO
- }
-
- if (errorCode == -1)
- {
- GUILayout.BeginHorizontal();
- GUILayout.FlexibleSpace();
- GUILayout.Label("Kerning Pair already exists!", TMP_UIStyleManager.label);
- GUILayout.FlexibleSpace();
- GUILayout.EndHorizontal();
-
- if (System.DateTime.Now > timeStamp)
- errorCode = 0;
- }
- }
- #endregion
-
- if (serializedObject.ApplyModifiedProperties() || evt_cmd == k_UndoRedo || isAssetDirty)
- {
- // Delay callback until user has decided to Apply or Revert the changes.
- if (m_DisplayDestructiveChangeWarning == false)
- TMPro_EventManager.ON_FONT_PROPERTY_CHANGED(true, m_fontAsset);
-
- if (m_fontAsset.IsFontAssetLookupTablesDirty || evt_cmd == k_UndoRedo)
- m_fontAsset.ReadFontAssetDefinition();
-
- isAssetDirty = false;
- EditorUtility.SetDirty(target);
- }
-
-
- // Clear selection if mouse event was not consumed.
- GUI.enabled = true;
- if (currentEvent.type == EventType.MouseDown && currentEvent.button == 0)
- m_SelectedAdjustmentRecord = -1;
-
- }
-
- void CleanFallbackFontAssetTable()
- {
- SerializedProperty m_FallbackFontAsseTable = serializedObject.FindProperty("m_FallbackFontAssetTable");
-
- bool isListDirty = false;
-
- int elementCount = m_FallbackFontAsseTable.arraySize;
-
- for (int i = 0; i < elementCount; i++)
- {
- SerializedProperty element = m_FallbackFontAsseTable.GetArrayElementAtIndex(i);
- if (element.objectReferenceValue == null)
- {
- m_FallbackFontAsseTable.DeleteArrayElementAtIndex(i);
- elementCount -= 1;
- i -= 1;
-
- isListDirty = true;
- }
- }
-
- if (isListDirty)
- {
- serializedObject.ApplyModifiedProperties();
- serializedObject.Update();
- }
- }
-
- void SavedAtlasGenerationSettings()
- {
- m_AtlasSettings.glyphRenderMode = (GlyphRenderMode)m_AtlasRenderMode_prop.intValue;
- m_AtlasSettings.pointSize = m_SamplingPointSize_prop.intValue;
- m_AtlasSettings.padding = m_AtlasPadding_prop.intValue;
- m_AtlasSettings.atlasWidth = m_AtlasWidth_prop.intValue;
- m_AtlasSettings.atlasHeight = m_AtlasHeight_prop.intValue;
- }
-
- void RestoreAtlasGenerationSettings()
- {
- m_AtlasRenderMode_prop.intValue = (int)m_AtlasSettings.glyphRenderMode;
- m_SamplingPointSize_prop.intValue = m_AtlasSettings.pointSize;
- m_AtlasPadding_prop.intValue = m_AtlasSettings.padding;
- m_AtlasWidth_prop.intValue = m_AtlasSettings.atlasWidth;
- m_AtlasHeight_prop.intValue = m_AtlasSettings.atlasHeight;
- }
-
-
- void UpdateFontAssetCreationSettings()
- {
- m_fontAsset.m_CreationSettings.pointSize = m_SamplingPointSize_prop.intValue;
- m_fontAsset.m_CreationSettings.renderMode = m_AtlasRenderMode_prop.intValue;
- m_fontAsset.m_CreationSettings.padding = m_AtlasPadding_prop.intValue;
- m_fontAsset.m_CreationSettings.atlasWidth = m_AtlasWidth_prop.intValue;
- m_fontAsset.m_CreationSettings.atlasHeight = m_AtlasHeight_prop.intValue;
- }
-
-
- void UpdateCharacterData(SerializedProperty property, int index)
- {
- TMP_Character character = m_fontAsset.characterTable[index];
-
- character.unicode = (uint)property.FindPropertyRelative("m_Unicode").intValue;
- character.scale = property.FindPropertyRelative("m_Scale").floatValue;
-
- SerializedProperty glyphProperty = property.FindPropertyRelative("m_Glyph");
- character.glyph.index = (uint)glyphProperty.FindPropertyRelative("m_Index").intValue;
-
- SerializedProperty glyphRectProperty = glyphProperty.FindPropertyRelative("m_GlyphRect");
- character.glyph.glyphRect = new GlyphRect(glyphRectProperty.FindPropertyRelative("m_X").intValue, glyphRectProperty.FindPropertyRelative("m_Y").intValue, glyphRectProperty.FindPropertyRelative("m_Width").intValue, glyphRectProperty.FindPropertyRelative("m_Height").intValue);
-
- SerializedProperty glyphMetricsProperty = glyphProperty.FindPropertyRelative("m_Metrics");
- character.glyph.metrics = new GlyphMetrics(glyphMetricsProperty.FindPropertyRelative("m_Width").floatValue, glyphMetricsProperty.FindPropertyRelative("m_Height").floatValue, glyphMetricsProperty.FindPropertyRelative("m_HorizontalBearingX").floatValue, glyphMetricsProperty.FindPropertyRelative("m_HorizontalBearingY").floatValue, glyphMetricsProperty.FindPropertyRelative("m_HorizontalAdvance").floatValue);
-
- character.glyph.scale = glyphProperty.FindPropertyRelative("m_Scale").floatValue;
-
- character.glyph.atlasIndex = glyphProperty.FindPropertyRelative("m_AtlasIndex").intValue;
- }
-
-
- void UpdateGlyphData(SerializedProperty property, int index)
- {
- Glyph glyph = m_fontAsset.glyphTable[index];
-
- glyph.index = (uint)property.FindPropertyRelative("m_Index").intValue;
-
- SerializedProperty glyphRect = property.FindPropertyRelative("m_GlyphRect");
- glyph.glyphRect = new GlyphRect(glyphRect.FindPropertyRelative("m_X").intValue, glyphRect.FindPropertyRelative("m_Y").intValue, glyphRect.FindPropertyRelative("m_Width").intValue, glyphRect.FindPropertyRelative("m_Height").intValue);
-
- SerializedProperty glyphMetrics = property.FindPropertyRelative("m_Metrics");
- glyph.metrics = new GlyphMetrics(glyphMetrics.FindPropertyRelative("m_Width").floatValue, glyphMetrics.FindPropertyRelative("m_Height").floatValue, glyphMetrics.FindPropertyRelative("m_HorizontalBearingX").floatValue, glyphMetrics.FindPropertyRelative("m_HorizontalBearingY").floatValue, glyphMetrics.FindPropertyRelative("m_HorizontalAdvance").floatValue);
-
- glyph.scale = property.FindPropertyRelative("m_Scale").floatValue;
- }
-
-
- void DisplayPageNavigation(ref int currentPage, int arraySize, int itemsPerPage)
- {
- Rect pagePos = EditorGUILayout.GetControlRect(false, 20);
- pagePos.width /= 3;
-
- int shiftMultiplier = Event.current.shift ? 10 : 1; // Page + Shift goes 10 page forward
-
- // Previous Page
- GUI.enabled = currentPage > 0;
-
- if (GUI.Button(pagePos, "Previous Page"))
- currentPage -= 1 * shiftMultiplier;
-
-
- // Page Counter
- GUI.enabled = true;
- pagePos.x += pagePos.width;
- int totalPages = (int)(arraySize / (float)itemsPerPage + 0.999f);
- GUI.Label(pagePos, "Page " + (currentPage + 1) + " / " + totalPages, TMP_UIStyleManager.centeredLabel);
-
- // Next Page
- pagePos.x += pagePos.width;
- GUI.enabled = itemsPerPage * (currentPage + 1) < arraySize;
-
- if (GUI.Button(pagePos, "Next Page"))
- currentPage += 1 * shiftMultiplier;
-
- // Clamp page range
- currentPage = Mathf.Clamp(currentPage, 0, arraySize / itemsPerPage);
-
- GUI.enabled = true;
- }
-
-
- ///
- ///
- ///
- ///
- ///
- bool AddNewGlyph(int srcIndex, int dstGlyphID)
- {
- // Make sure Destination Glyph ID doesn't already contain a Glyph
- if (m_fontAsset.glyphLookupTable.ContainsKey((uint)dstGlyphID))
- return false;
-
- // Add new element to glyph list.
- m_GlyphTable_prop.arraySize += 1;
-
- // Get a reference to the source glyph.
- SerializedProperty sourceGlyph = m_GlyphTable_prop.GetArrayElementAtIndex(srcIndex);
-
- int dstIndex = m_GlyphTable_prop.arraySize - 1;
-
- // Get a reference to the target / destination glyph.
- SerializedProperty targetGlyph = m_GlyphTable_prop.GetArrayElementAtIndex(dstIndex);
-
- CopyGlyphSerializedProperty(sourceGlyph, ref targetGlyph);
-
- // Update the ID of the glyph
- targetGlyph.FindPropertyRelative("m_Index").intValue = dstGlyphID;
-
- serializedObject.ApplyModifiedProperties();
-
- m_fontAsset.SortGlyphTable();
-
- m_fontAsset.ReadFontAssetDefinition();
-
- return true;
- }
-
- ///
- ///
- ///
- ///
- void RemoveGlyphFromList(int index)
- {
- if (index > m_GlyphTable_prop.arraySize)
- return;
-
- int targetGlyphIndex = m_GlyphTable_prop.GetArrayElementAtIndex(index).FindPropertyRelative("m_Index").intValue;
-
- m_GlyphTable_prop.DeleteArrayElementAtIndex(index);
-
- // Remove all characters referencing this glyph.
- for (int i = 0; i < m_CharacterTable_prop.arraySize; i++)
- {
- int glyphIndex = m_CharacterTable_prop.GetArrayElementAtIndex(i).FindPropertyRelative("m_GlyphIndex").intValue;
-
- if (glyphIndex == targetGlyphIndex)
- {
- // Remove character
- m_CharacterTable_prop.DeleteArrayElementAtIndex(i);
- }
- }
-
- serializedObject.ApplyModifiedProperties();
-
- m_fontAsset.ReadFontAssetDefinition();
- }
-
- bool AddNewCharacter(int srcIndex, int dstGlyphID)
- {
- // Make sure Destination Glyph ID doesn't already contain a Glyph
- if (m_fontAsset.characterLookupTable.ContainsKey((uint)dstGlyphID))
- return false;
-
- // Add new element to glyph list.
- m_CharacterTable_prop.arraySize += 1;
-
- // Get a reference to the source glyph.
- SerializedProperty sourceCharacter = m_CharacterTable_prop.GetArrayElementAtIndex(srcIndex);
-
- int dstIndex = m_CharacterTable_prop.arraySize - 1;
-
- // Get a reference to the target / destination glyph.
- SerializedProperty targetCharacter = m_CharacterTable_prop.GetArrayElementAtIndex(dstIndex);
-
- CopyCharacterSerializedProperty(sourceCharacter, ref targetCharacter);
-
- // Update the ID of the glyph
- targetCharacter.FindPropertyRelative("m_Unicode").intValue = dstGlyphID;
-
- serializedObject.ApplyModifiedProperties();
-
- m_fontAsset.SortCharacterTable();
-
- m_fontAsset.ReadFontAssetDefinition();
-
- return true;
- }
-
- void RemoveCharacterFromList(int index)
- {
- if (index > m_CharacterTable_prop.arraySize)
- return;
-
- m_CharacterTable_prop.DeleteArrayElementAtIndex(index);
-
- serializedObject.ApplyModifiedProperties();
-
- m_fontAsset.ReadFontAssetDefinition();
- }
-
-
- // Check if any of the Style elements were clicked on.
- private bool DoSelectionCheck(Rect selectionArea)
- {
- Event currentEvent = Event.current;
-
- switch (currentEvent.type)
- {
- case EventType.MouseDown:
- if (selectionArea.Contains(currentEvent.mousePosition) && currentEvent.button == 0)
- {
- currentEvent.Use();
- return true;
- }
-
- break;
- }
-
- return false;
- }
-
- TMP_GlyphValueRecord GetValueRecord(SerializedProperty property)
- {
- TMP_GlyphValueRecord record = new TMP_GlyphValueRecord();
- record.xPlacement = property.FindPropertyRelative("m_XPlacement").floatValue;
- record.yPlacement = property.FindPropertyRelative("m_YPlacement").floatValue;
- record.xAdvance = property.FindPropertyRelative("m_XAdvance").floatValue;
- record.yAdvance = property.FindPropertyRelative("m_YAdvance").floatValue;
-
- return record;
- }
-
- void RemoveAdjustmentPairFromList(int index)
- {
- if (index > m_GlyphPairAdjustmentRecords_prop.arraySize)
- return;
-
- m_GlyphPairAdjustmentRecords_prop.DeleteArrayElementAtIndex(index);
-
- serializedObject.ApplyModifiedProperties();
-
- m_fontAsset.ReadFontAssetDefinition();
- }
-
- ///
- ///
- ///
- ///
- ///
- void CopyGlyphSerializedProperty(SerializedProperty srcGlyph, ref SerializedProperty dstGlyph)
- {
- // TODO : Should make a generic function which copies each of the properties.
- dstGlyph.FindPropertyRelative("m_Index").intValue = srcGlyph.FindPropertyRelative("m_Index").intValue;
-
- // Glyph -> GlyphMetrics
- SerializedProperty srcGlyphMetrics = srcGlyph.FindPropertyRelative("m_Metrics");
- SerializedProperty dstGlyphMetrics = dstGlyph.FindPropertyRelative("m_Metrics");
-
- dstGlyphMetrics.FindPropertyRelative("m_Width").floatValue = srcGlyphMetrics.FindPropertyRelative("m_Width").floatValue;
- dstGlyphMetrics.FindPropertyRelative("m_Height").floatValue = srcGlyphMetrics.FindPropertyRelative("m_Height").floatValue;
- dstGlyphMetrics.FindPropertyRelative("m_HorizontalBearingX").floatValue = srcGlyphMetrics.FindPropertyRelative("m_HorizontalBearingX").floatValue;
- dstGlyphMetrics.FindPropertyRelative("m_HorizontalBearingY").floatValue = srcGlyphMetrics.FindPropertyRelative("m_HorizontalBearingY").floatValue;
- dstGlyphMetrics.FindPropertyRelative("m_HorizontalAdvance").floatValue = srcGlyphMetrics.FindPropertyRelative("m_HorizontalAdvance").floatValue;
-
- // Glyph -> GlyphRect
- SerializedProperty srcGlyphRect = srcGlyph.FindPropertyRelative("m_GlyphRect");
- SerializedProperty dstGlyphRect = dstGlyph.FindPropertyRelative("m_GlyphRect");
-
- dstGlyphRect.FindPropertyRelative("m_X").intValue = srcGlyphRect.FindPropertyRelative("m_X").intValue;
- dstGlyphRect.FindPropertyRelative("m_Y").intValue = srcGlyphRect.FindPropertyRelative("m_Y").intValue;
- dstGlyphRect.FindPropertyRelative("m_Width").intValue = srcGlyphRect.FindPropertyRelative("m_Width").intValue;
- dstGlyphRect.FindPropertyRelative("m_Height").intValue = srcGlyphRect.FindPropertyRelative("m_Height").intValue;
-
- dstGlyph.FindPropertyRelative("m_Scale").floatValue = srcGlyph.FindPropertyRelative("m_Scale").floatValue;
- dstGlyph.FindPropertyRelative("m_AtlasIndex").intValue = srcGlyph.FindPropertyRelative("m_AtlasIndex").intValue;
- }
-
-
- void CopyCharacterSerializedProperty(SerializedProperty source, ref SerializedProperty target)
- {
- // TODO : Should make a generic function which copies each of the properties.
- int unicode = source.FindPropertyRelative("m_Unicode").intValue;
- target.FindPropertyRelative("m_Unicode").intValue = unicode;
-
- int srcGlyphIndex = source.FindPropertyRelative("m_GlyphIndex").intValue;
- target.FindPropertyRelative("m_GlyphIndex").intValue = srcGlyphIndex;
-
- target.FindPropertyRelative("m_Scale").floatValue = source.FindPropertyRelative("m_Scale").floatValue;
- }
-
-
- ///
- ///
- ///
- ///
- ///
- void SearchGlyphTable (string searchPattern, ref List searchResults)
- {
- if (searchResults == null) searchResults = new List();
-
- searchResults.Clear();
-
- int arraySize = m_GlyphTable_prop.arraySize;
-
- for (int i = 0; i < arraySize; i++)
- {
- SerializedProperty sourceGlyph = m_GlyphTable_prop.GetArrayElementAtIndex(i);
-
- int id = sourceGlyph.FindPropertyRelative("m_Index").intValue;
-
- // Check for potential match against a character.
- //if (searchPattern.Length == 1 && id == searchPattern[0])
- // searchResults.Add(i);
-
- // Check for potential match against decimal id
- if (id.ToString().Contains(searchPattern))
- searchResults.Add(i);
-
- //if (id.ToString("x").Contains(searchPattern))
- // searchResults.Add(i);
-
- //if (id.ToString("X").Contains(searchPattern))
- // searchResults.Add(i);
- }
- }
-
-
- void SearchCharacterTable(string searchPattern, ref List searchResults)
- {
- if (searchResults == null) searchResults = new List();
-
- searchResults.Clear();
-
- int arraySize = m_CharacterTable_prop.arraySize;
-
- for (int i = 0; i < arraySize; i++)
- {
- SerializedProperty sourceCharacter = m_CharacterTable_prop.GetArrayElementAtIndex(i);
-
- int id = sourceCharacter.FindPropertyRelative("m_Unicode").intValue;
-
- // Check for potential match against a character.
- if (searchPattern.Length == 1 && id == searchPattern[0])
- searchResults.Add(i);
- else if (id.ToString("x").Contains(searchPattern))
- searchResults.Add(i);
- else if (id.ToString("X").Contains(searchPattern))
- searchResults.Add(i);
-
- // Check for potential match against decimal id
- //if (id.ToString().Contains(searchPattern))
- // searchResults.Add(i);
- }
- }
-
-
- void SearchKerningTable(string searchPattern, ref List searchResults)
- {
- if (searchResults == null) searchResults = new List();
-
- searchResults.Clear();
-
- // Lookup glyph index of potential characters contained in the search pattern.
- uint firstGlyphIndex = 0;
- TMP_Character firstCharacterSearch;
-
- if (searchPattern.Length > 0 && m_fontAsset.characterLookupTable.TryGetValue(searchPattern[0], out firstCharacterSearch))
- firstGlyphIndex = firstCharacterSearch.glyphIndex;
-
- uint secondGlyphIndex = 0;
- TMP_Character secondCharacterSearch;
-
- if (searchPattern.Length > 1 && m_fontAsset.characterLookupTable.TryGetValue(searchPattern[1], out secondCharacterSearch))
- secondGlyphIndex = secondCharacterSearch.glyphIndex;
-
- int arraySize = m_GlyphPairAdjustmentRecords_prop.arraySize;
-
- for (int i = 0; i < arraySize; i++)
- {
- SerializedProperty record = m_GlyphPairAdjustmentRecords_prop.GetArrayElementAtIndex(i);
-
- SerializedProperty firstAdjustmentRecord = record.FindPropertyRelative("m_FirstAdjustmentRecord");
- SerializedProperty secondAdjustmentRecord = record.FindPropertyRelative("m_SecondAdjustmentRecord");
-
- int firstGlyph = firstAdjustmentRecord.FindPropertyRelative("m_GlyphIndex").intValue;
- int secondGlyph = secondAdjustmentRecord.FindPropertyRelative("m_GlyphIndex").intValue;
-
- if (firstGlyphIndex == firstGlyph && secondGlyphIndex == secondGlyph)
- searchResults.Add(i);
- else if (searchPattern.Length == 1 && (firstGlyphIndex == firstGlyph || firstGlyphIndex == secondGlyph))
- searchResults.Add(i);
- else if (firstGlyph.ToString().Contains(searchPattern))
- searchResults.Add(i);
- else if (secondGlyph.ToString().Contains(searchPattern))
- searchResults.Add(i);
- }
- }
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_FontAssetEditor.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_FontAssetEditor.cs.meta
deleted file mode 100644
index 9b26bae5..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_FontAssetEditor.cs.meta
+++ /dev/null
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 96b44f7d98314b139324a8a87eb66067
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_FontAsset_CreationMenu.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_FontAsset_CreationMenu.cs
deleted file mode 100644
index 344965cc..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_FontAsset_CreationMenu.cs
+++ /dev/null
@@ -1,235 +0,0 @@
-using UnityEngine;
-using UnityEditor;
-using System.Linq;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine.TextCore;
-using UnityEngine.TextCore.LowLevel;
-using TMPro;
-
-
-namespace TMPro
-{
- public static class TMP_FontAsset_CreationMenu
- {
- [MenuItem("Assets/Create/TextMeshPro/Font Asset Variant", false, 105)]
- public static void CreateFontAssetVariant()
- {
- Object target = Selection.activeObject;
-
- // Make sure the selection is a font file
- if (target == null || target.GetType() != typeof(TMP_FontAsset))
- {
- Debug.LogWarning("A Font file must first be selected in order to create a Font Asset.");
- return;
- }
-
- TMP_FontAsset sourceFontAsset = (TMP_FontAsset)target;
-
- string sourceFontFilePath = AssetDatabase.GetAssetPath(target);
-
- string folderPath = Path.GetDirectoryName(sourceFontFilePath);
- string assetName = Path.GetFileNameWithoutExtension(sourceFontFilePath);
-
- string newAssetFilePathWithName = AssetDatabase.GenerateUniqueAssetPath(folderPath + "/" + assetName + " - Variant.asset");
-
- // Set Texture and Material reference to the source font asset.
- TMP_FontAsset fontAsset = ScriptableObject.Instantiate(sourceFontAsset);
- AssetDatabase.CreateAsset(fontAsset, newAssetFilePathWithName);
-
- fontAsset.atlasPopulationMode = AtlasPopulationMode.Static;
-
- // Initialize array for the font atlas textures.
- fontAsset.atlasTextures = sourceFontAsset.atlasTextures;
- fontAsset.material = sourceFontAsset.material;
-
- // Not sure if this is still necessary in newer versions of Unity.
- EditorUtility.SetDirty(fontAsset);
-
- AssetDatabase.SaveAssets();
- }
-
-
- /*
- [MenuItem("Assets/Create/TextMeshPro/Font Asset Fallback", false, 105)]
- public static void CreateFallbackFontAsset()
- {
- Object target = Selection.activeObject;
-
- // Make sure the selection is a font file
- if (target == null || target.GetType() != typeof(TMP_FontAsset))
- {
- Debug.LogWarning("A Font file must first be selected in order to create a Font Asset.");
- return;
- }
-
- TMP_FontAsset sourceFontAsset = (TMP_FontAsset)target;
-
- string sourceFontFilePath = AssetDatabase.GetAssetPath(target);
-
- string folderPath = Path.GetDirectoryName(sourceFontFilePath);
- string assetName = Path.GetFileNameWithoutExtension(sourceFontFilePath);
-
- string newAssetFilePathWithName = AssetDatabase.GenerateUniqueAssetPath(folderPath + "/" + assetName + " - Fallback.asset");
-
- //// Create new TM Font Asset.
- TMP_FontAsset fontAsset = ScriptableObject.CreateInstance();
- AssetDatabase.CreateAsset(fontAsset, newAssetFilePathWithName);
-
- fontAsset.version = "1.1.0";
-
- fontAsset.faceInfo = sourceFontAsset.faceInfo;
-
- fontAsset.m_SourceFontFileGUID = sourceFontAsset.m_SourceFontFileGUID;
- fontAsset.m_SourceFontFile_EditorRef = sourceFontAsset.m_SourceFontFile_EditorRef;
- fontAsset.atlasPopulationMode = TMP_FontAsset.AtlasPopulationMode.Dynamic;
-
- int atlasWidth = fontAsset.atlasWidth = sourceFontAsset.atlasWidth;
- int atlasHeight = fontAsset.atlasHeight = sourceFontAsset.atlasHeight;
- int atlasPadding = fontAsset.atlasPadding = sourceFontAsset.atlasPadding;
- fontAsset.atlasRenderMode = sourceFontAsset.atlasRenderMode;
-
- // Initialize array for the font atlas textures.
- fontAsset.atlasTextures = new Texture2D[1];
-
- // Create and add font atlas texture
- Texture2D texture = new Texture2D(atlasWidth, atlasHeight, TextureFormat.Alpha8, false);
- Color32[] colors = new Color32[atlasWidth * atlasHeight];
- texture.SetPixels32(colors);
-
- texture.name = assetName + " Atlas";
- fontAsset.atlasTextures[0] = texture;
- AssetDatabase.AddObjectToAsset(texture, fontAsset);
-
- // Add free rectangle of the size of the texture.
- int packingModifier = ((GlyphRasterModes)fontAsset.atlasRenderMode & GlyphRasterModes.RASTER_MODE_BITMAP) == GlyphRasterModes.RASTER_MODE_BITMAP ? 0 : 1;
- fontAsset.m_FreeGlyphRects = new List() { new GlyphRect(0, 0, atlasWidth - packingModifier, atlasHeight - packingModifier) };
- fontAsset.m_UsedGlyphRects = new List();
-
- // Create new Material and Add it as Sub-Asset
- Material tmp_material = new Material(sourceFontAsset.material);
-
- tmp_material.name = texture.name + " Material";
- tmp_material.SetTexture(ShaderUtilities.ID_MainTex, texture);
- tmp_material.SetFloat(ShaderUtilities.ID_TextureWidth, atlasWidth);
- tmp_material.SetFloat(ShaderUtilities.ID_TextureHeight, atlasHeight);
-
- tmp_material.SetFloat(ShaderUtilities.ID_GradientScale, atlasPadding + packingModifier);
-
- tmp_material.SetFloat(ShaderUtilities.ID_WeightNormal, fontAsset.normalStyle);
- tmp_material.SetFloat(ShaderUtilities.ID_WeightBold, fontAsset.boldStyle);
-
- fontAsset.material = tmp_material;
-
- AssetDatabase.AddObjectToAsset(tmp_material, fontAsset);
-
- // Add Font Asset Creation Settings
- // TODO
-
- // Not sure if this is still necessary in newer versions of Unity.
- EditorUtility.SetDirty(fontAsset);
-
- AssetDatabase.SaveAssets();
- }
- */
-
- //[MenuItem("Assets/Create/TextMeshPro/Font Asset #%F12", true)]
- //public static bool CreateFontAssetMenuValidation()
- //{
- // return false;
- //}
-
- [MenuItem("Assets/Create/TextMeshPro/Font Asset #%F12", false, 100)]
- public static void CreateFontAsset()
- {
- Object target = Selection.activeObject;
-
- // Make sure the selection is a font file
- if (target == null || target.GetType() != typeof(Font))
- {
- Debug.LogWarning("A Font file must first be selected in order to create a Font Asset.");
- return;
- }
-
- Font sourceFont = (Font)target;
-
- string sourceFontFilePath = AssetDatabase.GetAssetPath(target);
-
- string folderPath = Path.GetDirectoryName(sourceFontFilePath);
- string assetName = Path.GetFileNameWithoutExtension(sourceFontFilePath);
-
- string newAssetFilePathWithName = AssetDatabase.GenerateUniqueAssetPath(folderPath + "/" + assetName + " SDF.asset");
-
- // Initialize FontEngine
- FontEngine.InitializeFontEngine();
-
- // Load Font Face
- if (FontEngine.LoadFontFace(sourceFont, 90) != FontEngineError.Success)
- {
- Debug.LogWarning("Unable to load font face for [" + sourceFont.name + "]. Make sure \"Include Font Data\" is enabled in the Font Import Settings.", sourceFont);
- return;
- }
-
- // Create new Font Asset
- TMP_FontAsset fontAsset = ScriptableObject.CreateInstance();
- AssetDatabase.CreateAsset(fontAsset, newAssetFilePathWithName);
-
- fontAsset.version = "1.1.0";
-
- fontAsset.faceInfo = FontEngine.GetFaceInfo();
-
- // Set font reference and GUID
- fontAsset.m_SourceFontFileGUID = AssetDatabase.AssetPathToGUID(sourceFontFilePath);
- fontAsset.m_SourceFontFile_EditorRef = sourceFont;
- fontAsset.atlasPopulationMode = AtlasPopulationMode.Dynamic;
-
- // Default atlas resolution is 1024 x 1024.
- int atlasWidth = fontAsset.atlasWidth = 1024;
- int atlasHeight = fontAsset.atlasHeight = 1024;
- int atlasPadding = fontAsset.atlasPadding = 9;
- fontAsset.atlasRenderMode = GlyphRenderMode.SDFAA;
-
- // Initialize array for the font atlas textures.
- fontAsset.atlasTextures = new Texture2D[1];
-
- // Create atlas texture of size zero.
- Texture2D texture = new Texture2D(0, 0, TextureFormat.Alpha8, false);
-
- texture.name = assetName + " Atlas";
- fontAsset.atlasTextures[0] = texture;
- AssetDatabase.AddObjectToAsset(texture, fontAsset);
-
- // Add free rectangle of the size of the texture.
- int packingModifier = ((GlyphRasterModes)fontAsset.atlasRenderMode & GlyphRasterModes.RASTER_MODE_BITMAP) == GlyphRasterModes.RASTER_MODE_BITMAP ? 0 : 1;
- fontAsset.freeGlyphRects = new List() { new GlyphRect(0, 0, atlasWidth - packingModifier, atlasHeight - packingModifier) };
- fontAsset.usedGlyphRects = new List();
-
- // Create new Material and Add it as Sub-Asset
- Shader default_Shader = Shader.Find("TextMeshPro/Distance Field");
- Material tmp_material = new Material(default_Shader);
-
- tmp_material.name = texture.name + " Material";
- tmp_material.SetTexture(ShaderUtilities.ID_MainTex, texture);
- tmp_material.SetFloat(ShaderUtilities.ID_TextureWidth, atlasWidth);
- tmp_material.SetFloat(ShaderUtilities.ID_TextureHeight, atlasHeight);
-
- tmp_material.SetFloat(ShaderUtilities.ID_GradientScale, atlasPadding + packingModifier);
-
- tmp_material.SetFloat(ShaderUtilities.ID_WeightNormal, fontAsset.normalStyle);
- tmp_material.SetFloat(ShaderUtilities.ID_WeightBold, fontAsset.boldStyle);
-
- fontAsset.material = tmp_material;
-
- AssetDatabase.AddObjectToAsset(tmp_material, fontAsset);
-
- // Add Font Asset Creation Settings
- fontAsset.creationSettings = new FontAssetCreationSettings(fontAsset.m_SourceFontFileGUID, fontAsset.faceInfo.pointSize, 0, atlasPadding, 0, 1024, 1024, 7, string.Empty, (int)GlyphRenderMode.SDFAA);
-
- // Not sure if this is still necessary in newer versions of Unity.
- EditorUtility.SetDirty(fontAsset);
-
- AssetDatabase.SaveAssets();
- }
- }
-}
\ No newline at end of file
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_FontAsset_CreationMenu.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_FontAsset_CreationMenu.cs.meta
deleted file mode 100644
index 57a3fcea..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_FontAsset_CreationMenu.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 7496af95dfe67cf429ac65edaaf99106
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_GlyphPairAdjustmentRecordPropertyDrawer.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_GlyphPairAdjustmentRecordPropertyDrawer.cs
deleted file mode 100644
index 69ac6f89..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_GlyphPairAdjustmentRecordPropertyDrawer.cs
+++ /dev/null
@@ -1,391 +0,0 @@
-using UnityEngine;
-using UnityEngine.TextCore;
-using UnityEngine.TextCore.LowLevel;
-using UnityEditor;
-using System.Collections;
-using System.Text.RegularExpressions;
-
-
-namespace TMPro.EditorUtilities
-{
-
- [CustomPropertyDrawer(typeof(TMP_GlyphPairAdjustmentRecord))]
- public class TMP_GlyphPairAdjustmentRecordPropertyDrawer : PropertyDrawer
- {
- private bool isEditingEnabled = false;
- private bool isSelectable = false;
-
- private string m_FirstCharacter = string.Empty;
- private string m_SecondCharacter = string.Empty;
- private string m_PreviousInput;
-
- static GUIContent s_CharacterTextFieldLabel = new GUIContent("Char:", "Enter the character or its UTF16 or UTF32 Unicode character escape sequence. For UTF16 use \"\\uFF00\" and for UTF32 use \"\\UFF00FF00\" representation.");
-
- public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
- {
- SerializedProperty prop_FirstAdjustmentRecord = property.FindPropertyRelative("m_FirstAdjustmentRecord");
- SerializedProperty prop_SecondAdjustmentRecord = property.FindPropertyRelative("m_SecondAdjustmentRecord");
-
- SerializedProperty prop_FirstGlyphIndex = prop_FirstAdjustmentRecord.FindPropertyRelative("m_GlyphIndex");
- SerializedProperty prop_FirstGlyphValueRecord = prop_FirstAdjustmentRecord.FindPropertyRelative("m_GlyphValueRecord");
-
- SerializedProperty prop_SecondGlyphIndex = prop_SecondAdjustmentRecord.FindPropertyRelative("m_GlyphIndex");
- SerializedProperty prop_SecondGlyphValueRecord = prop_SecondAdjustmentRecord.FindPropertyRelative("m_GlyphValueRecord");
-
- SerializedProperty prop_FontFeatureLookupFlags = property.FindPropertyRelative("m_FeatureLookupFlags");
-
- position.yMin += 2;
-
- float width = position.width / 2;
- float padding = 5.0f;
-
- Rect rect;
-
- isEditingEnabled = GUI.enabled;
- isSelectable = label.text == "Selectable" ? true : false;
-
- if (isSelectable)
- GUILayoutUtility.GetRect(position.width, 75);
- else
- GUILayoutUtility.GetRect(position.width, 55);
-
- GUIStyle style = new GUIStyle(EditorStyles.label);
- style.richText = true;
-
- // First Glyph
- GUI.enabled = isEditingEnabled;
- if (isSelectable)
- {
- rect = new Rect(position.x + 70, position.y, position.width, 49);
-
- float labelWidth = GUI.skin.label.CalcSize(new GUIContent("ID: " + prop_FirstGlyphIndex.intValue)).x;
- EditorGUI.LabelField(new Rect(position.x + (64 - labelWidth) / 2, position.y + 60, 64f, 18f), new GUIContent("ID: " + prop_FirstGlyphIndex.intValue + ""), style);
-
- GUI.enabled = isEditingEnabled;
- EditorGUIUtility.labelWidth = 30f;
-
- rect = new Rect(position.x + 70, position.y + 10, (width - 70) - padding, 18);
- EditorGUI.PropertyField(rect, prop_FirstGlyphValueRecord.FindPropertyRelative("m_XPlacement"), new GUIContent("OX:"));
-
- rect.y += 20;
- EditorGUI.PropertyField(rect, prop_FirstGlyphValueRecord.FindPropertyRelative("m_YPlacement"), new GUIContent("OY:"));
-
- rect.y += 20;
- EditorGUI.PropertyField(rect, prop_FirstGlyphValueRecord.FindPropertyRelative("m_XAdvance"), new GUIContent("AX:"));
-
- //rect.y += 20;
- //EditorGUI.PropertyField(rect, prop_FirstGlyphValueRecord.FindPropertyRelative("m_YAdvance"), new GUIContent("AY:"));
-
- DrawGlyph((uint)prop_FirstGlyphIndex.intValue, new Rect(position.x, position.y, position.width, position.height), property);
- }
- else
- {
- rect = new Rect(position.x, position.y, width / 2 * 0.8f - padding, 18);
- EditorGUIUtility.labelWidth = 40f;
-
- // First Character Lookup
- GUI.SetNextControlName("FirstCharacterField");
- EditorGUI.BeginChangeCheck();
- string firstCharacter = EditorGUI.TextField(rect, s_CharacterTextFieldLabel, m_FirstCharacter);
-
- if (GUI.GetNameOfFocusedControl() == "FirstCharacterField")
- {
- if (ValidateInput(firstCharacter))
- {
- //Debug.Log("1st Unicode value: [" + firstCharacter + "]");
-
- uint unicode = GetUnicodeCharacter(firstCharacter);
-
- // Lookup glyph index
- TMP_SerializedPropertyHolder propertyHolder = property.serializedObject.targetObject as TMP_SerializedPropertyHolder;
- TMP_FontAsset fontAsset = propertyHolder.fontAsset;
- if (fontAsset != null)
- {
- prop_FirstGlyphIndex.intValue = (int)fontAsset.GetGlyphIndex(unicode);
- propertyHolder.firstCharacter = unicode;
- }
- }
- }
-
- if (EditorGUI.EndChangeCheck())
- m_FirstCharacter = firstCharacter;
-
- // First Glyph Index
- rect.x += width / 2 * 0.8f;
-
- EditorGUIUtility.labelWidth = 25f;
- EditorGUI.BeginChangeCheck();
- EditorGUI.PropertyField(rect, prop_FirstGlyphIndex, new GUIContent("ID:"));
- if (EditorGUI.EndChangeCheck())
- {
-
- }
-
- GUI.enabled = isEditingEnabled;
- EditorGUIUtility.labelWidth = 25f;
-
- rect = new Rect(position.x, position.y + 20, width * 0.5f - padding, 18);
- EditorGUI.PropertyField(rect, prop_FirstGlyphValueRecord.FindPropertyRelative("m_XPlacement"), new GUIContent("OX"));
-
- rect.x += width * 0.5f;
- EditorGUI.PropertyField(rect, prop_FirstGlyphValueRecord.FindPropertyRelative("m_YPlacement"), new GUIContent("OY"));
-
- rect.x = position.x;
- rect.y += 20;
- EditorGUI.PropertyField(rect, prop_FirstGlyphValueRecord.FindPropertyRelative("m_XAdvance"), new GUIContent("AX"));
-
- //rect.x += width * 0.5f;
- //EditorGUI.PropertyField(rect, prop_FirstGlyphAdjustment.FindPropertyRelative("m_YAdvance"), new GUIContent("AY"));
-
- }
-
-
- // Second Glyph
- GUI.enabled = isEditingEnabled;
- if (isSelectable)
- {
- float labelWidth = GUI.skin.label.CalcSize(new GUIContent("ID: " + prop_SecondGlyphIndex.intValue)).x;
- EditorGUI.LabelField(new Rect(position.width / 2 + 20 + (64 - labelWidth) / 2, position.y + 60, 64f, 18f), new GUIContent("ID: " + prop_SecondGlyphIndex.intValue + ""), style);
-
- GUI.enabled = isEditingEnabled;
- EditorGUIUtility.labelWidth = 30f;
-
- rect = new Rect(position.width / 2 + 20 + 70, position.y + 10, (width - 70) - padding, 18);
- EditorGUI.PropertyField(rect, prop_SecondGlyphValueRecord.FindPropertyRelative("m_XPlacement"), new GUIContent("OX:"));
-
- rect.y += 20;
- EditorGUI.PropertyField(rect, prop_SecondGlyphValueRecord.FindPropertyRelative("m_YPlacement"), new GUIContent("OY:"));
-
- rect.y += 20;
- EditorGUI.PropertyField(rect, prop_SecondGlyphValueRecord.FindPropertyRelative("m_XAdvance"), new GUIContent("AX:"));
-
- //rect.y += 20;
- //EditorGUI.PropertyField(rect, prop_SecondGlyphAdjustment.FindPropertyRelative("m_YAdvance"), new GUIContent("AY"));
-
- DrawGlyph((uint)prop_SecondGlyphIndex.intValue, new Rect(position.width / 2 + 20, position.y, position.width, position.height), property);
- }
- else
- {
- rect = new Rect(position.width / 2 + 20, position.y, width / 2 * 0.8f - padding, 18);
- EditorGUIUtility.labelWidth = 40f;
-
- // Second Character Lookup
- GUI.SetNextControlName("SecondCharacterField");
- EditorGUI.BeginChangeCheck();
- string secondCharacter = EditorGUI.TextField(rect, s_CharacterTextFieldLabel, m_SecondCharacter);
-
- if (GUI.GetNameOfFocusedControl() == "SecondCharacterField")
- {
- if (ValidateInput(secondCharacter))
- {
- //Debug.Log("2nd Unicode value: [" + secondCharacter + "]");
-
- uint unicode = GetUnicodeCharacter(secondCharacter);
-
- // Lookup glyph index
- TMP_SerializedPropertyHolder propertyHolder = property.serializedObject.targetObject as TMP_SerializedPropertyHolder;
- TMP_FontAsset fontAsset = propertyHolder.fontAsset;
- if (fontAsset != null)
- {
- prop_SecondGlyphIndex.intValue = (int)fontAsset.GetGlyphIndex(unicode);
- propertyHolder.secondCharacter = unicode;
- }
- }
- }
-
- if (EditorGUI.EndChangeCheck())
- m_SecondCharacter = secondCharacter;
-
- // Second Glyph Index
- rect.x += width / 2 * 0.8f;
-
- EditorGUIUtility.labelWidth = 25f;
- EditorGUI.BeginChangeCheck();
- EditorGUI.PropertyField(rect, prop_SecondGlyphIndex, new GUIContent("ID:"));
- if (EditorGUI.EndChangeCheck())
- {
-
- }
-
- GUI.enabled = isEditingEnabled;
- EditorGUIUtility.labelWidth = 25f;
-
- rect = new Rect(position.width / 2 + 20, position.y + 20, width * 0.5f - padding, 18);
- EditorGUI.PropertyField(rect, prop_SecondGlyphValueRecord.FindPropertyRelative("m_XPlacement"), new GUIContent("OX"));
-
- rect.x += width * 0.5f;
- EditorGUI.PropertyField(rect, prop_SecondGlyphValueRecord.FindPropertyRelative("m_YPlacement"), new GUIContent("OY"));
-
- rect.x = position.width / 2 + 20;
- rect.y += 20;
- EditorGUI.PropertyField(rect, prop_SecondGlyphValueRecord.FindPropertyRelative("m_XAdvance"), new GUIContent("AX"));
-
- //rect.x += width * 0.5f;
- //EditorGUI.PropertyField(rect, prop_SecondGlyphAdjustment.FindPropertyRelative("m_YAdvance"), new GUIContent("AY"));
- }
-
- // Font Feature Lookup Flags
- if (isSelectable)
- {
- EditorGUIUtility.labelWidth = 55f;
-
- rect.x = position.width - 255;
- rect.y += 23;
- rect.width = 270; // width - 70 - padding;
-
- FontFeatureLookupFlags flags = (FontFeatureLookupFlags)prop_FontFeatureLookupFlags.intValue;
-
- EditorGUI.BeginChangeCheck();
- flags = (FontFeatureLookupFlags)EditorGUI.EnumFlagsField(rect, new GUIContent("Options:"), flags);
- if (EditorGUI.EndChangeCheck())
- {
- prop_FontFeatureLookupFlags.intValue = (int)flags;
- }
- }
-
- }
-
- bool ValidateInput(string source)
- {
- int length = string.IsNullOrEmpty(source) ? 0 : source.Length;
-
- ////Filter out unwanted characters.
- Event evt = Event.current;
-
- char c = evt.character;
-
- if (c != '\0')
- {
- switch (length)
- {
- case 0:
- break;
- case 1:
- if (source != m_PreviousInput)
- return true;
-
- if ((source[0] == '\\' && (c == 'u' || c == 'U')) == false)
- evt.character = '\0';
-
- break;
- case 2:
- case 3:
- case 4:
- case 5:
- if ((c < '0' || c > '9') && (c < 'a' || c > 'f') && (c < 'A' || c > 'F'))
- evt.character = '\0';
- break;
- case 6:
- case 7:
- case 8:
- case 9:
- if (source[1] == 'u' || (c < '0' || c > '9') && (c < 'a' || c > 'f') && (c < 'A' || c > 'F'))
- evt.character = '\0';
-
- // Validate input
- if (length == 6 && source[1] == 'u' && source != m_PreviousInput)
- return true;
- break;
- case 10:
- if (source != m_PreviousInput)
- return true;
-
- evt.character = '\0';
- break;
- }
- }
-
- m_PreviousInput = source;
-
- return false;
- }
-
- uint GetUnicodeCharacter (string source)
- {
- uint unicode;
-
- if (source.Length == 1)
- unicode = source[0];
- else if (source.Length == 6)
- unicode = (uint)TMP_TextUtilities.StringHexToInt(source.Replace("\\u", ""));
- else
- unicode = (uint)TMP_TextUtilities.StringHexToInt(source.Replace("\\U", ""));
-
- return unicode;
- }
-
- void DrawGlyph(uint glyphIndex, Rect position, SerializedProperty property)
- {
- // Get a reference to the font asset
- TMP_FontAsset fontAsset = property.serializedObject.targetObject as TMP_FontAsset;
-
- if (fontAsset == null)
- return;
-
- Glyph glyph;
-
- // Check if glyph is present in the atlas texture.
- if (!fontAsset.glyphLookupTable.TryGetValue(glyphIndex, out glyph))
- return;
-
- // Get the atlas index of the glyph and lookup its atlas texture
- int atlasIndex = glyph.atlasIndex;
- Texture2D atlasTexture = fontAsset.atlasTextures.Length > atlasIndex ? fontAsset.atlasTextures[atlasIndex] : null;
-
- if (atlasTexture == null)
- return;
-
- Material mat;
- if (((GlyphRasterModes)fontAsset.atlasRenderMode & GlyphRasterModes.RASTER_MODE_BITMAP) == GlyphRasterModes.RASTER_MODE_BITMAP)
- {
- mat = TMP_FontAssetEditor.internalBitmapMaterial;
-
- if (mat == null)
- return;
-
- mat.mainTexture = atlasTexture;
- }
- else
- {
- mat = TMP_FontAssetEditor.internalSDFMaterial;
-
- if (mat == null)
- return;
-
- mat.mainTexture = atlasTexture;
- mat.SetFloat(ShaderUtilities.ID_GradientScale, fontAsset.atlasPadding + 1);
- }
-
- // Draw glyph from atlas texture.
- Rect glyphDrawPosition = new Rect(position.x, position.y + 2, 64, 60);
-
- GlyphRect glyphRect = glyph.glyphRect;
-
- int padding = fontAsset.atlasPadding;
-
- int glyphOriginX = glyphRect.x - padding;
- int glyphOriginY = glyphRect.y - padding;
- int glyphWidth = glyphRect.width + padding * 2;
- int glyphHeight = glyphRect.height + padding * 2;
-
- float normalizedHeight = fontAsset.faceInfo.ascentLine - fontAsset.faceInfo.descentLine;
- float scale = glyphDrawPosition.width / normalizedHeight;
-
- // Compute the normalized texture coordinates
- Rect texCoords = new Rect((float)glyphOriginX / atlasTexture.width, (float)glyphOriginY / atlasTexture.height, (float)glyphWidth / atlasTexture.width, (float)glyphHeight / atlasTexture.height);
-
- if (Event.current.type == EventType.Repaint)
- {
- glyphDrawPosition.x += (glyphDrawPosition.width - glyphWidth * scale) / 2;
- glyphDrawPosition.y += (glyphDrawPosition.height - glyphHeight * scale) / 2;
- glyphDrawPosition.width = glyphWidth * scale;
- glyphDrawPosition.height = glyphHeight * scale;
-
- // Could switch to using the default material of the font asset which would require passing scale to the shader.
- Graphics.DrawTexture(glyphDrawPosition, atlasTexture, texCoords, 0, 0, 0, 0, new Color(1f, 1f, 1f), mat);
- }
- }
-
-
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_GlyphPairAdjustmentRecordPropertyDrawer.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_GlyphPairAdjustmentRecordPropertyDrawer.cs.meta
deleted file mode 100644
index b95203f5..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_GlyphPairAdjustmentRecordPropertyDrawer.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: d256fa541faf5d4409992c631adb98a1
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_GlyphPropertyDrawer.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_GlyphPropertyDrawer.cs
deleted file mode 100644
index d8d37004..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_GlyphPropertyDrawer.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using UnityEngine;
-using UnityEngine.TextCore;
-using UnityEngine.TextCore.LowLevel;
-using UnityEditor;
-using System.Collections;
-
-
-namespace TMPro.EditorUtilities
-{
-
- [CustomPropertyDrawer(typeof(Glyph))]
- public class TMP_GlyphPropertyDrawer : PropertyDrawer
- {
- private string k_ColorProperty = "_Color";
-
- public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
- {
- SerializedProperty prop_GlyphIndex = property.FindPropertyRelative("m_Index");
- SerializedProperty prop_GlyphMetrics = property.FindPropertyRelative("m_Metrics");
- SerializedProperty prop_GlyphRect = property.FindPropertyRelative("m_GlyphRect");
- SerializedProperty prop_Scale = property.FindPropertyRelative("m_Scale");
- SerializedProperty prop_AtlasIndex = property.FindPropertyRelative("m_AtlasIndex");
-
- GUIStyle style = new GUIStyle(EditorStyles.label);
- style.richText = true;
-
- Rect rect = new Rect(position.x + 70, position.y, position.width, 49);
-
- float labelWidth = GUI.skin.label.CalcSize(new GUIContent("ID: " + prop_GlyphIndex.intValue)).x;
- EditorGUI.LabelField(new Rect(position.x + (64 - labelWidth) / 2, position.y + 85, 64f, 18f), new GUIContent("ID: " + prop_GlyphIndex.intValue + ""), style);
- //EditorGUIUtility.labelWidth = 22f;
- //EditorGUI.DelayedIntField(new Rect(position.x + (64 - labelWidth) / 2, position.y + 89, 58f, 18f), prop_GlyphIndex, new GUIContent("ID:"));
-
- // We get Rect since a valid position may not be provided by the caller.
- EditorGUI.PropertyField(new Rect(rect.x, rect.y, position.width, 49), prop_GlyphRect);
-
- rect.y += 45;
- EditorGUI.PropertyField(rect, prop_GlyphMetrics);
-
- EditorGUIUtility.labelWidth = 40f;
- EditorGUI.PropertyField(new Rect(rect.x, rect.y + 65, 75, 18), prop_Scale, new GUIContent("Scale:")); // new GUIContent("Scale: " + prop_Scale.floatValue + ""), style);
-
- EditorGUIUtility.labelWidth = 74f;
- EditorGUI.PropertyField(new Rect(rect.x + 85, rect.y + 65, 95, 18), prop_AtlasIndex, new GUIContent("Atlas Index:")); // new GUIContent("Atlas Index: " + prop_AtlasIndex.intValue + ""), style);
-
- DrawGlyph(position, property);
- }
-
- public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
- {
- return 130f;
- }
-
- void DrawGlyph(Rect position, SerializedProperty property)
- {
- // Get a reference to the sprite texture
- TMP_FontAsset fontAsset = property.serializedObject.targetObject as TMP_FontAsset;
-
- if (fontAsset == null)
- return;
-
- // Get reference to atlas texture.
- int atlasIndex = property.FindPropertyRelative("m_AtlasIndex").intValue;
- Texture2D atlasTexture = fontAsset.atlasTextures.Length > atlasIndex ? fontAsset.atlasTextures[atlasIndex] : null;
-
- if (atlasTexture == null)
- return;
-
- Material mat;
- if (((GlyphRasterModes)fontAsset.atlasRenderMode & GlyphRasterModes.RASTER_MODE_BITMAP) == GlyphRasterModes.RASTER_MODE_BITMAP)
- {
- mat = TMP_FontAssetEditor.internalBitmapMaterial;
-
- if (mat == null)
- return;
-
- mat.mainTexture = atlasTexture;
- mat.SetColor(k_ColorProperty, Color.white);
- }
- else
- {
- mat = TMP_FontAssetEditor.internalSDFMaterial;
-
- if (mat == null)
- return;
-
- mat.mainTexture = atlasTexture;
- mat.SetFloat(ShaderUtilities.ID_GradientScale, fontAsset.atlasPadding + 1);
- }
-
- // Draw glyph from atlas texture.
- Rect glyphDrawPosition = new Rect(position.x, position.y + 2, 64, 80);
-
- SerializedProperty glyphRectProperty = property.FindPropertyRelative("m_GlyphRect");
-
- int padding = fontAsset.atlasPadding;
-
- int glyphOriginX = glyphRectProperty.FindPropertyRelative("m_X").intValue - padding;
- int glyphOriginY = glyphRectProperty.FindPropertyRelative("m_Y").intValue - padding;
- int glyphWidth = glyphRectProperty.FindPropertyRelative("m_Width").intValue + padding * 2;
- int glyphHeight = glyphRectProperty.FindPropertyRelative("m_Height").intValue + padding * 2;
-
- float normalizedHeight = fontAsset.faceInfo.ascentLine - fontAsset.faceInfo.descentLine;
- float scale = glyphDrawPosition.width / normalizedHeight;
-
- // Compute the normalized texture coordinates
- Rect texCoords = new Rect((float)glyphOriginX / atlasTexture.width, (float)glyphOriginY / atlasTexture.height, (float)glyphWidth / atlasTexture.width, (float)glyphHeight / atlasTexture.height);
-
- if (Event.current.type == EventType.Repaint)
- {
- glyphDrawPosition.x += (glyphDrawPosition.width - glyphWidth * scale) / 2;
- glyphDrawPosition.y += (glyphDrawPosition.height - glyphHeight * scale) / 2;
- glyphDrawPosition.width = glyphWidth * scale;
- glyphDrawPosition.height = glyphHeight * scale;
-
- // Could switch to using the default material of the font asset which would require passing scale to the shader.
- Graphics.DrawTexture(glyphDrawPosition, atlasTexture, texCoords, 0, 0, 0, 0, new Color(1f, 1f, 1f), mat);
- }
- }
-
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_GlyphPropertyDrawer.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_GlyphPropertyDrawer.cs.meta
deleted file mode 100644
index ce08447f..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_GlyphPropertyDrawer.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: c4777500b5da6094e956c3d4f04de4db
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_InputFieldEditor.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_InputFieldEditor.cs
deleted file mode 100644
index ec481d77..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_InputFieldEditor.cs
+++ /dev/null
@@ -1,283 +0,0 @@
-using UnityEngine;
-using UnityEngine.UI;
-using UnityEditor;
-using UnityEditor.UI;
-using UnityEditor.AnimatedValues;
-
-
-namespace TMPro.EditorUtilities
-{
- [CanEditMultipleObjects]
- [CustomEditor(typeof(TMP_InputField), true)]
- public class TMP_InputFieldEditor : SelectableEditor
- {
- private struct m_foldout
- { // Track Inspector foldout panel states, globally.
- public static bool textInput = true;
- public static bool fontSettings = true;
- public static bool extraSettings = true;
- //public static bool shadowSetting = false;
- //public static bool materialEditor = true;
- }
-
- SerializedProperty m_TextViewport;
- SerializedProperty m_TextComponent;
- SerializedProperty m_Text;
- SerializedProperty m_ContentType;
- SerializedProperty m_LineType;
- SerializedProperty m_LineLimit;
- SerializedProperty m_InputType;
- SerializedProperty m_CharacterValidation;
- SerializedProperty m_InputValidator;
- SerializedProperty m_RegexValue;
- SerializedProperty m_KeyboardType;
- SerializedProperty m_CharacterLimit;
- SerializedProperty m_CaretBlinkRate;
- SerializedProperty m_CaretWidth;
- SerializedProperty m_CaretColor;
- SerializedProperty m_CustomCaretColor;
- SerializedProperty m_SelectionColor;
- SerializedProperty m_HideMobileKeyboard;
- SerializedProperty m_HideMobileInput;
- SerializedProperty m_Placeholder;
- SerializedProperty m_VerticalScrollbar;
- SerializedProperty m_ScrollbarScrollSensitivity;
- SerializedProperty m_OnValueChanged;
- SerializedProperty m_OnEndEdit;
- SerializedProperty m_OnSelect;
- SerializedProperty m_OnDeselect;
- SerializedProperty m_ReadOnly;
- SerializedProperty m_RichText;
- SerializedProperty m_RichTextEditingAllowed;
- SerializedProperty m_ResetOnDeActivation;
- SerializedProperty m_RestoreOriginalTextOnEscape;
-
- SerializedProperty m_OnFocusSelectAll;
- SerializedProperty m_GlobalPointSize;
- SerializedProperty m_GlobalFontAsset;
-
- AnimBool m_CustomColor;
-
- //TMP_InputValidator m_ValidationScript;
-
- protected override void OnEnable()
- {
- base.OnEnable();
-
- m_TextViewport = serializedObject.FindProperty("m_TextViewport");
- m_TextComponent = serializedObject.FindProperty("m_TextComponent");
- m_Text = serializedObject.FindProperty("m_Text");
- m_ContentType = serializedObject.FindProperty("m_ContentType");
- m_LineType = serializedObject.FindProperty("m_LineType");
- m_LineLimit = serializedObject.FindProperty("m_LineLimit");
- m_InputType = serializedObject.FindProperty("m_InputType");
- m_CharacterValidation = serializedObject.FindProperty("m_CharacterValidation");
- m_InputValidator = serializedObject.FindProperty("m_InputValidator");
- m_RegexValue = serializedObject.FindProperty("m_RegexValue");
- m_KeyboardType = serializedObject.FindProperty("m_KeyboardType");
- m_CharacterLimit = serializedObject.FindProperty("m_CharacterLimit");
- m_CaretBlinkRate = serializedObject.FindProperty("m_CaretBlinkRate");
- m_CaretWidth = serializedObject.FindProperty("m_CaretWidth");
- m_CaretColor = serializedObject.FindProperty("m_CaretColor");
- m_CustomCaretColor = serializedObject.FindProperty("m_CustomCaretColor");
- m_SelectionColor = serializedObject.FindProperty("m_SelectionColor");
-
- m_HideMobileKeyboard = serializedObject.FindProperty("m_HideSoftKeyboard");
- m_HideMobileInput = serializedObject.FindProperty("m_HideMobileInput");
-
- m_Placeholder = serializedObject.FindProperty("m_Placeholder");
- m_VerticalScrollbar = serializedObject.FindProperty("m_VerticalScrollbar");
- m_ScrollbarScrollSensitivity = serializedObject.FindProperty("m_ScrollSensitivity");
-
- m_OnValueChanged = serializedObject.FindProperty("m_OnValueChanged");
- m_OnEndEdit = serializedObject.FindProperty("m_OnEndEdit");
- m_OnSelect = serializedObject.FindProperty("m_OnSelect");
- m_OnDeselect = serializedObject.FindProperty("m_OnDeselect");
- m_ReadOnly = serializedObject.FindProperty("m_ReadOnly");
- m_RichText = serializedObject.FindProperty("m_RichText");
- m_RichTextEditingAllowed = serializedObject.FindProperty("m_isRichTextEditingAllowed");
- m_ResetOnDeActivation = serializedObject.FindProperty("m_ResetOnDeActivation");
- m_RestoreOriginalTextOnEscape = serializedObject.FindProperty("m_RestoreOriginalTextOnEscape");
-
- m_OnFocusSelectAll = serializedObject.FindProperty("m_OnFocusSelectAll");
- m_GlobalPointSize = serializedObject.FindProperty("m_GlobalPointSize");
- m_GlobalFontAsset = serializedObject.FindProperty("m_GlobalFontAsset");
-
- m_CustomColor = new AnimBool(m_CustomCaretColor.boolValue);
- m_CustomColor.valueChanged.AddListener(Repaint);
- }
-
- protected override void OnDisable()
- {
- base.OnDisable();
- m_CustomColor.valueChanged.RemoveListener(Repaint);
- }
-
- public override void OnInspectorGUI()
- {
- serializedObject.Update();
-
- base.OnInspectorGUI();
-
- EditorGUILayout.Space();
-
- EditorGUILayout.PropertyField(m_TextViewport);
-
- EditorGUILayout.PropertyField(m_TextComponent);
-
- TextMeshProUGUI text = null;
- if (m_TextComponent != null && m_TextComponent.objectReferenceValue != null)
- {
- text = m_TextComponent.objectReferenceValue as TextMeshProUGUI;
- //if (text.supportRichText)
- //{
- // EditorGUILayout.HelpBox("Using Rich Text with input is unsupported.", MessageType.Warning);
- //}
- }
-
- EditorGUI.BeginDisabledGroup(m_TextComponent == null || m_TextComponent.objectReferenceValue == null);
-
- // TEXT INPUT BOX
- EditorGUILayout.PropertyField(m_Text);
-
- // INPUT FIELD SETTINGS
- #region INPUT FIELD SETTINGS
-
- m_foldout.fontSettings = EditorGUILayout.Foldout(m_foldout.fontSettings, "Input Field Settings", true, TMP_UIStyleManager.boldFoldout);
-
- if (m_foldout.fontSettings)
- {
- EditorGUI.indentLevel++;
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(m_GlobalFontAsset, new GUIContent("Font Asset", "Set the Font Asset for both Placeholder and Input Field text object."));
- if (EditorGUI.EndChangeCheck())
- {
- TMP_InputField inputField = target as TMP_InputField;
- inputField.SetGlobalFontAsset(m_GlobalFontAsset.objectReferenceValue as TMP_FontAsset);
- }
-
-
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(m_GlobalPointSize, new GUIContent("Point Size", "Set the point size of both Placeholder and Input Field text object."));
- if (EditorGUI.EndChangeCheck())
- {
- TMP_InputField inputField = target as TMP_InputField;
- inputField.SetGlobalPointSize(m_GlobalPointSize.floatValue);
- }
-
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(m_CharacterLimit);
-
- EditorGUILayout.Space();
-
- EditorGUILayout.PropertyField(m_ContentType);
- if (!m_ContentType.hasMultipleDifferentValues)
- {
- EditorGUI.indentLevel++;
-
- if (m_ContentType.enumValueIndex == (int)TMP_InputField.ContentType.Standard ||
- m_ContentType.enumValueIndex == (int)TMP_InputField.ContentType.Autocorrected ||
- m_ContentType.enumValueIndex == (int)TMP_InputField.ContentType.Custom)
- {
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(m_LineType);
- if (EditorGUI.EndChangeCheck())
- {
- if (text != null)
- {
- if (m_LineType.enumValueIndex == (int)TMP_InputField.LineType.SingleLine)
- text.enableWordWrapping = false;
- else
- {
- text.enableWordWrapping = true;
- }
- }
- }
-
- if (m_LineType.enumValueIndex != (int)TMP_InputField.LineType.SingleLine)
- {
- EditorGUILayout.PropertyField(m_LineLimit);
- }
- }
-
- if (m_ContentType.enumValueIndex == (int)TMP_InputField.ContentType.Custom)
- {
- EditorGUILayout.PropertyField(m_InputType);
- EditorGUILayout.PropertyField(m_KeyboardType);
- EditorGUILayout.PropertyField(m_CharacterValidation);
- if (m_CharacterValidation.enumValueIndex == (int)TMP_InputField.CharacterValidation.Regex)
- {
- EditorGUILayout.PropertyField(m_RegexValue);
- }
- else if (m_CharacterValidation.enumValueIndex == (int)TMP_InputField.CharacterValidation.CustomValidator)
- {
- EditorGUILayout.PropertyField(m_InputValidator);
- }
- }
-
- EditorGUI.indentLevel--;
- }
-
- EditorGUILayout.Space();
-
- EditorGUILayout.PropertyField(m_Placeholder);
- EditorGUILayout.PropertyField(m_VerticalScrollbar);
-
- if (m_VerticalScrollbar.objectReferenceValue != null)
- EditorGUILayout.PropertyField(m_ScrollbarScrollSensitivity);
-
- EditorGUILayout.PropertyField(m_CaretBlinkRate);
- EditorGUILayout.PropertyField(m_CaretWidth);
-
- EditorGUILayout.PropertyField(m_CustomCaretColor);
-
- m_CustomColor.target = m_CustomCaretColor.boolValue;
-
- if (EditorGUILayout.BeginFadeGroup(m_CustomColor.faded))
- {
- EditorGUILayout.PropertyField(m_CaretColor);
- }
- EditorGUILayout.EndFadeGroup();
-
- EditorGUILayout.PropertyField(m_SelectionColor);
-
- EditorGUI.indentLevel--;
- }
- #endregion
-
-
- // CONTROL SETTINGS
- #region CONTROL SETTINGS
- m_foldout.extraSettings = EditorGUILayout.Foldout(m_foldout.extraSettings, "Control Settings", true, TMP_UIStyleManager.boldFoldout);
-
- if (m_foldout.extraSettings)
- {
- EditorGUI.indentLevel++;
-
- EditorGUILayout.PropertyField(m_OnFocusSelectAll, new GUIContent("OnFocus - Select All", "Should all the text be selected when the Input Field is selected."));
- EditorGUILayout.PropertyField(m_ResetOnDeActivation, new GUIContent("Reset On DeActivation", "Should the Text and Caret position be reset when Input Field is DeActivated."));
- EditorGUILayout.PropertyField(m_RestoreOriginalTextOnEscape, new GUIContent("Restore On ESC Key", "Should the original text be restored when pressing ESC."));
- EditorGUILayout.PropertyField(m_HideMobileKeyboard, new GUIContent("Hide Soft Keyboard", "Controls the visibility of the mobile virtual keyboard."));
- EditorGUILayout.PropertyField(m_HideMobileInput, new GUIContent("Hide Mobile Input", "Controls the visibility of the editable text field above the mobile virtual keyboard."));
- EditorGUILayout.PropertyField(m_ReadOnly);
- EditorGUILayout.PropertyField(m_RichText);
- EditorGUILayout.PropertyField(m_RichTextEditingAllowed, new GUIContent("Allow Rich Text Editing"));
-
- EditorGUI.indentLevel--;
- }
- #endregion
-
-
- EditorGUILayout.Space();
-
- EditorGUILayout.PropertyField(m_OnValueChanged);
- EditorGUILayout.PropertyField(m_OnEndEdit);
- EditorGUILayout.PropertyField(m_OnSelect);
- EditorGUILayout.PropertyField(m_OnDeselect);
-
- EditorGUI.EndDisabledGroup();
-
- serializedObject.ApplyModifiedProperties();
- }
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_InputFieldEditor.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_InputFieldEditor.cs.meta
deleted file mode 100644
index eeb62d8c..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_InputFieldEditor.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: aa160f27c3fe4052a5850e21108811b6
-timeCreated: 1457861621
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_MeshRendererEditor.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_MeshRendererEditor.cs
deleted file mode 100644
index 83d19f8c..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_MeshRendererEditor.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// When enabled, allows setting the material by dropping a material onto the MeshRenderer inspector component.
-// The drawback is that the MeshRenderer inspector will not have properties for light probes, so if you need light probe support, do not enable this.
-//#define ALLOW_MESHRENDERER_MATERIAL_DRAG_N_DROP
-
-using UnityEngine;
-using UnityEditor;
-using System.Collections;
-
-
-namespace TMPro.EditorUtilities
-{
- // Disabled for compatibility reason as lightprobe setup isn't supported due to inability to inherit from MeshRendererEditor class
-#if ALLOW_MESHRENDERER_MATERIAL_DRAG_N_DROP
- [CanEditMultipleObjects]
- [CustomEditor(typeof(MeshRenderer))]
- public class TMP_MeshRendererEditor : Editor
- {
- private SerializedProperty m_Materials;
-
- void OnEnable()
- {
- m_Materials = serializedObject.FindProperty("m_Materials");
- }
-
-
- public override void OnInspectorGUI()
- {
- serializedObject.Update();
-
- // Get a reference to the current material.
- SerializedProperty material_prop = m_Materials.GetArrayElementAtIndex(0);
- Material currentMaterial = material_prop.objectReferenceValue as Material;
-
- EditorGUI.BeginChangeCheck();
- base.OnInspectorGUI();
- if (EditorGUI.EndChangeCheck())
- {
- material_prop = m_Materials.GetArrayElementAtIndex(0);
-
- TMP_FontAsset newFontAsset = null;
- Material newMaterial = null;
-
- if (material_prop != null)
- newMaterial = material_prop.objectReferenceValue as Material;
-
- // Check if the new material is referencing a different font atlas texture.
- if (newMaterial != null && currentMaterial.GetInstanceID() != newMaterial.GetInstanceID())
- {
- // Search for the Font Asset matching the new font atlas texture.
- newFontAsset = TMP_EditorUtility.FindMatchingFontAsset(newMaterial);
- }
-
-
- GameObject[] objects = Selection.gameObjects;
-
- for (int i = 0; i < objects.Length; i++)
- {
- // Assign new font asset
- if (newFontAsset != null)
- {
- TMP_Text textComponent = objects[i].GetComponent();
-
- if (textComponent != null)
- {
- Undo.RecordObject(textComponent, "Font Asset Change");
- textComponent.font = newFontAsset;
- }
- }
-
- TMPro_EventManager.ON_DRAG_AND_DROP_MATERIAL_CHANGED(objects[i], currentMaterial, newMaterial);
- }
- }
- }
- }
-#endif
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_MeshRendererEditor.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_MeshRendererEditor.cs.meta
deleted file mode 100644
index d6b133fd..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_MeshRendererEditor.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 6d437b997e074079b4b2f6e395394f4b
-timeCreated: 1462864011
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_PackageUtilities.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_PackageUtilities.cs
deleted file mode 100644
index 92881118..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_PackageUtilities.cs
+++ /dev/null
@@ -1,565 +0,0 @@
-using UnityEngine;
-using UnityEditor;
-using System;
-using System.IO;
-using System.Linq;
-using System.Collections;
-using System.Collections.Generic;
-using System.Threading;
-using TMPro.EditorUtilities;
-
-
-namespace TMPro
-{
- // Suppressing warnings related to the use of private structures which are confusing the compiler as these data structures are used by .json files.
- #pragma warning disable 0649
-
- ///
- /// Data structure containing the target and replacement fileIDs and GUIDs which will require remapping from previous version of TextMesh Pro to the new TextMesh Pro UPM package.
- ///
- [System.Serializable]
- struct AssetConversionRecord
- {
- public string referencedResource;
- public string target;
- public string replacement;
- }
-
-
- ///
- /// Data structure containing a list of target and replacement fileID and GUID requiring remapping from previous versions of TextMesh Pro to the new TextMesh Pro UPM package.
- /// This data structure is populated with the data contained in the PackageConversionData.json file included in the package.
- ///
- [System.Serializable]
- class AssetConversionData
- {
- public List assetRecords;
- }
-
-
- public class TMP_ProjectConversionUtility : EditorWindow
- {
- // Create Project Files GUID Remapping Tool window
- [MenuItem("Window/TextMeshPro/Project Files GUID Remapping Tool", false, 2100)]
- static void ShowConverterWindow()
- {
- var window = GetWindow();
- window.titleContent = new GUIContent("Conversion Tool");
- window.Focus();
- }
-
- private static HashSet m_IgnoreAssetTypes = new HashSet()
- {
- typeof(AnimatorOverrideController),
- typeof(AudioClip),
- typeof(AvatarMask),
- typeof(ComputeShader),
- typeof(Cubemap),
- typeof(DefaultAsset),
- typeof(Flare),
- typeof(Font),
- typeof(GUISkin),
- typeof(HumanTemplate),
- typeof(LightingDataAsset),
- typeof(Mesh),
- typeof(MonoScript),
- typeof(PhysicMaterial),
- typeof(PhysicsMaterial2D),
- typeof(RenderTexture),
- typeof(Shader),
- typeof(TerrainData),
- typeof(TextAsset),
- typeof(Texture2D),
- typeof(Texture2DArray),
- typeof(Texture3D),
- typeof(UnityEditorInternal.AssemblyDefinitionAsset),
- typeof(UnityEngine.AI.NavMeshData),
- typeof(UnityEngine.Tilemaps.Tile),
- typeof(UnityEngine.U2D.SpriteAtlas),
- typeof(UnityEngine.Video.VideoClip),
- };
-
- ///
- ///
- ///
- struct AssetModificationRecord
- {
- public string assetFilePath;
- public string assetDataFile;
- }
-
- struct AssetFileRecord
- {
- public string assetFilePath;
- public string assetMetaFilePath;
-
- public AssetFileRecord(string filePath, string metaFilePath)
- {
- this.assetFilePath = filePath;
- this.assetMetaFilePath = metaFilePath;
- }
- }
-
- private static string m_ProjectPath;
- private static string m_ProjectFolderToScan;
- private static bool m_IsAlreadyScanningProject;
- private static bool m_CancelScanProcess;
- private static string k_ProjectScanReportDefaultText = "Project Scan Results\n";
- private static string k_ProjectScanLabelPrefix = "Scanning: ";
- private static string m_ProjectScanResults = string.Empty;
- private static Vector2 m_ProjectScanResultScrollPosition;
- private static float m_ProgressPercentage = 0;
-
- private static int m_ScanningTotalFiles;
- private static int m_RemainingFilesToScan;
- private static int m_ScanningCurrentFileIndex;
- private static string m_ScanningCurrentFileName;
-
- private static AssetConversionData m_ConversionData;
-
- private static List m_ModifiedAssetList = new List();
-
-
- void OnEnable()
- {
- // Set Editor Window Size
- SetEditorWindowSize();
-
- m_ProjectScanResults = k_ProjectScanReportDefaultText;
- }
-
-
- void OnGUI()
- {
- GUILayout.BeginVertical();
- {
- // Scan project files and resources
- GUILayout.BeginVertical(EditorStyles.helpBox);
- {
- GUILayout.Label("Scan Project Files", EditorStyles.boldLabel);
- GUILayout.Label("Press the Scan Project Files button to begin scanning your project for files & resources that were created with a previous version of TextMesh Pro.", TMP_UIStyleManager.label);
- GUILayout.Space(10f);
- GUILayout.Label("Project folder to be scanned. Example \"Assets/TextMesh Pro\"");
- m_ProjectFolderToScan = EditorGUILayout.TextField("Folder Path: Assets/", m_ProjectFolderToScan);
- GUILayout.Space(5f);
-
- GUI.enabled = m_IsAlreadyScanningProject == false ? true : false;
- if (GUILayout.Button("Scan Project Files"))
- {
- m_CancelScanProcess = false;
-
- // Make sure Asset Serialization mode is set to ForceText and Version Control mode to Visible Meta Files.
- if (CheckProjectSerializationAndSourceControlModes() == true)
- {
- m_ProjectPath = Path.GetFullPath("Assets/..");
- TMP_EditorCoroutine.StartCoroutine(ScanProjectFiles());
- }
- else
- {
- EditorUtility.DisplayDialog("Project Settings Change Required", "In menu options \"Edit - Project Settings - Editor\", please change Asset Serialization Mode to ForceText and Source Control Mode to Visible Meta Files.", "OK", string.Empty);
- }
- }
- GUI.enabled = true;
-
- // Display progress bar
- Rect rect = GUILayoutUtility.GetRect(0f, 20f, GUILayout.ExpandWidth(true));
- EditorGUI.ProgressBar(rect, m_ProgressPercentage, "Scan Progress (" + m_ScanningCurrentFileIndex + "/" + m_ScanningTotalFiles + ")");
-
- // Display cancel button and name of file currently being scanned.
- if (m_IsAlreadyScanningProject)
- {
- Rect cancelRect = new Rect(rect.width - 20, rect.y + 2, 20, 16);
- if (GUI.Button(cancelRect, "X"))
- {
- m_CancelScanProcess = true;
- }
- GUILayout.Label(k_ProjectScanLabelPrefix + m_ScanningCurrentFileName, TMP_UIStyleManager.label);
- }
- else
- GUILayout.Label(string.Empty);
-
- GUILayout.Space(5);
-
- // Creation Feedback
- GUILayout.BeginVertical(TMP_UIStyleManager.textAreaBoxWindow, GUILayout.ExpandHeight(true));
- {
- m_ProjectScanResultScrollPosition = EditorGUILayout.BeginScrollView(m_ProjectScanResultScrollPosition, GUILayout.ExpandHeight(true));
- EditorGUILayout.LabelField(m_ProjectScanResults, TMP_UIStyleManager.label);
- EditorGUILayout.EndScrollView();
- }
- GUILayout.EndVertical();
- GUILayout.Space(5f);
- }
- GUILayout.EndVertical();
-
- // Scan project files and resources
- GUILayout.BeginVertical(EditorStyles.helpBox);
- {
- GUILayout.Label("Save Modified Project Files", EditorStyles.boldLabel);
- GUILayout.Label("Pressing the Save Modified Project Files button will update the files in the Project Scan Results listed above. Please make sure that you have created a backup of your project first as these file modifications are permanent and cannot be undone.", TMP_UIStyleManager.label);
- GUILayout.Space(5f);
-
- GUI.enabled = m_IsAlreadyScanningProject == false && m_ModifiedAssetList.Count > 0 ? true : false;
- if (GUILayout.Button("Save Modified Project Files"))
- {
- UpdateProjectFiles();
- }
- GUILayout.Space(10f);
- }
- GUILayout.EndVertical();
-
- }
- GUILayout.EndVertical();
- GUILayout.Space(5f);
- }
-
- void OnInspectorUpdate()
- {
- Repaint();
- }
-
-
- ///
- /// Limits the minimum size of the editor window.
- ///
- void SetEditorWindowSize()
- {
- EditorWindow editorWindow = this;
-
- Vector2 currentWindowSize = editorWindow.minSize;
-
- editorWindow.minSize = new Vector2(Mathf.Max(640, currentWindowSize.x), Mathf.Max(420, currentWindowSize.y));
- }
-
-
- ///
- ///
- ///
- ///
- ///
- private static bool ShouldIgnoreFile(string filePath)
- {
- string fileExtension = Path.GetExtension(filePath);
- Type fileType = AssetDatabase.GetMainAssetTypeAtPath(filePath);
-
- if (m_IgnoreAssetTypes.Contains(fileType))
- return true;
-
- // Exclude FBX
- if (fileType == typeof(GameObject) && (fileExtension.ToLower() == ".fbx" || fileExtension.ToLower() == ".blend"))
- return true;
-
- return false;
- }
-
-
- private IEnumerator ScanProjectFiles()
- {
- m_IsAlreadyScanningProject = true;
- string packageFullPath = EditorUtilities.TMP_EditorUtility.packageFullPath;
-
- // List containing assets that have been modified.
- m_ProjectScanResults = k_ProjectScanReportDefaultText;
- m_ModifiedAssetList.Clear();
- m_ProgressPercentage = 0;
-
- // Read Conversion Data from Json file.
- if (m_ConversionData == null)
- m_ConversionData = JsonUtility.FromJson(File.ReadAllText(packageFullPath + "/PackageConversionData.json"));
-
- // Get list of GUIDs for assets that might contain references to previous GUIDs that require updating.
- string searchFolder = string.IsNullOrEmpty(m_ProjectFolderToScan) ? "Assets" : ("Assets/" + m_ProjectFolderToScan);
- string[] guids = AssetDatabase.FindAssets("t:Object", new string[] { searchFolder }).Distinct().ToArray();
-
- k_ProjectScanLabelPrefix = "Phase 1 - Filtering: ";
- m_ScanningTotalFiles = guids.Length;
- m_ScanningCurrentFileIndex = 0;
-
- List projectFilesToScan = new List();
-
- foreach (var guid in guids)
- {
- if (m_CancelScanProcess)
- break;
-
- string assetFilePath = AssetDatabase.GUIDToAssetPath(guid);
-
- m_ScanningCurrentFileIndex += 1;
- m_ScanningCurrentFileName = assetFilePath;
- m_ProgressPercentage = (float)m_ScanningCurrentFileIndex / m_ScanningTotalFiles;
-
- // Filter out file types we have no interest in searching
- if (ShouldIgnoreFile(assetFilePath))
- continue;
-
- string assetMetaFilePath = AssetDatabase.GetTextMetaFilePathFromAssetPath(assetFilePath);
-
- projectFilesToScan.Add(new AssetFileRecord(assetFilePath, assetMetaFilePath));
-
- yield return null;
- }
-
- m_RemainingFilesToScan = m_ScanningTotalFiles = projectFilesToScan.Count;
-
- k_ProjectScanLabelPrefix = "Phase 2 - Scanning: ";
-
- for (int i = 0; i < m_ScanningTotalFiles; i++)
- {
- if (m_CancelScanProcess)
- break;
-
- AssetFileRecord fileRecord = projectFilesToScan[i];
-
- ThreadPool.QueueUserWorkItem(Task =>
- {
- ScanProjectFileAsync(fileRecord);
-
- m_ScanningCurrentFileName = fileRecord.assetFilePath;
-
- int completedScans = m_ScanningTotalFiles - Interlocked.Decrement(ref m_RemainingFilesToScan);
-
- m_ScanningCurrentFileIndex = completedScans;
- m_ProgressPercentage = (float)completedScans / m_ScanningTotalFiles;
- });
-
- if (i % 64 == 0)
- yield return new WaitForSeconds(2.0f);
-
- }
-
- while (m_RemainingFilesToScan > 0 && !m_CancelScanProcess)
- yield return null;
-
- m_IsAlreadyScanningProject = false;
- m_ScanningCurrentFileName = string.Empty;
- }
-
-
- static void ScanProjectFileAsync(AssetFileRecord fileRecord)
- {
- if (m_CancelScanProcess)
- return;
-
- // Read the asset data file
- string assetDataFile = string.Empty;
- bool hasFileChanged = false;
-
- try
- {
- assetDataFile = File.ReadAllText(m_ProjectPath + "/" + fileRecord.assetFilePath);
- }
- catch
- {
- // Continue to the next asset if we can't read the current one.
- return;
- }
-
- // Read the asset meta data file
- string assetMetaFile = File.ReadAllText(m_ProjectPath + "/" + fileRecord.assetMetaFilePath);
- bool hasMetaFileChanges = false;
-
- foreach (AssetConversionRecord record in m_ConversionData.assetRecords)
- {
- if (assetDataFile.Contains(record.target))
- {
- hasFileChanged = true;
-
- assetDataFile = assetDataFile.Replace(record.target, record.replacement);
- }
-
- //// Check meta file
- if (assetMetaFile.Contains(record.target))
- {
- hasMetaFileChanges = true;
-
- assetMetaFile = assetMetaFile.Replace(record.target, record.replacement);
- }
- }
-
- if (hasFileChanged)
- {
- AssetModificationRecord modifiedAsset;
- modifiedAsset.assetFilePath = fileRecord.assetFilePath;
- modifiedAsset.assetDataFile = assetDataFile;
-
- m_ModifiedAssetList.Add(modifiedAsset);
-
- m_ProjectScanResults += fileRecord.assetFilePath + "\n";
- }
-
- if (hasMetaFileChanges)
- {
- AssetModificationRecord modifiedAsset;
- modifiedAsset.assetFilePath = fileRecord.assetMetaFilePath;
- modifiedAsset.assetDataFile = assetMetaFile;
-
- m_ModifiedAssetList.Add(modifiedAsset);
-
- m_ProjectScanResults += fileRecord.assetMetaFilePath + "\n";
- }
- }
-
-
- ///
- ///
- ///
- private static void ResetScanProcess()
- {
- m_IsAlreadyScanningProject = false;
- m_ScanningCurrentFileName = string.Empty;
- m_ProgressPercentage = 0;
- m_ScanningCurrentFileIndex = 0;
- m_ScanningTotalFiles = 0;
- }
-
-
- ///
- ///
- ///
- private static void UpdateProjectFiles()
- {
- // Make sure Asset Serialization mode is set to ForceText with Visible Meta Files.
- CheckProjectSerializationAndSourceControlModes();
-
- string projectPath = Path.GetFullPath("Assets/..");
-
- // Display dialogue to show user a list of project files that will be modified upon their consent.
- if (EditorUtility.DisplayDialog("Save Modified Asset(s)?", "Are you sure you want to save all modified assets?", "YES", "NO"))
- {
- for (int i = 0; i < m_ModifiedAssetList.Count; i++)
- {
- // Make sure all file streams that might have been opened by Unity are closed.
- //AssetDatabase.ReleaseCachedFileHandles();
-
- //Debug.Log("Writing asset file [" + m_ModifiedAssetList[i].assetFilePath + "].");
-
- File.WriteAllText(projectPath + "/" + m_ModifiedAssetList[i].assetFilePath, m_ModifiedAssetList[i].assetDataFile);
- }
- }
-
- AssetDatabase.Refresh();
-
- m_ProgressPercentage = 0;
- m_ProjectScanResults = k_ProjectScanReportDefaultText;
- }
-
-
- ///
- /// Check project Asset Serialization and Source Control modes
- ///
- private static bool CheckProjectSerializationAndSourceControlModes()
- {
- // Check Project Asset Serialization and Visible Meta Files mode.
- if (EditorSettings.serializationMode != SerializationMode.ForceText || EditorSettings.externalVersionControl != "Visible Meta Files")
- {
- return false;
- }
-
- return true;
- }
- }
-
-
-
- public class TMP_PackageUtilities : Editor
- {
-
- enum SaveAssetDialogueOptions { Unset = 0, Save = 1, SaveAll = 2, DoNotSave = 3 };
-
- private static SerializationMode m_ProjectAssetSerializationMode;
- private static string m_ProjectExternalVersionControl;
-
- struct AssetRemappingRecord
- {
- public string oldGuid;
- public string newGuid;
- public string assetPath;
- }
-
- struct AssetModificationRecord
- {
- public string assetFilePath;
- public string assetDataFile;
- }
-
- ///
- ///
- ///
- [MenuItem("Window/TextMeshPro/Import TMP Essential Resources", false, 2050)]
- public static void ImportProjectResourcesMenu()
- {
- ImportEssentialResources();
- }
-
-
- ///
- ///
- ///
- [MenuItem("Window/TextMeshPro/Import TMP Examples and Extras", false, 2051)]
- public static void ImportExamplesContentMenu()
- {
- ImportExamplesAndExtras();
- }
-
-
- private static void GetVersionInfo()
- {
- string version = TMP_Settings.version;
- Debug.Log("The version of this TextMesh Pro UPM package is (" + version + ").");
- }
-
-
- ///
- ///
- ///
- private static void ImportExamplesAndExtras()
- {
- string packageFullPath = TMP_EditorUtility.packageFullPath;
-
- AssetDatabase.ImportPackage(packageFullPath + "/Package Resources/TMP Examples & Extras.unitypackage", true);
- }
-
- private static string k_SettingsFilePath;
- private static byte[] k_SettingsBackup;
-
- ///
- ///
- ///
- private static void ImportEssentialResources()
- {
- // Check if the TMP Settings asset is already present in the project.
- string[] settings = AssetDatabase.FindAssets("t:TMP_Settings");
-
- if (settings.Length > 0)
- {
- // Save assets just in case the TMP Setting were modified before import.
- AssetDatabase.SaveAssets();
-
- // Copy existing TMP Settings asset to a byte[]
- k_SettingsFilePath = AssetDatabase.GUIDToAssetPath(settings[0]);
- k_SettingsBackup = File.ReadAllBytes(k_SettingsFilePath);
-
- RegisterResourceImportCallback();
- }
-
- string packageFullPath = TMP_EditorUtility.packageFullPath;
-
- AssetDatabase.ImportPackage(packageFullPath + "/Package Resources/TMP Essential Resources.unitypackage", true);
- }
-
- private static void RegisterResourceImportCallback()
- {
- AssetDatabase.importPackageCompleted += ImportCallback;
- }
-
- private static void ImportCallback(string packageName)
- {
- // Restore backup of TMP Settings from byte[]
- File.WriteAllBytes(k_SettingsFilePath, k_SettingsBackup);
-
- AssetDatabase.Refresh();
-
- AssetDatabase.importPackageCompleted -= ImportCallback;
- }
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_PackageUtilities.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_PackageUtilities.cs.meta
deleted file mode 100644
index e03778cc..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_PackageUtilities.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 68eedd4e5b33b37429c02c4add0036fe
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_PostBuildProcessHandler.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_PostBuildProcessHandler.cs
deleted file mode 100644
index a8b800ac..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_PostBuildProcessHandler.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using UnityEngine;
-using UnityEditor;
-using UnityEditor.Callbacks;
-using System.IO;
-
-
-namespace TMPro
-{
- public class TMP_PostBuildProcessHandler
- {
- [PostProcessBuildAttribute(10000)]
- public static void OnPostprocessBuild(BuildTarget target, string pathToBuiltProject)
- {
- // Check if TMP Essential Resource are present in user project.
- if (target == BuildTarget.iOS && File.Exists(GetEssentialProjectResourcesPath() + "/Resources/TMP Settings.asset") && TMP_Settings.enableEmojiSupport)
- {
- string file = Path.Combine(pathToBuiltProject, "Classes/UI/Keyboard.mm");
- string content = File.ReadAllText(file);
- content = content.Replace("FILTER_EMOJIS_IOS_KEYBOARD 1", "FILTER_EMOJIS_IOS_KEYBOARD 0");
- File.WriteAllText(file, content);
- }
- }
-
-
- private static string GetEssentialProjectResourcesPath()
- {
- // Find the potential location of the TextMesh Pro folder in the user project.
- string projectPath = Path.GetFullPath("Assets/..");
- if (Directory.Exists(projectPath))
- {
- // Search for default location of TMP Essential Resources
- if (Directory.Exists(projectPath + "/Assets/TextMesh Pro/Resources"))
- {
- return "Assets/TextMesh Pro";
- }
-
- // Search for potential alternative locations in the user project
- string[] matchingPaths = Directory.GetDirectories(projectPath, "TextMesh Pro", SearchOption.AllDirectories);
- projectPath = ValidateLocation(matchingPaths, projectPath);
- if (projectPath != null) return projectPath;
- }
-
- return null;
- }
-
-
- private static string ValidateLocation(string[] paths, string projectPath)
- {
- for (int i = 0; i < paths.Length; i++)
- {
- // Check if any of the matching directories contain a GUISkins directory.
- if (Directory.Exists(paths[i] + "/Resources"))
- {
- string folderPath = paths[i].Replace(projectPath, "");
- folderPath = folderPath.TrimStart('\\', '/');
- return folderPath;
- }
- }
-
- return null;
- }
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_PostBuildProcessHandler.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_PostBuildProcessHandler.cs.meta
deleted file mode 100644
index af212b86..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_PostBuildProcessHandler.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 6fdea2af3daa40fe8f88e5e9cfc17abb
-timeCreated: 1479886230
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ProjectTextSettings.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ProjectTextSettings.cs
deleted file mode 100644
index b8695be2..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ProjectTextSettings.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-#if !UNITY_2018_3_OR_NEWER
-using UnityEditor;
-
-namespace TMPro
-{
-
- public static class TMP_ProjectTextSettings
- {
- // Open Project Text Settings
- [MenuItem("Edit/Project Settings/TextMeshPro Settings", false, 309)]
- public static void SelectProjectTextSettings()
- {
- TMP_Settings textSettings = TMP_Settings.instance;
-
- if (textSettings)
- {
- Selection.activeObject = textSettings;
-
- // TODO: Do we want to ping the Project Text Settings asset in the Project Inspector
- EditorUtility.FocusProjectWindow();
- EditorGUIUtility.PingObject(textSettings);
- }
- else
- TMPro_EventManager.RESOURCE_LOAD_EVENT.Add(ON_RESOURCES_LOADED);
- }
-
-
- // Event received when TMP resources have been loaded.
- static void ON_RESOURCES_LOADED()
- {
- TMPro_EventManager.RESOURCE_LOAD_EVENT.Remove(ON_RESOURCES_LOADED);
-
- TMP_Settings textSettings = TMP_Settings.instance;
-
- Selection.activeObject = textSettings;
-
- // TODO: Do we want to ping the Project Text Settings asset in the Project Inspector
- EditorUtility.FocusProjectWindow();
- EditorGUIUtility.PingObject(textSettings);
- }
- }
-}
-#endif
\ No newline at end of file
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ProjectTextSettings.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ProjectTextSettings.cs.meta
deleted file mode 100644
index 6d194543..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ProjectTextSettings.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 0e751e877ed14d71a6b8e63ac54949cf
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ResourcesLoader.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ResourcesLoader.cs
deleted file mode 100644
index 090bd774..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ResourcesLoader.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using UnityEditor;
-using UnityEngine;
-using System.Collections;
-
-namespace TMPro.EditorUtilities
-{
-
- //[InitializeOnLoad]
- class TMP_ResourcesLoader
- {
-
- ///
- /// Function to pre-load the TMP Resources
- ///
- public static void LoadTextMeshProResources()
- {
- //TMP_Settings.LoadDefaultSettings();
- //TMP_StyleSheet.LoadDefaultStyleSheet();
- }
-
-
- static TMP_ResourcesLoader()
- {
- //Debug.Log("Loading TMP Resources...");
-
- // Get current targetted platform
-
-
- //string Settings = PlayerSettings.GetScriptingDefineSymbolsForGroup(BuildTargetGroup.Standalone);
- //TMPro.TMP_Settings.LoadDefaultSettings();
- //TMPro.TMP_StyleSheet.LoadDefaultStyleSheet();
- }
-
-
-
- //[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
- //static void OnBeforeSceneLoaded()
- //{
- //Debug.Log("Before scene is loaded.");
-
- // //TMPro.TMP_Settings.LoadDefaultSettings();
- // //TMPro.TMP_StyleSheet.LoadDefaultStyleSheet();
-
- // //ShaderVariantCollection collection = new ShaderVariantCollection();
- // //Shader s0 = Shader.Find("TextMeshPro/Mobile/Distance Field");
- // //ShaderVariantCollection.ShaderVariant tmp_Variant = new ShaderVariantCollection.ShaderVariant(s0, UnityEngine.Rendering.PassType.Normal, string.Empty);
-
- // //collection.Add(tmp_Variant);
- // //collection.WarmUp();
- //}
-
- }
-
- //static class TMP_ProjectSettings
- //{
- // [InitializeOnLoadMethod]
- // static void SetProjectDefineSymbols()
- // {
- // string currentBuildSettings = PlayerSettings.GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup);
-
- // //Check for and inject TMP_INSTALLED
- // if (!currentBuildSettings.Contains("TMP_PRESENT"))
- // {
- // PlayerSettings.SetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup, currentBuildSettings + ";TMP_PRESENT");
- // }
- // }
- //}
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ResourcesLoader.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ResourcesLoader.cs.meta
deleted file mode 100644
index 8b322e2f..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_ResourcesLoader.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 7241c7dc25374fc1a6ab3ef9da79c363
-timeCreated: 1465441092
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SDFShaderGUI.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SDFShaderGUI.cs
deleted file mode 100644
index 220bac22..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SDFShaderGUI.cs
+++ /dev/null
@@ -1,487 +0,0 @@
-using UnityEngine;
-using UnityEditor;
-
-namespace TMPro.EditorUtilities
-{
- public class TMP_SDFShaderGUI : TMP_BaseShaderGUI
- {
- static ShaderFeature s_OutlineFeature, s_UnderlayFeature, s_BevelFeature, s_GlowFeature, s_MaskFeature;
-
- static bool s_Face = true, s_Outline = true, s_Outline2, s_Underlay, s_Lighting, s_Glow, s_Bevel, s_Light, s_Bump, s_Env;
-
- static string[]
- s_FaceUvSpeedNames = { "_FaceUVSpeedX", "_FaceUVSpeedY" },
- s_OutlineUvSpeedNames = { "_OutlineUVSpeedX", "_OutlineUVSpeedY" };
-
- static TMP_SDFShaderGUI()
- {
- s_OutlineFeature = new ShaderFeature()
- {
- undoLabel = "Outline",
- keywords = new[] { "OUTLINE_ON" }
- };
-
- s_UnderlayFeature = new ShaderFeature()
- {
- undoLabel = "Underlay",
- keywords = new[] { "UNDERLAY_ON", "UNDERLAY_INNER" },
- label = new GUIContent("Underlay Type"),
- keywordLabels = new[]
- {
- new GUIContent("None"), new GUIContent("Normal"), new GUIContent("Inner")
- }
- };
-
- s_BevelFeature = new ShaderFeature()
- {
- undoLabel = "Bevel",
- keywords = new[] { "BEVEL_ON" }
- };
-
- s_GlowFeature = new ShaderFeature()
- {
- undoLabel = "Glow",
- keywords = new[] { "GLOW_ON" }
- };
-
- s_MaskFeature = new ShaderFeature()
- {
- undoLabel = "Mask",
- keywords = new[] { "MASK_HARD", "MASK_SOFT" },
- label = new GUIContent("Mask"),
- keywordLabels = new[]
- {
- new GUIContent("Mask Off"), new GUIContent("Mask Hard"), new GUIContent("Mask Soft")
- }
- };
- }
-
- protected override void DoGUI()
- {
- s_Face = BeginPanel("Face", s_Face);
- if (s_Face)
- {
- DoFacePanel();
- }
-
- EndPanel();
-
- s_Outline = m_Material.HasProperty(ShaderUtilities.ID_OutlineTex) ? BeginPanel("Outline", s_Outline) : BeginPanel("Outline", s_OutlineFeature, s_Outline);
- if (s_Outline)
- {
- DoOutlinePanel();
- }
-
- EndPanel();
-
- if (m_Material.HasProperty(ShaderUtilities.ID_Outline2Color))
- {
- s_Outline2 = BeginPanel("Outline 2", s_OutlineFeature, s_Outline2);
- if (s_Outline2)
- {
- DoOutline2Panel();
- }
-
- EndPanel();
- }
-
- if (m_Material.HasProperty(ShaderUtilities.ID_UnderlayColor))
- {
- s_Underlay = BeginPanel("Underlay", s_UnderlayFeature, s_Underlay);
- if (s_Underlay)
- {
- DoUnderlayPanel();
- }
-
- EndPanel();
- }
-
- if (m_Material.HasProperty("_SpecularColor"))
- {
- s_Lighting = BeginPanel("Lighting", s_BevelFeature, s_Lighting);
- if (s_Lighting)
- {
- s_Bevel = BeginPanel("Bevel", s_Bevel);
- if (s_Bevel)
- {
- DoBevelPanel();
- }
-
- EndPanel();
-
- s_Light = BeginPanel("Local Lighting", s_Light);
- if (s_Light)
- {
- DoLocalLightingPanel();
- }
-
- EndPanel();
-
- s_Bump = BeginPanel("Bump Map", s_Bump);
- if (s_Bump)
- {
- DoBumpMapPanel();
- }
-
- EndPanel();
-
- s_Env = BeginPanel("Environment Map", s_Env);
- if (s_Env)
- {
- DoEnvMapPanel();
- }
-
- EndPanel();
- }
-
- EndPanel();
- }
- else if (m_Material.HasProperty("_SpecColor"))
- {
- s_Bevel = BeginPanel("Bevel", s_Bevel);
- if (s_Bevel)
- {
- DoBevelPanel();
- }
-
- EndPanel();
-
- s_Light = BeginPanel("Surface Lighting", s_Light);
- if (s_Light)
- {
- DoSurfaceLightingPanel();
- }
-
- EndPanel();
-
- s_Bump = BeginPanel("Bump Map", s_Bump);
- if (s_Bump)
- {
- DoBumpMapPanel();
- }
-
- EndPanel();
-
- s_Env = BeginPanel("Environment Map", s_Env);
- if (s_Env)
- {
- DoEnvMapPanel();
- }
-
- EndPanel();
- }
-
- if (m_Material.HasProperty(ShaderUtilities.ID_GlowColor))
- {
- s_Glow = BeginPanel("Glow", s_GlowFeature, s_Glow);
- if (s_Glow)
- {
- DoGlowPanel();
- }
-
- EndPanel();
- }
-
- s_DebugExtended = BeginPanel("Debug Settings", s_DebugExtended);
- if (s_DebugExtended)
- {
- DoDebugPanel();
- }
-
- EndPanel();
- }
-
- void DoFacePanel()
- {
- EditorGUI.indentLevel += 1;
- DoColor("_FaceColor", "Color");
- if (m_Material.HasProperty(ShaderUtilities.ID_FaceTex))
- {
- if (m_Material.HasProperty("_FaceUVSpeedX"))
- {
- DoTexture2D("_FaceTex", "Texture", true, s_FaceUvSpeedNames);
- }
- else
- {
- DoTexture2D("_FaceTex", "Texture", true);
- }
- }
-
- DoSlider("_OutlineSoftness", "Softness");
- DoSlider("_FaceDilate", "Dilate");
- if (m_Material.HasProperty(ShaderUtilities.ID_Shininess))
- {
- DoSlider("_FaceShininess", "Gloss");
- }
-
- EditorGUI.indentLevel -= 1;
- EditorGUILayout.Space();
- }
-
- void DoOutlinePanel()
- {
- EditorGUI.indentLevel += 1;
- DoColor("_OutlineColor", "Color");
- if (m_Material.HasProperty(ShaderUtilities.ID_OutlineTex))
- {
- if (m_Material.HasProperty("_OutlineUVSpeedX"))
- {
- DoTexture2D("_OutlineTex", "Texture", true, s_OutlineUvSpeedNames);
- }
- else
- {
- DoTexture2D("_OutlineTex", "Texture", true);
- }
- }
-
- DoSlider("_OutlineWidth", "Thickness");
- if (m_Material.HasProperty("_OutlineShininess"))
- {
- DoSlider("_OutlineShininess", "Gloss");
- }
-
- EditorGUI.indentLevel -= 1;
- EditorGUILayout.Space();
- }
-
- void DoOutline2Panel()
- {
- EditorGUI.indentLevel += 1;
- DoColor("_Outline2Color", "Color");
- //if (m_Material.HasProperty(ShaderUtilities.ID_OutlineTex))
- //{
- // if (m_Material.HasProperty("_OutlineUVSpeedX"))
- // {
- // DoTexture2D("_OutlineTex", "Texture", true, s_OutlineUvSpeedNames);
- // }
- // else
- // {
- // DoTexture2D("_OutlineTex", "Texture", true);
- // }
- //}
-
- DoSlider("_Outline2Width", "Thickness");
- //if (m_Material.HasProperty("_OutlineShininess"))
- //{
- // DoSlider("_OutlineShininess", "Gloss");
- //}
-
- EditorGUI.indentLevel -= 1;
- EditorGUILayout.Space();
- }
-
- void DoUnderlayPanel()
- {
- EditorGUI.indentLevel += 1;
- s_UnderlayFeature.DoPopup(m_Editor, m_Material);
- DoColor("_UnderlayColor", "Color");
- DoSlider("_UnderlayOffsetX", "Offset X");
- DoSlider("_UnderlayOffsetY", "Offset Y");
- DoSlider("_UnderlayDilate", "Dilate");
- DoSlider("_UnderlaySoftness", "Softness");
- EditorGUI.indentLevel -= 1;
- EditorGUILayout.Space();
- }
-
- static GUIContent[] s_BevelTypeLabels =
- {
- new GUIContent("Outer Bevel"),
- new GUIContent("Inner Bevel")
- };
-
- void DoBevelPanel()
- {
- EditorGUI.indentLevel += 1;
- DoPopup("_ShaderFlags", "Type", s_BevelTypeLabels);
- DoSlider("_Bevel", "Amount");
- DoSlider("_BevelOffset", "Offset");
- DoSlider("_BevelWidth", "Width");
- DoSlider("_BevelRoundness", "Roundness");
- DoSlider("_BevelClamp", "Clamp");
- EditorGUI.indentLevel -= 1;
- EditorGUILayout.Space();
- }
-
- void DoLocalLightingPanel()
- {
- EditorGUI.indentLevel += 1;
- DoSlider("_LightAngle", "Light Angle");
- DoColor("_SpecularColor", "Specular Color");
- DoSlider("_SpecularPower", "Specular Power");
- DoSlider("_Reflectivity", "Reflectivity Power");
- DoSlider("_Diffuse", "Diffuse Shadow");
- DoSlider("_Ambient", "Ambient Shadow");
- EditorGUI.indentLevel -= 1;
- EditorGUILayout.Space();
- }
-
- void DoSurfaceLightingPanel()
- {
- EditorGUI.indentLevel += 1;
- DoColor("_SpecColor", "Specular Color");
- EditorGUI.indentLevel -= 1;
- EditorGUILayout.Space();
- }
-
- void DoBumpMapPanel()
- {
- EditorGUI.indentLevel += 1;
- DoTexture2D("_BumpMap", "Texture");
- DoSlider("_BumpFace", "Face");
- DoSlider("_BumpOutline", "Outline");
- EditorGUI.indentLevel -= 1;
- EditorGUILayout.Space();
- }
-
- void DoEnvMapPanel()
- {
- EditorGUI.indentLevel += 1;
- DoColor("_ReflectFaceColor", "Face Color");
- DoColor("_ReflectOutlineColor", "Outline Color");
- DoCubeMap("_Cube", "Texture");
- DoVector3("_EnvMatrixRotation", "Rotation");
- EditorGUI.indentLevel -= 1;
- EditorGUILayout.Space();
- }
-
- void DoGlowPanel()
- {
- EditorGUI.indentLevel += 1;
- DoColor("_GlowColor", "Color");
- DoSlider("_GlowOffset", "Offset");
- DoSlider("_GlowInner", "Inner");
- DoSlider("_GlowOuter", "Outer");
- DoSlider("_GlowPower", "Power");
- EditorGUI.indentLevel -= 1;
- EditorGUILayout.Space();
- }
-
- void DoDebugPanel()
- {
- EditorGUI.indentLevel += 1;
- DoTexture2D("_MainTex", "Font Atlas");
- DoFloat("_GradientScale", "Gradient Scale");
- DoFloat("_TextureWidth", "Texture Width");
- DoFloat("_TextureHeight", "Texture Height");
- EditorGUILayout.Space();
- DoFloat("_ScaleX", "Scale X");
- DoFloat("_ScaleY", "Scale Y");
-
- if (m_Material.HasProperty(ShaderUtilities.ID_Sharpness))
- DoSlider("_Sharpness", "Sharpness");
-
- DoSlider("_PerspectiveFilter", "Perspective Filter");
- EditorGUILayout.Space();
- DoFloat("_VertexOffsetX", "Offset X");
- DoFloat("_VertexOffsetY", "Offset Y");
-
- if (m_Material.HasProperty(ShaderUtilities.ID_MaskCoord))
- {
- EditorGUILayout.Space();
- s_MaskFeature.ReadState(m_Material);
- s_MaskFeature.DoPopup(m_Editor, m_Material);
- if (s_MaskFeature.Active)
- {
- DoMaskSubgroup();
- }
-
- EditorGUILayout.Space();
- DoVector("_ClipRect", "Clip Rect", s_LbrtVectorLabels);
- }
- else if (m_Material.HasProperty("_MaskTex"))
- {
- DoMaskTexSubgroup();
- }
- else if (m_Material.HasProperty(ShaderUtilities.ID_MaskSoftnessX))
- {
- EditorGUILayout.Space();
- DoFloat("_MaskSoftnessX", "Softness X");
- DoFloat("_MaskSoftnessY", "Softness Y");
- DoVector("_ClipRect", "Clip Rect", s_LbrtVectorLabels);
- }
-
- if (m_Material.HasProperty(ShaderUtilities.ID_StencilID))
- {
- EditorGUILayout.Space();
- DoFloat("_Stencil", "Stencil ID");
- DoFloat("_StencilComp", "Stencil Comp");
- }
-
- EditorGUILayout.Space();
-
- EditorGUI.BeginChangeCheck();
- bool useRatios = EditorGUILayout.Toggle("Use Ratios", !m_Material.IsKeywordEnabled("RATIOS_OFF"));
- if (EditorGUI.EndChangeCheck())
- {
- m_Editor.RegisterPropertyChangeUndo("Use Ratios");
- if (useRatios)
- {
- m_Material.DisableKeyword("RATIOS_OFF");
- }
- else
- {
- m_Material.EnableKeyword("RATIOS_OFF");
- }
- }
-
- if (m_Material.HasProperty(ShaderUtilities.ShaderTag_CullMode))
- {
- EditorGUILayout.Space();
- DoPopup("_CullMode", "Cull Mode", s_CullingTypeLabels);
- }
-
- EditorGUILayout.Space();
-
- EditorGUI.BeginDisabledGroup(true);
- DoFloat("_ScaleRatioA", "Scale Ratio A");
- DoFloat("_ScaleRatioB", "Scale Ratio B");
- DoFloat("_ScaleRatioC", "Scale Ratio C");
- EditorGUI.EndDisabledGroup();
- EditorGUI.indentLevel -= 1;
- EditorGUILayout.Space();
- }
-
- void DoMaskSubgroup()
- {
- DoVector("_MaskCoord", "Mask Bounds", s_XywhVectorLabels);
- if (Selection.activeGameObject != null)
- {
- Renderer renderer = Selection.activeGameObject.GetComponent();
- if (renderer != null)
- {
- Rect rect = EditorGUILayout.GetControlRect();
- rect.x += EditorGUIUtility.labelWidth;
- rect.width -= EditorGUIUtility.labelWidth;
- if (GUI.Button(rect, "Match Renderer Bounds"))
- {
- FindProperty("_MaskCoord", m_Properties).vectorValue = new Vector4(
- 0,
- 0,
- Mathf.Round(renderer.bounds.extents.x * 1000) / 1000,
- Mathf.Round(renderer.bounds.extents.y * 1000) / 1000
- );
- }
- }
- }
-
- if (s_MaskFeature.State == 1)
- {
- DoFloat("_MaskSoftnessX", "Softness X");
- DoFloat("_MaskSoftnessY", "Softness Y");
- }
- }
-
- void DoMaskTexSubgroup()
- {
- EditorGUILayout.Space();
- DoTexture2D("_MaskTex", "Mask Texture");
- DoToggle("_MaskInverse", "Inverse Mask");
- DoColor("_MaskEdgeColor", "Edge Color");
- DoSlider("_MaskEdgeSoftness", "Edge Softness");
- DoSlider("_MaskWipeControl", "Wipe Position");
- DoFloat("_MaskSoftnessX", "Softness X");
- DoFloat("_MaskSoftnessY", "Softness Y");
- DoVector("_ClipRect", "Clip Rect", s_LbrtVectorLabels);
- }
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SDFShaderGUI.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SDFShaderGUI.cs.meta
deleted file mode 100644
index c643afa1..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SDFShaderGUI.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 8413ca0e506d42a1a4bd9769f204ad16
-timeCreated: 1469844718
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SerializedPropertyHolder.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SerializedPropertyHolder.cs
deleted file mode 100644
index 2ba34d69..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SerializedPropertyHolder.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using UnityEngine;
-using UnityEditor;
-
-namespace TMPro
-{
- class TMP_SerializedPropertyHolder : ScriptableObject
- {
- public TMP_FontAsset fontAsset;
- public uint firstCharacter;
- public uint secondCharacter;
-
- public TMP_GlyphPairAdjustmentRecord glyphPairAdjustmentRecord = new TMP_GlyphPairAdjustmentRecord(new TMP_GlyphAdjustmentRecord(), new TMP_GlyphAdjustmentRecord());
- }
-}
\ No newline at end of file
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SerializedPropertyHolder.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SerializedPropertyHolder.cs.meta
deleted file mode 100644
index cde31db9..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SerializedPropertyHolder.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 9c4a050f089abb04ebd4125e419f4548
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SettingsEditor.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SettingsEditor.cs
deleted file mode 100644
index f8c601eb..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SettingsEditor.cs
+++ /dev/null
@@ -1,381 +0,0 @@
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEditor;
-using UnityEditorInternal;
-
-#pragma warning disable 0414 // Disabled a few warnings for not yet implemented features.
-
-namespace TMPro.EditorUtilities
-{
- [CustomEditor(typeof(TMP_Settings))]
- public class TMP_SettingsEditor : Editor
- {
- internal class Styles
- {
- public static readonly GUIContent defaultFontAssetLabel = new GUIContent("Default Font Asset", "The Font Asset that will be assigned by default to newly created text objects when no Font Asset is specified.");
- public static readonly GUIContent defaultFontAssetPathLabel = new GUIContent("Path: Resources/", "The relative path to a Resources folder where the Font Assets and Material Presets are located.\nExample \"Fonts & Materials/\"");
-
- public static readonly GUIContent fallbackFontAssetsLabel = new GUIContent("Fallback Font Assets", "The Font Assets that will be searched to locate and replace missing characters from a given Font Asset.");
- public static readonly GUIContent fallbackFontAssetsListLabel = new GUIContent("Fallback Font Assets List", "The Font Assets that will be searched to locate and replace missing characters from a given Font Asset.");
-
- public static readonly GUIContent fallbackMaterialSettingsLabel = new GUIContent("Fallback Material Settings");
- public static readonly GUIContent matchMaterialPresetLabel = new GUIContent("Match Material Presets");
-
- public static readonly GUIContent containerDefaultSettingsLabel = new GUIContent("Text Container Default Settings");
-
- public static readonly GUIContent textMeshProLabel = new GUIContent("TextMeshPro");
- public static readonly GUIContent textMeshProUiLabel = new GUIContent("TextMeshPro UI");
- public static readonly GUIContent enableRaycastTarget = new GUIContent("Enable Raycast Target");
- public static readonly GUIContent autoSizeContainerLabel = new GUIContent("Auto Size Text Container", "Set the size of the text container to match the text.");
- public static readonly GUIContent isTextObjectScaleStaticLabel = new GUIContent("Is Object Scale Static", "Disables calling InternalUpdate() when enabled. This can improve performance when text object scale is static.");
-
- public static readonly GUIContent textComponentDefaultSettingsLabel = new GUIContent("Text Component Default Settings");
- public static readonly GUIContent defaultFontSize = new GUIContent("Default Font Size");
- public static readonly GUIContent autoSizeRatioLabel = new GUIContent("Text Auto Size Ratios");
- public static readonly GUIContent minLabel = new GUIContent("Min");
- public static readonly GUIContent maxLabel = new GUIContent("Max");
-
- public static readonly GUIContent wordWrappingLabel = new GUIContent("Word Wrapping");
- public static readonly GUIContent kerningLabel = new GUIContent("Kerning");
- public static readonly GUIContent extraPaddingLabel = new GUIContent("Extra Padding");
- public static readonly GUIContent tintAllSpritesLabel = new GUIContent("Tint All Sprites");
- public static readonly GUIContent parseEscapeCharactersLabel = new GUIContent("Parse Escape Sequence");
-
- public static readonly GUIContent dynamicFontSystemSettingsLabel = new GUIContent("Dynamic Font System Settings");
- public static readonly GUIContent getFontFeaturesAtRuntime = new GUIContent("Get Font Features at Runtime", "Determines if Glyph Adjustment Data will be retrieved from font files at runtime when new characters and glyphs are added to font assets.");
- public static readonly GUIContent dynamicAtlasTextureGroup = new GUIContent("Dynamic Atlas Texture Group");
-
- public static readonly GUIContent missingGlyphLabel = new GUIContent("Missing Character Unicode", "The character to be displayed when the requested character is not found in any font asset or fallbacks.");
- public static readonly GUIContent disableWarningsLabel = new GUIContent("Disable warnings", "Disable warning messages in the Console.");
-
- public static readonly GUIContent defaultSpriteAssetLabel = new GUIContent("Default Sprite Asset", "The Sprite Asset that will be assigned by default when using the tag when no Sprite Asset is specified.");
- public static readonly GUIContent missingSpriteCharacterUnicodeLabel = new GUIContent("Missing Sprite Unicode", "The unicode value for the sprite character to be displayed when the requested sprite character is not found in any sprite assets or fallbacks.");
- public static readonly GUIContent enableEmojiSupportLabel = new GUIContent("iOS Emoji Support", "Enables Emoji support for Touch Screen Keyboards on target devices.");
- //public static readonly GUIContent spriteRelativeScale = new GUIContent("Relative Scaling", "Determines if the sprites will be scaled relative to the primary font asset assigned to the text object or relative to the current font asset.");
-
- public static readonly GUIContent spriteAssetsPathLabel = new GUIContent("Path: Resources/", "The relative path to a Resources folder where the Sprite Assets are located.\nExample \"Sprite Assets/\"");
-
- public static readonly GUIContent defaultStyleSheetLabel = new GUIContent("Default Style Sheet", "The Style Sheet that will be used for all text objects in this project.");
- public static readonly GUIContent styleSheetResourcePathLabel = new GUIContent("Path: Resources/", "The relative path to a Resources folder where the Style Sheets are located.\nExample \"Style Sheets/\"");
-
- public static readonly GUIContent colorGradientPresetsLabel = new GUIContent("Color Gradient Presets", "The relative path to a Resources folder where the Color Gradient Presets are located.\nExample \"Color Gradient Presets/\"");
- public static readonly GUIContent colorGradientsPathLabel = new GUIContent("Path: Resources/", "The relative path to a Resources folder where the Color Gradient Presets are located.\nExample \"Color Gradient Presets/\"");
-
- public static readonly GUIContent lineBreakingLabel = new GUIContent("Line Breaking for Asian languages", "The text assets that contain the Leading and Following characters which define the rules for line breaking with Asian languages.");
- public static readonly GUIContent koreanSpecificRules = new GUIContent("Korean Language Options");
- }
-
- SerializedProperty m_PropFontAsset;
- SerializedProperty m_PropDefaultFontAssetPath;
- SerializedProperty m_PropDefaultFontSize;
- SerializedProperty m_PropDefaultAutoSizeMinRatio;
- SerializedProperty m_PropDefaultAutoSizeMaxRatio;
- SerializedProperty m_PropDefaultTextMeshProTextContainerSize;
- SerializedProperty m_PropDefaultTextMeshProUITextContainerSize;
- SerializedProperty m_PropAutoSizeTextContainer;
- SerializedProperty m_PropEnableRaycastTarget;
- SerializedProperty m_PropIsTextObjectScaleStatic;
-
- SerializedProperty m_PropSpriteAsset;
- SerializedProperty m_PropMissingSpriteCharacterUnicode;
- //SerializedProperty m_PropSpriteRelativeScaling;
- SerializedProperty m_PropEnableEmojiSupport;
- SerializedProperty m_PropSpriteAssetPath;
-
-
- SerializedProperty m_PropStyleSheet;
- SerializedProperty m_PropStyleSheetsResourcePath;
- ReorderableList m_List;
-
- SerializedProperty m_PropColorGradientPresetsPath;
-
- SerializedProperty m_PropMatchMaterialPreset;
- SerializedProperty m_PropWordWrapping;
- SerializedProperty m_PropKerning;
- SerializedProperty m_PropExtraPadding;
- SerializedProperty m_PropTintAllSprites;
- SerializedProperty m_PropParseEscapeCharacters;
- SerializedProperty m_PropMissingGlyphCharacter;
-
- //SerializedProperty m_DynamicAtlasTextureManager;
- SerializedProperty m_GetFontFeaturesAtRuntime;
-
- SerializedProperty m_PropWarningsDisabled;
-
- SerializedProperty m_PropLeadingCharacters;
- SerializedProperty m_PropFollowingCharacters;
- SerializedProperty m_PropUseModernHangulLineBreakingRules;
-
- private const string k_UndoRedo = "UndoRedoPerformed";
-
- public void OnEnable()
- {
- if (target == null)
- return;
-
- m_PropFontAsset = serializedObject.FindProperty("m_defaultFontAsset");
- m_PropDefaultFontAssetPath = serializedObject.FindProperty("m_defaultFontAssetPath");
- m_PropDefaultFontSize = serializedObject.FindProperty("m_defaultFontSize");
- m_PropDefaultAutoSizeMinRatio = serializedObject.FindProperty("m_defaultAutoSizeMinRatio");
- m_PropDefaultAutoSizeMaxRatio = serializedObject.FindProperty("m_defaultAutoSizeMaxRatio");
- m_PropDefaultTextMeshProTextContainerSize = serializedObject.FindProperty("m_defaultTextMeshProTextContainerSize");
- m_PropDefaultTextMeshProUITextContainerSize = serializedObject.FindProperty("m_defaultTextMeshProUITextContainerSize");
- m_PropAutoSizeTextContainer = serializedObject.FindProperty("m_autoSizeTextContainer");
- m_PropEnableRaycastTarget = serializedObject.FindProperty("m_EnableRaycastTarget");
- m_PropIsTextObjectScaleStatic = serializedObject.FindProperty("m_IsTextObjectScaleStatic");
-
- m_PropSpriteAsset = serializedObject.FindProperty("m_defaultSpriteAsset");
- m_PropMissingSpriteCharacterUnicode = serializedObject.FindProperty("m_MissingCharacterSpriteUnicode");
- //m_PropSpriteRelativeScaling = serializedObject.FindProperty("m_SpriteRelativeScaling");
- m_PropEnableEmojiSupport = serializedObject.FindProperty("m_enableEmojiSupport");
- m_PropSpriteAssetPath = serializedObject.FindProperty("m_defaultSpriteAssetPath");
-
- m_PropStyleSheet = serializedObject.FindProperty("m_defaultStyleSheet");
- m_PropStyleSheetsResourcePath = serializedObject.FindProperty("m_StyleSheetsResourcePath");
-
-
- m_PropColorGradientPresetsPath = serializedObject.FindProperty("m_defaultColorGradientPresetsPath");
-
- m_List = new ReorderableList(serializedObject, serializedObject.FindProperty("m_fallbackFontAssets"), true, true, true, true);
-
- m_List.drawElementCallback = (rect, index, isActive, isFocused) =>
- {
- var element = m_List.serializedProperty.GetArrayElementAtIndex(index);
- rect.y += 2;
- EditorGUI.PropertyField(new Rect(rect.x, rect.y, rect.width, EditorGUIUtility.singleLineHeight), element, GUIContent.none);
- };
-
- m_List.drawHeaderCallback = rect =>
- {
- EditorGUI.LabelField(rect, Styles.fallbackFontAssetsListLabel);
- };
-
- m_PropMatchMaterialPreset = serializedObject.FindProperty("m_matchMaterialPreset");
-
- m_PropWordWrapping = serializedObject.FindProperty("m_enableWordWrapping");
- m_PropKerning = serializedObject.FindProperty("m_enableKerning");
- m_PropExtraPadding = serializedObject.FindProperty("m_enableExtraPadding");
- m_PropTintAllSprites = serializedObject.FindProperty("m_enableTintAllSprites");
- m_PropParseEscapeCharacters = serializedObject.FindProperty("m_enableParseEscapeCharacters");
- m_PropMissingGlyphCharacter = serializedObject.FindProperty("m_missingGlyphCharacter");
-
- m_PropWarningsDisabled = serializedObject.FindProperty("m_warningsDisabled");
-
- //m_DynamicAtlasTextureManager = serializedObject.FindProperty("m_DynamicAtlasTextureGroup");
- m_GetFontFeaturesAtRuntime = serializedObject.FindProperty("m_GetFontFeaturesAtRuntime");
-
- m_PropLeadingCharacters = serializedObject.FindProperty("m_leadingCharacters");
- m_PropFollowingCharacters = serializedObject.FindProperty("m_followingCharacters");
- m_PropUseModernHangulLineBreakingRules = serializedObject.FindProperty("m_UseModernHangulLineBreakingRules");
- }
-
- public override void OnInspectorGUI()
- {
- serializedObject.Update();
- string evt_cmd = Event.current.commandName;
-
- float labelWidth = EditorGUIUtility.labelWidth;
- float fieldWidth = EditorGUIUtility.fieldWidth;
-
- // TextMeshPro Font Info Panel
- EditorGUI.indentLevel = 0;
-
- // FONT ASSET
- EditorGUILayout.BeginVertical(EditorStyles.helpBox);
- GUILayout.Label(Styles.defaultFontAssetLabel, EditorStyles.boldLabel);
- EditorGUI.indentLevel = 1;
- EditorGUILayout.PropertyField(m_PropFontAsset, Styles.defaultFontAssetLabel);
- EditorGUILayout.PropertyField(m_PropDefaultFontAssetPath, Styles.defaultFontAssetPathLabel);
- EditorGUI.indentLevel = 0;
-
- EditorGUILayout.Space();
- EditorGUILayout.EndVertical();
-
- // FALLBACK FONT ASSETs
- EditorGUILayout.BeginVertical(EditorStyles.helpBox);
- GUILayout.Label(Styles.fallbackFontAssetsLabel, EditorStyles.boldLabel);
- m_List.DoLayoutList();
-
- GUILayout.Label(Styles.fallbackMaterialSettingsLabel, EditorStyles.boldLabel);
- EditorGUI.indentLevel = 1;
- EditorGUILayout.PropertyField(m_PropMatchMaterialPreset, Styles.matchMaterialPresetLabel);
- EditorGUI.indentLevel = 0;
-
- EditorGUILayout.Space();
- EditorGUILayout.EndVertical();
-
- // MISSING GLYPHS
- EditorGUILayout.BeginVertical(EditorStyles.helpBox);
- GUILayout.Label(Styles.dynamicFontSystemSettingsLabel, EditorStyles.boldLabel);
- EditorGUI.indentLevel = 1;
- EditorGUILayout.PropertyField(m_GetFontFeaturesAtRuntime, Styles.getFontFeaturesAtRuntime);
- EditorGUILayout.PropertyField(m_PropMissingGlyphCharacter, Styles.missingGlyphLabel);
- EditorGUILayout.PropertyField(m_PropWarningsDisabled, Styles.disableWarningsLabel);
- //EditorGUILayout.PropertyField(m_DynamicAtlasTextureManager, Styles.dynamicAtlasTextureManager);
- EditorGUI.indentLevel = 0;
-
- EditorGUILayout.Space();
- EditorGUILayout.EndVertical();
-
- // TEXT OBJECT DEFAULT PROPERTIES
- EditorGUILayout.BeginVertical(EditorStyles.helpBox);
- GUILayout.Label(Styles.containerDefaultSettingsLabel, EditorStyles.boldLabel);
- EditorGUI.indentLevel = 1;
-
- EditorGUILayout.PropertyField(m_PropDefaultTextMeshProTextContainerSize, Styles.textMeshProLabel);
- EditorGUILayout.PropertyField(m_PropDefaultTextMeshProUITextContainerSize, Styles.textMeshProUiLabel);
- EditorGUILayout.PropertyField(m_PropEnableRaycastTarget, Styles.enableRaycastTarget);
- EditorGUILayout.PropertyField(m_PropAutoSizeTextContainer, Styles.autoSizeContainerLabel);
- EditorGUILayout.PropertyField(m_PropIsTextObjectScaleStatic, Styles.isTextObjectScaleStaticLabel);
- EditorGUI.indentLevel = 0;
-
- EditorGUILayout.Space();
-
- GUILayout.Label(Styles.textComponentDefaultSettingsLabel, EditorStyles.boldLabel);
- EditorGUI.indentLevel = 1;
- EditorGUILayout.PropertyField(m_PropDefaultFontSize, Styles.defaultFontSize);
-
- EditorGUILayout.BeginHorizontal();
- {
- EditorGUILayout.PrefixLabel(Styles.autoSizeRatioLabel);
- EditorGUIUtility.labelWidth = 32;
- EditorGUIUtility.fieldWidth = 10;
-
- EditorGUI.indentLevel = 0;
- EditorGUILayout.PropertyField(m_PropDefaultAutoSizeMinRatio, Styles.minLabel);
- EditorGUILayout.PropertyField(m_PropDefaultAutoSizeMaxRatio, Styles.maxLabel);
- EditorGUI.indentLevel = 1;
- }
- EditorGUILayout.EndHorizontal();
-
- EditorGUIUtility.labelWidth = labelWidth;
- EditorGUIUtility.fieldWidth = fieldWidth;
-
- EditorGUILayout.PropertyField(m_PropWordWrapping, Styles.wordWrappingLabel);
- EditorGUILayout.PropertyField(m_PropKerning, Styles.kerningLabel);
-
- EditorGUILayout.PropertyField(m_PropExtraPadding, Styles.extraPaddingLabel);
- EditorGUILayout.PropertyField(m_PropTintAllSprites, Styles.tintAllSpritesLabel);
-
- EditorGUILayout.PropertyField(m_PropParseEscapeCharacters, Styles.parseEscapeCharactersLabel);
-
- EditorGUI.indentLevel = 0;
-
- EditorGUILayout.Space();
- EditorGUILayout.EndVertical();
-
- // SPRITE ASSET
- EditorGUILayout.BeginVertical(EditorStyles.helpBox);
- GUILayout.Label(Styles.defaultSpriteAssetLabel, EditorStyles.boldLabel);
- EditorGUI.indentLevel = 1;
- EditorGUILayout.PropertyField(m_PropSpriteAsset, Styles.defaultSpriteAssetLabel);
- EditorGUILayout.PropertyField(m_PropMissingSpriteCharacterUnicode, Styles.missingSpriteCharacterUnicodeLabel);
- EditorGUILayout.PropertyField(m_PropEnableEmojiSupport, Styles.enableEmojiSupportLabel);
- //EditorGUILayout.PropertyField(m_PropSpriteRelativeScaling, Styles.spriteRelativeScale);
- EditorGUILayout.PropertyField(m_PropSpriteAssetPath, Styles.spriteAssetsPathLabel);
- EditorGUI.indentLevel = 0;
-
- EditorGUILayout.Space();
- EditorGUILayout.EndVertical();
-
- // STYLE SHEET
- EditorGUILayout.BeginVertical(EditorStyles.helpBox);
- GUILayout.Label(Styles.defaultStyleSheetLabel, EditorStyles.boldLabel);
- EditorGUI.indentLevel = 1;
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(m_PropStyleSheet, Styles.defaultStyleSheetLabel);
- if (EditorGUI.EndChangeCheck())
- {
- serializedObject.ApplyModifiedProperties();
-
- TMP_StyleSheet styleSheet = m_PropStyleSheet.objectReferenceValue as TMP_StyleSheet;
- if (styleSheet != null)
- styleSheet.RefreshStyles();
- }
- EditorGUILayout.PropertyField(m_PropStyleSheetsResourcePath, Styles.styleSheetResourcePathLabel);
- EditorGUI.indentLevel = 0;
-
- EditorGUILayout.Space();
- EditorGUILayout.EndVertical();
-
- // COLOR GRADIENT PRESETS
- EditorGUILayout.BeginVertical(EditorStyles.helpBox);
- GUILayout.Label(Styles.colorGradientPresetsLabel, EditorStyles.boldLabel);
- EditorGUI.indentLevel = 1;
- EditorGUILayout.PropertyField(m_PropColorGradientPresetsPath, Styles.colorGradientsPathLabel);
- EditorGUI.indentLevel = 0;
-
- EditorGUILayout.Space();
- EditorGUILayout.EndVertical();
-
- // LINE BREAKING RULE
- EditorGUILayout.BeginVertical(EditorStyles.helpBox);
- GUILayout.Label(Styles.lineBreakingLabel, EditorStyles.boldLabel);
- EditorGUI.indentLevel = 1;
- EditorGUILayout.PropertyField(m_PropLeadingCharacters);
- EditorGUILayout.PropertyField(m_PropFollowingCharacters);
-
- EditorGUILayout.Space();
- GUILayout.Label(Styles.koreanSpecificRules, EditorStyles.boldLabel);
- EditorGUILayout.PropertyField(m_PropUseModernHangulLineBreakingRules, new GUIContent("Use Modern Line Breaking", "Determines if traditional or modern line breaking rules will be used to control line breaking. Traditional line breaking rules use the Leading and Following Character rules whereas Modern uses spaces for line breaking."));
-
- EditorGUI.indentLevel = 0;
-
- EditorGUILayout.Space();
- EditorGUILayout.EndVertical();
-
- if (serializedObject.ApplyModifiedProperties() || evt_cmd == k_UndoRedo)
- {
- EditorUtility.SetDirty(target);
- TMPro_EventManager.ON_TMP_SETTINGS_CHANGED();
- }
- }
- }
-
-#if UNITY_2018_3_OR_NEWER
- class TMP_ResourceImporterProvider : SettingsProvider
- {
- TMP_PackageResourceImporter m_ResourceImporter;
-
- public TMP_ResourceImporterProvider()
- : base("Project/TextMesh Pro", SettingsScope.Project)
- {
- }
-
- public override void OnGUI(string searchContext)
- {
- // Lazy creation that supports domain reload
- if (m_ResourceImporter == null)
- m_ResourceImporter = new TMP_PackageResourceImporter();
-
- m_ResourceImporter.OnGUI();
- }
-
- public override void OnDeactivate()
- {
- if (m_ResourceImporter != null)
- m_ResourceImporter.OnDestroy();
- }
-
- static UnityEngine.Object GetTMPSettings()
- {
- return Resources.Load("TMP Settings");
- }
-
- [SettingsProviderGroup]
- static SettingsProvider[] CreateTMPSettingsProvider()
- {
- var providers = new List { new TMP_ResourceImporterProvider() };
-
- if (GetTMPSettings() != null)
- {
- var provider = new AssetSettingsProvider("Project/TextMesh Pro/Settings", GetTMPSettings);
- provider.PopulateSearchKeywordsFromGUIContentProperties();
- providers.Add(provider);
- }
-
- return providers.ToArray();
- }
- }
-#endif
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SettingsEditor.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SettingsEditor.cs.meta
deleted file mode 100644
index a719ae77..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SettingsEditor.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 0386b6eb838c47138cd51d1c1b879a35
-timeCreated: 1436658550
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteAssetEditor.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteAssetEditor.cs
deleted file mode 100644
index e7d48d1b..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteAssetEditor.cs
+++ /dev/null
@@ -1,953 +0,0 @@
-using UnityEngine;
-using UnityEngine.TextCore;
-using UnityEditor;
-using UnityEditorInternal;
-using System.Collections.Generic;
-
-
-namespace TMPro.EditorUtilities
-{
-
- [CustomEditor(typeof(TMP_SpriteAsset))]
- public class TMP_SpriteAssetEditor : Editor
- {
- struct UI_PanelState
- {
- public static bool spriteAssetFaceInfoPanel = true;
- public static bool spriteAtlasInfoPanel = true;
- public static bool fallbackSpriteAssetPanel = true;
- public static bool spriteCharacterTablePanel;
- public static bool spriteGlyphTablePanel;
- }
-
- private static string[] s_UiStateLabel = new string[] { "(Click to collapse) ", "(Click to expand) " };
-
- int m_moveToIndex;
- int m_selectedElement = -1;
- int m_CurrentCharacterPage;
- int m_CurrentGlyphPage;
-
- const string k_UndoRedo = "UndoRedoPerformed";
-
- string m_CharacterSearchPattern;
- List m_CharacterSearchList;
- bool m_IsCharacterSearchDirty;
-
- string m_GlyphSearchPattern;
- List m_GlyphSearchList;
- bool m_IsGlyphSearchDirty;
-
- SerializedProperty m_FaceInfoProperty;
- SerializedProperty m_PointSizeProperty;
- SerializedProperty m_ScaleProperty;
- SerializedProperty m_LineHeightProperty;
- SerializedProperty m_AscentLineProperty;
- SerializedProperty m_BaselineProperty;
- SerializedProperty m_DescentLineProperty;
-
- SerializedProperty m_spriteAtlas_prop;
- SerializedProperty m_material_prop;
- SerializedProperty m_SpriteCharacterTableProperty;
- SerializedProperty m_SpriteGlyphTableProperty;
- ReorderableList m_fallbackSpriteAssetList;
-
- TMP_SpriteAsset m_SpriteAsset;
-
- bool isAssetDirty;
-
- float m_xOffset;
- float m_yOffset;
- float m_xAdvance;
- float m_scale;
-
- public void OnEnable()
- {
- m_SpriteAsset = target as TMP_SpriteAsset;
-
- m_FaceInfoProperty = serializedObject.FindProperty("m_FaceInfo");
- m_PointSizeProperty = m_FaceInfoProperty.FindPropertyRelative("m_PointSize");
- m_ScaleProperty = m_FaceInfoProperty.FindPropertyRelative("m_Scale");
- m_LineHeightProperty = m_FaceInfoProperty.FindPropertyRelative("m_LineHeight");
- m_AscentLineProperty = m_FaceInfoProperty.FindPropertyRelative("m_AscentLine");
- m_BaselineProperty = m_FaceInfoProperty.FindPropertyRelative("m_Baseline");
- m_DescentLineProperty = m_FaceInfoProperty.FindPropertyRelative("m_DescentLine");
-
- m_spriteAtlas_prop = serializedObject.FindProperty("spriteSheet");
- m_material_prop = serializedObject.FindProperty("material");
- m_SpriteCharacterTableProperty = serializedObject.FindProperty("m_SpriteCharacterTable");
- m_SpriteGlyphTableProperty = serializedObject.FindProperty("m_SpriteGlyphTable");
-
- // Fallback TMP Sprite Asset list
- m_fallbackSpriteAssetList = new ReorderableList(serializedObject, serializedObject.FindProperty("fallbackSpriteAssets"), true, true, true, true);
-
- m_fallbackSpriteAssetList.drawElementCallback = (Rect rect, int index, bool isActive, bool isFocused) =>
- {
- var element = m_fallbackSpriteAssetList.serializedProperty.GetArrayElementAtIndex(index);
- rect.y += 2;
- EditorGUI.PropertyField(new Rect(rect.x, rect.y, rect.width, EditorGUIUtility.singleLineHeight), element, GUIContent.none);
- };
-
- m_fallbackSpriteAssetList.drawHeaderCallback = rect =>
- {
- EditorGUI.LabelField(rect, new GUIContent("Fallback Sprite Asset List", "Select the Sprite Assets that will be searched and used as fallback when a given sprite is missing from this sprite asset."));
- };
- }
-
-
- public override void OnInspectorGUI()
- {
-
- //Debug.Log("OnInspectorGUI Called.");
- Event currentEvent = Event.current;
- string evt_cmd = currentEvent.commandName; // Get Current Event CommandName to check for Undo Events
-
- serializedObject.Update();
-
-
- // TEXTMESHPRO SPRITE INFO PANEL
- #region Display Sprite Asset Face Info
- Rect rect = EditorGUILayout.GetControlRect(false, 24);
-
- GUI.Label(rect, new GUIContent("Face Info - v" + m_SpriteAsset.version), TMP_UIStyleManager.sectionHeader);
-
- rect.x += rect.width - 132f;
- rect.y += 2;
- rect.width = 130f;
- rect.height = 18f;
- if (GUI.Button(rect, new GUIContent("Update Sprite Asset")))
- {
- TMP_SpriteAssetMenu.UpdateSpriteAsset(m_SpriteAsset);
- }
- EditorGUI.indentLevel = 1;
-
- EditorGUILayout.PropertyField(m_PointSizeProperty);
- EditorGUILayout.PropertyField(m_ScaleProperty);
- //EditorGUILayout.PropertyField(m_LineHeightProperty);
- EditorGUILayout.PropertyField(m_AscentLineProperty);
- EditorGUILayout.PropertyField(m_BaselineProperty);
- EditorGUILayout.PropertyField(m_DescentLineProperty);
- EditorGUILayout.Space();
- #endregion
-
-
- // ATLAS TEXTURE & MATERIAL
- #region Display Atlas Texture and Material
- rect = EditorGUILayout.GetControlRect(false, 24);
-
- if (GUI.Button(rect, new GUIContent("Atlas & Material"), TMP_UIStyleManager.sectionHeader))
- UI_PanelState.spriteAtlasInfoPanel = !UI_PanelState.spriteAtlasInfoPanel;
-
- GUI.Label(rect, (UI_PanelState.spriteAtlasInfoPanel ? "" : s_UiStateLabel[1]), TMP_UIStyleManager.rightLabel);
-
- if (UI_PanelState.spriteAtlasInfoPanel)
- {
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(m_spriteAtlas_prop, new GUIContent("Sprite Atlas"));
- if (EditorGUI.EndChangeCheck())
- {
- // Assign the new sprite atlas texture to the current material
- Texture2D tex = m_spriteAtlas_prop.objectReferenceValue as Texture2D;
- if (tex != null)
- {
- Material mat = m_material_prop.objectReferenceValue as Material;
- if (mat != null)
- mat.mainTexture = tex;
- }
- }
-
- EditorGUILayout.PropertyField(m_material_prop, new GUIContent("Default Material"));
- EditorGUILayout.Space();
- }
- #endregion
-
-
- // FALLBACK SPRITE ASSETS
- #region Display Sprite Fallbacks
- rect = EditorGUILayout.GetControlRect(false, 24);
- EditorGUI.indentLevel = 0;
- if (GUI.Button(rect, new GUIContent("Fallback Sprite Assets", "Select the Sprite Assets that will be searched and used as fallback when a given sprite is missing from this sprite asset."), TMP_UIStyleManager.sectionHeader))
- UI_PanelState.fallbackSpriteAssetPanel = !UI_PanelState.fallbackSpriteAssetPanel;
-
- GUI.Label(rect, (UI_PanelState.fallbackSpriteAssetPanel ? "" : s_UiStateLabel[1]), TMP_UIStyleManager.rightLabel);
-
- if (UI_PanelState.fallbackSpriteAssetPanel)
- {
- m_fallbackSpriteAssetList.DoLayoutList();
- EditorGUILayout.Space();
- }
- #endregion
-
-
- // SPRITE CHARACTER TABLE
- #region Display Sprite Character Table
- EditorGUI.indentLevel = 0;
- rect = EditorGUILayout.GetControlRect(false, 24);
-
- if (GUI.Button(rect, new GUIContent("Sprite Character Table", "List of sprite characters contained in this sprite asset."), TMP_UIStyleManager.sectionHeader))
- UI_PanelState.spriteCharacterTablePanel = !UI_PanelState.spriteCharacterTablePanel;
-
- GUI.Label(rect, (UI_PanelState.spriteCharacterTablePanel ? "" : s_UiStateLabel[1]), TMP_UIStyleManager.rightLabel);
-
- if (UI_PanelState.spriteCharacterTablePanel)
- {
- int arraySize = m_SpriteCharacterTableProperty.arraySize;
- int itemsPerPage = 10;
-
- // Display Glyph Management Tools
- EditorGUILayout.BeginVertical(EditorStyles.helpBox, GUILayout.ExpandWidth(true));
- {
- // Search Bar implementation
- #region DISPLAY SEARCH BAR
- EditorGUILayout.BeginHorizontal();
- {
- EditorGUIUtility.labelWidth = 110f;
- EditorGUI.BeginChangeCheck();
- string searchPattern = EditorGUILayout.TextField("Sprite Search", m_CharacterSearchPattern, "SearchTextField");
- if (EditorGUI.EndChangeCheck() || m_IsCharacterSearchDirty)
- {
- if (string.IsNullOrEmpty(searchPattern) == false)
- {
- //GUIUtility.keyboardControl = 0;
- m_CharacterSearchPattern = searchPattern.ToLower(System.Globalization.CultureInfo.InvariantCulture).Trim();
-
- // Search Glyph Table for potential matches
- SearchCharacterTable(m_CharacterSearchPattern, ref m_CharacterSearchList);
- }
- else
- m_CharacterSearchPattern = null;
-
- m_IsCharacterSearchDirty = false;
- }
-
- string styleName = string.IsNullOrEmpty(m_CharacterSearchPattern) ? "SearchCancelButtonEmpty" : "SearchCancelButton";
- if (GUILayout.Button(GUIContent.none, styleName))
- {
- GUIUtility.keyboardControl = 0;
- m_CharacterSearchPattern = string.Empty;
- }
- }
- EditorGUILayout.EndHorizontal();
- #endregion
-
- // Display Page Navigation
- if (!string.IsNullOrEmpty(m_CharacterSearchPattern))
- arraySize = m_CharacterSearchList.Count;
-
- // Display Page Navigation
- DisplayPageNavigation(ref m_CurrentCharacterPage, arraySize, itemsPerPage);
- }
- EditorGUILayout.EndVertical();
-
- if (arraySize > 0)
- {
- // Display each SpriteInfo entry using the SpriteInfo property drawer.
- for (int i = itemsPerPage * m_CurrentCharacterPage; i < arraySize && i < itemsPerPage * (m_CurrentCharacterPage + 1); i++)
- {
- // Define the start of the selection region of the element.
- Rect elementStartRegion = GUILayoutUtility.GetRect(0f, 0f, GUILayout.ExpandWidth(true));
-
- int elementIndex = i;
- if (!string.IsNullOrEmpty(m_CharacterSearchPattern))
- elementIndex = m_CharacterSearchList[i];
-
- SerializedProperty spriteCharacterProperty = m_SpriteCharacterTableProperty.GetArrayElementAtIndex(elementIndex);
-
- EditorGUILayout.BeginVertical(EditorStyles.helpBox);
- {
- EditorGUI.BeginDisabledGroup(i != m_selectedElement);
- {
- EditorGUILayout.PropertyField(spriteCharacterProperty);
- }
- EditorGUI.EndDisabledGroup();
- }
- EditorGUILayout.EndVertical();
-
- // Define the end of the selection region of the element.
- Rect elementEndRegion = GUILayoutUtility.GetRect(0f, 0f, GUILayout.ExpandWidth(true));
-
- // Check for Item selection
- Rect selectionArea = new Rect(elementStartRegion.x, elementStartRegion.y, elementEndRegion.width, elementEndRegion.y - elementStartRegion.y);
- if (DoSelectionCheck(selectionArea))
- {
- if (m_selectedElement == i)
- {
- m_selectedElement = -1;
- }
- else
- {
- m_selectedElement = i;
- GUIUtility.keyboardControl = 0;
- }
- }
-
- // Draw & Handle Section Area
- if (m_selectedElement == i)
- {
- // Draw selection highlight
- TMP_EditorUtility.DrawBox(selectionArea, 2f, new Color32(40, 192, 255, 255));
-
- // Draw options to MoveUp, MoveDown, Add or Remove Sprites
- Rect controlRect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight * 1f);
- controlRect.width /= 8;
-
- // Move sprite up.
- bool guiEnabled = GUI.enabled;
- if (i == 0) { GUI.enabled = false; }
- if (GUI.Button(controlRect, "Up"))
- {
- SwapCharacterElements(i, i - 1);
- }
- GUI.enabled = guiEnabled;
-
- // Move sprite down.
- controlRect.x += controlRect.width;
- if (i == arraySize - 1) { GUI.enabled = false; }
- if (GUI.Button(controlRect, "Down"))
- {
- SwapCharacterElements(i, i + 1);
- }
- GUI.enabled = guiEnabled;
-
- // Move sprite to new index
- controlRect.x += controlRect.width * 2;
- //if (i == arraySize - 1) { GUI.enabled = false; }
- m_moveToIndex = EditorGUI.IntField(controlRect, m_moveToIndex);
- controlRect.x -= controlRect.width;
- if (GUI.Button(controlRect, "Goto"))
- {
- MoveCharacterToIndex(i, m_moveToIndex);
- }
- //controlRect.x += controlRect.width;
- GUI.enabled = guiEnabled;
-
- // Add new Sprite
- controlRect.x += controlRect.width * 4;
- if (GUI.Button(controlRect, "+"))
- {
- m_SpriteCharacterTableProperty.arraySize += 1;
-
- int index = m_SpriteCharacterTableProperty.arraySize - 1;
-
- SerializedProperty spriteInfo_prop = m_SpriteCharacterTableProperty.GetArrayElementAtIndex(index);
-
- // Copy properties of the selected element
- CopyCharacterSerializedProperty(m_SpriteCharacterTableProperty.GetArrayElementAtIndex(elementIndex), ref spriteInfo_prop);
-
- //spriteInfo_prop.FindPropertyRelative("m_Index").intValue = index;
- serializedObject.ApplyModifiedProperties();
-
- m_IsCharacterSearchDirty = true;
- }
-
- // Delete selected Sprite
- controlRect.x += controlRect.width;
- if (m_selectedElement == -1) GUI.enabled = false;
- if (GUI.Button(controlRect, "-"))
- {
- m_SpriteCharacterTableProperty.DeleteArrayElementAtIndex(elementIndex);
-
- m_selectedElement = -1;
- serializedObject.ApplyModifiedProperties();
-
- m_IsCharacterSearchDirty = true;
-
- return;
- }
-
-
- }
- }
- }
-
- DisplayPageNavigation(ref m_CurrentCharacterPage, arraySize, itemsPerPage);
-
- EditorGUIUtility.labelWidth = 40f;
- EditorGUIUtility.fieldWidth = 20f;
-
- GUILayout.Space(5f);
-
- // GLOBAL TOOLS
- #region Global Tools
- /*
- GUI.enabled = true;
- EditorGUILayout.BeginVertical(EditorStyles.helpBox);
- rect = EditorGUILayout.GetControlRect(false, 40);
-
- float width = (rect.width - 75f) / 4;
- EditorGUI.LabelField(rect, "Global Offsets & Scale", EditorStyles.boldLabel);
-
-
- rect.x += 70;
- bool old_ChangedState = GUI.changed;
-
- GUI.changed = false;
- m_xOffset = EditorGUI.FloatField(new Rect(rect.x + 5f + width * 0, rect.y + 20, width - 5f, 18), new GUIContent("OX:"), m_xOffset);
- if (GUI.changed) UpdateGlobalProperty("m_HorizontalBearingX", m_xOffset);
-
- m_yOffset = EditorGUI.FloatField(new Rect(rect.x + 5f + width * 1, rect.y + 20, width - 5f, 18), new GUIContent("OY:"), m_yOffset);
- if (GUI.changed) UpdateGlobalProperty("m_HorizontalBearingY", m_yOffset);
-
- m_xAdvance = EditorGUI.FloatField(new Rect(rect.x + 5f + width * 2, rect.y + 20, width - 5f, 18), new GUIContent("ADV."), m_xAdvance);
- if (GUI.changed) UpdateGlobalProperty("m_HorizontalAdvance", m_xAdvance);
-
- m_scale = EditorGUI.FloatField(new Rect(rect.x + 5f + width * 3, rect.y + 20, width - 5f, 18), new GUIContent("SF."), m_scale);
- if (GUI.changed) UpdateGlobalProperty("m_Scale", m_scale);
-
- EditorGUILayout.EndVertical();
-
- GUI.changed = old_ChangedState;
- */
- #endregion
-
- }
- #endregion
-
-
- // SPRITE GLYPH TABLE
- #region Display Sprite Glyph Table
- EditorGUI.indentLevel = 0;
- rect = EditorGUILayout.GetControlRect(false, 24);
-
- if (GUI.Button(rect, new GUIContent("Sprite Glyph Table", "A list of the SpriteGlyphs contained in this sprite asset."), TMP_UIStyleManager.sectionHeader))
- UI_PanelState.spriteGlyphTablePanel = !UI_PanelState.spriteGlyphTablePanel;
-
- GUI.Label(rect, (UI_PanelState.spriteGlyphTablePanel ? "" : s_UiStateLabel[1]), TMP_UIStyleManager.rightLabel);
-
- if (UI_PanelState.spriteGlyphTablePanel)
- {
- int arraySize = m_SpriteGlyphTableProperty.arraySize;
- int itemsPerPage = 10;
-
- // Display Glyph Management Tools
- EditorGUILayout.BeginVertical(EditorStyles.helpBox, GUILayout.ExpandWidth(true));
- {
- // Search Bar implementation
- #region DISPLAY SEARCH BAR
- EditorGUILayout.BeginHorizontal();
- {
- EditorGUIUtility.labelWidth = 110f;
- EditorGUI.BeginChangeCheck();
- string searchPattern = EditorGUILayout.TextField("Sprite Search", m_GlyphSearchPattern, "SearchTextField");
- if (EditorGUI.EndChangeCheck() || m_IsGlyphSearchDirty)
- {
- if (string.IsNullOrEmpty(searchPattern) == false)
- {
- //GUIUtility.keyboardControl = 0;
- m_GlyphSearchPattern = searchPattern.ToLower(System.Globalization.CultureInfo.InvariantCulture).Trim();
-
- // Search Glyph Table for potential matches
- SearchCharacterTable(m_GlyphSearchPattern, ref m_GlyphSearchList);
- }
- else
- m_GlyphSearchPattern = null;
-
- m_IsGlyphSearchDirty = false;
- }
-
- string styleName = string.IsNullOrEmpty(m_GlyphSearchPattern) ? "SearchCancelButtonEmpty" : "SearchCancelButton";
- if (GUILayout.Button(GUIContent.none, styleName))
- {
- GUIUtility.keyboardControl = 0;
- m_GlyphSearchPattern = string.Empty;
- }
- }
- EditorGUILayout.EndHorizontal();
- #endregion
-
- // Display Page Navigation
- if (!string.IsNullOrEmpty(m_GlyphSearchPattern))
- arraySize = m_GlyphSearchList.Count;
-
- // Display Page Navigation
- DisplayPageNavigation(ref m_CurrentGlyphPage, arraySize, itemsPerPage);
- }
- EditorGUILayout.EndVertical();
-
- if (arraySize > 0)
- {
- // Display each SpriteInfo entry using the SpriteInfo property drawer.
- for (int i = itemsPerPage * m_CurrentGlyphPage; i < arraySize && i < itemsPerPage * (m_CurrentGlyphPage + 1); i++)
- {
- // Define the start of the selection region of the element.
- Rect elementStartRegion = GUILayoutUtility.GetRect(0f, 0f, GUILayout.ExpandWidth(true));
-
- int elementIndex = i;
- if (!string.IsNullOrEmpty(m_GlyphSearchPattern))
- elementIndex = m_GlyphSearchList[i];
-
- SerializedProperty spriteGlyphProperty = m_SpriteGlyphTableProperty.GetArrayElementAtIndex(elementIndex);
-
- EditorGUILayout.BeginVertical(EditorStyles.helpBox);
- {
- EditorGUI.BeginDisabledGroup(i != m_selectedElement);
- {
- EditorGUILayout.PropertyField(spriteGlyphProperty);
- }
- EditorGUI.EndDisabledGroup();
- }
- EditorGUILayout.EndVertical();
-
- // Define the end of the selection region of the element.
- Rect elementEndRegion = GUILayoutUtility.GetRect(0f, 0f, GUILayout.ExpandWidth(true));
-
- // Check for Item selection
- Rect selectionArea = new Rect(elementStartRegion.x, elementStartRegion.y, elementEndRegion.width, elementEndRegion.y - elementStartRegion.y);
- if (DoSelectionCheck(selectionArea))
- {
- if (m_selectedElement == i)
- {
- m_selectedElement = -1;
- }
- else
- {
- m_selectedElement = i;
- GUIUtility.keyboardControl = 0;
- }
- }
-
- // Draw & Handle Section Area
- if (m_selectedElement == i)
- {
- // Draw selection highlight
- TMP_EditorUtility.DrawBox(selectionArea, 2f, new Color32(40, 192, 255, 255));
-
- // Draw options to MoveUp, MoveDown, Add or Remove Sprites
- Rect controlRect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight * 1f);
- controlRect.width /= 8;
-
- // Move sprite up.
- bool guiEnabled = GUI.enabled;
- if (i == 0) { GUI.enabled = false; }
- if (GUI.Button(controlRect, "Up"))
- {
- SwapGlyphElements(i, i - 1);
- }
- GUI.enabled = guiEnabled;
-
- // Move sprite down.
- controlRect.x += controlRect.width;
- if (i == arraySize - 1) { GUI.enabled = false; }
- if (GUI.Button(controlRect, "Down"))
- {
- SwapGlyphElements(i, i + 1);
- }
- GUI.enabled = guiEnabled;
-
- // Move sprite to new index
- controlRect.x += controlRect.width * 2;
- //if (i == arraySize - 1) { GUI.enabled = false; }
- m_moveToIndex = EditorGUI.IntField(controlRect, m_moveToIndex);
- controlRect.x -= controlRect.width;
- if (GUI.Button(controlRect, "Goto"))
- {
- MoveGlyphToIndex(i, m_moveToIndex);
- }
- //controlRect.x += controlRect.width;
- GUI.enabled = guiEnabled;
-
- // Add new Sprite
- controlRect.x += controlRect.width * 4;
- if (GUI.Button(controlRect, "+"))
- {
- m_SpriteGlyphTableProperty.arraySize += 1;
-
- int index = m_SpriteGlyphTableProperty.arraySize - 1;
-
- SerializedProperty newSpriteGlyphProperty = m_SpriteGlyphTableProperty.GetArrayElementAtIndex(index);
-
- // Copy properties of the selected element
- CopyGlyphSerializedProperty(m_SpriteGlyphTableProperty.GetArrayElementAtIndex(elementIndex), ref newSpriteGlyphProperty);
-
- newSpriteGlyphProperty.FindPropertyRelative("m_Index").intValue = index;
-
- serializedObject.ApplyModifiedProperties();
-
- m_IsGlyphSearchDirty = true;
-
- //m_SpriteAsset.UpdateLookupTables();
- }
-
- // Delete selected Sprite
- controlRect.x += controlRect.width;
- if (m_selectedElement == -1) GUI.enabled = false;
- if (GUI.Button(controlRect, "-"))
- {
- SerializedProperty selectedSpriteGlyphProperty = m_SpriteGlyphTableProperty.GetArrayElementAtIndex(elementIndex);
-
- int selectedGlyphIndex = selectedSpriteGlyphProperty.FindPropertyRelative("m_Index").intValue;
-
- m_SpriteGlyphTableProperty.DeleteArrayElementAtIndex(elementIndex);
-
- // Remove all Sprite Characters referencing this glyph.
- for (int j = 0; j < m_SpriteCharacterTableProperty.arraySize; j++)
- {
- int glyphIndex = m_SpriteCharacterTableProperty.GetArrayElementAtIndex(j).FindPropertyRelative("m_GlyphIndex").intValue;
-
- if (glyphIndex == selectedGlyphIndex)
- {
- // Remove character
- m_SpriteCharacterTableProperty.DeleteArrayElementAtIndex(j);
- }
- }
-
- m_selectedElement = -1;
- serializedObject.ApplyModifiedProperties();
-
- m_IsGlyphSearchDirty = true;
-
- //m_SpriteAsset.UpdateLookupTables();
-
- return;
- }
-
-
- }
- }
- }
-
- DisplayPageNavigation(ref m_CurrentGlyphPage, arraySize, itemsPerPage);
-
- EditorGUIUtility.labelWidth = 40f;
- EditorGUIUtility.fieldWidth = 20f;
-
- GUILayout.Space(5f);
-
- // GLOBAL TOOLS
- #region Global Tools
- GUI.enabled = true;
- EditorGUILayout.BeginVertical(EditorStyles.helpBox);
- rect = EditorGUILayout.GetControlRect(false, 40);
-
- float width = (rect.width - 75f) / 4;
- EditorGUI.LabelField(rect, "Global Offsets & Scale", EditorStyles.boldLabel);
-
-
- rect.x += 70;
- bool old_ChangedState = GUI.changed;
-
- GUI.changed = false;
- m_xOffset = EditorGUI.FloatField(new Rect(rect.x + 5f + width * 0, rect.y + 20, width - 5f, 18), new GUIContent("OX:"), m_xOffset);
- if (GUI.changed) UpdateGlobalProperty("m_HorizontalBearingX", m_xOffset);
-
- m_yOffset = EditorGUI.FloatField(new Rect(rect.x + 5f + width * 1, rect.y + 20, width - 5f, 18), new GUIContent("OY:"), m_yOffset);
- if (GUI.changed) UpdateGlobalProperty("m_HorizontalBearingY", m_yOffset);
-
- m_xAdvance = EditorGUI.FloatField(new Rect(rect.x + 5f + width * 2, rect.y + 20, width - 5f, 18), new GUIContent("ADV."), m_xAdvance);
- if (GUI.changed) UpdateGlobalProperty("m_HorizontalAdvance", m_xAdvance);
-
- m_scale = EditorGUI.FloatField(new Rect(rect.x + 5f + width * 3, rect.y + 20, width - 5f, 18), new GUIContent("SF."), m_scale);
- if (GUI.changed) UpdateGlobalProperty("m_Scale", m_scale);
-
- EditorGUILayout.EndVertical();
- #endregion
-
- GUI.changed = old_ChangedState;
-
- }
- #endregion
-
-
- if (serializedObject.ApplyModifiedProperties() || evt_cmd == k_UndoRedo || isAssetDirty)
- {
- if (m_SpriteAsset.m_IsSpriteAssetLookupTablesDirty || evt_cmd == k_UndoRedo)
- m_SpriteAsset.UpdateLookupTables();
-
- TMPro_EventManager.ON_SPRITE_ASSET_PROPERTY_CHANGED(true, m_SpriteAsset);
-
- isAssetDirty = false;
- EditorUtility.SetDirty(target);
- }
-
- // Clear selection if mouse event was not consumed.
- GUI.enabled = true;
- if (currentEvent.type == EventType.MouseDown && currentEvent.button == 0)
- m_selectedElement = -1;
-
- }
-
-
- ///
- ///
- ///
- ///
- ///
- void DisplayPageNavigation(ref int currentPage, int arraySize, int itemsPerPage)
- {
- Rect pagePos = EditorGUILayout.GetControlRect(false, 20);
- pagePos.width /= 3;
-
- int shiftMultiplier = Event.current.shift ? 10 : 1; // Page + Shift goes 10 page forward
-
- // Previous Page
- GUI.enabled = currentPage > 0;
-
- if (GUI.Button(pagePos, "Previous Page"))
- {
- currentPage -= 1 * shiftMultiplier;
- //m_isNewPage = true;
- }
-
- // Page Counter
- GUI.enabled = true;
- pagePos.x += pagePos.width;
- int totalPages = (int)(arraySize / (float)itemsPerPage + 0.999f);
- GUI.Label(pagePos, "Page " + (currentPage + 1) + " / " + totalPages, TMP_UIStyleManager.centeredLabel);
-
- // Next Page
- pagePos.x += pagePos.width;
- GUI.enabled = itemsPerPage * (currentPage + 1) < arraySize;
-
- if (GUI.Button(pagePos, "Next Page"))
- {
- currentPage += 1 * shiftMultiplier;
- //m_isNewPage = true;
- }
-
- // Clamp page range
- currentPage = Mathf.Clamp(currentPage, 0, arraySize / itemsPerPage);
-
- GUI.enabled = true;
- }
-
-
- ///
- /// Method to update the properties of all sprites
- ///
- ///
- ///
- void UpdateGlobalProperty(string property, float value)
- {
- int arraySize = m_SpriteGlyphTableProperty.arraySize;
-
- for (int i = 0; i < arraySize; i++)
- {
- // Get a reference to the sprite glyph.
- SerializedProperty spriteGlyphProperty = m_SpriteGlyphTableProperty.GetArrayElementAtIndex(i);
-
- if (property == "m_Scale")
- {
- spriteGlyphProperty.FindPropertyRelative(property).floatValue = value;
- }
- else
- {
- SerializedProperty glyphMetricsProperty = spriteGlyphProperty.FindPropertyRelative("m_Metrics");
- glyphMetricsProperty.FindPropertyRelative(property).floatValue = value;
- }
- }
-
- GUI.changed = false;
- }
-
- // Check if any of the Style elements were clicked on.
- private bool DoSelectionCheck(Rect selectionArea)
- {
- Event currentEvent = Event.current;
-
- switch (currentEvent.type)
- {
- case EventType.MouseDown:
- if (selectionArea.Contains(currentEvent.mousePosition) && currentEvent.button == 0)
- {
- currentEvent.Use();
- return true;
- }
- break;
- }
-
- return false;
- }
-
-
- ///
- /// Swap the sprite item at the currently selected array index to another index.
- ///
- /// Selected index.
- /// New index.
- void SwapCharacterElements(int selectedIndex, int newIndex)
- {
- m_SpriteCharacterTableProperty.MoveArrayElement(selectedIndex, newIndex);
- m_selectedElement = newIndex;
- m_IsCharacterSearchDirty = true;
- m_SpriteAsset.m_IsSpriteAssetLookupTablesDirty = true;
- }
-
- ///
- /// Move Sprite Element at selected index to another index and reorder sprite list.
- ///
- ///
- ///
- void MoveCharacterToIndex(int selectedIndex, int newIndex)
- {
- int arraySize = m_SpriteCharacterTableProperty.arraySize;
-
- if (newIndex >= arraySize)
- newIndex = arraySize - 1;
-
- m_SpriteCharacterTableProperty.MoveArrayElement(selectedIndex, newIndex);
-
- m_selectedElement = newIndex;
- m_IsCharacterSearchDirty = true;
- m_SpriteAsset.m_IsSpriteAssetLookupTablesDirty = true;
-
- // TODO: Need to handle switching pages if the character or glyph is moved to a different page.
- }
-
- ///
- ///
- ///
- ///
- ///
- void SwapGlyphElements(int selectedIndex, int newIndex)
- {
- m_SpriteGlyphTableProperty.MoveArrayElement(selectedIndex, newIndex);
- m_selectedElement = newIndex;
- m_IsGlyphSearchDirty = true;
- m_SpriteAsset.m_IsSpriteAssetLookupTablesDirty = true;
- }
-
- ///
- /// Move Sprite Element at selected index to another index and reorder sprite list.
- ///
- ///
- ///
- void MoveGlyphToIndex(int selectedIndex, int newIndex)
- {
- int arraySize = m_SpriteGlyphTableProperty.arraySize;
-
- if (newIndex >= arraySize)
- newIndex = arraySize - 1;
-
- m_SpriteGlyphTableProperty.MoveArrayElement(selectedIndex, newIndex);
-
- m_selectedElement = newIndex;
- m_IsGlyphSearchDirty = true;
- m_SpriteAsset.m_IsSpriteAssetLookupTablesDirty = true;
-
- // TODO: Need to handle switching pages if the character or glyph is moved to a different page.
- }
-
-
- ///
- ///
- ///
- ///
- ///
- void CopyCharacterSerializedProperty(SerializedProperty source, ref SerializedProperty target)
- {
- target.FindPropertyRelative("m_Name").stringValue = source.FindPropertyRelative("m_Name").stringValue;
- target.FindPropertyRelative("m_HashCode").intValue = source.FindPropertyRelative("m_HashCode").intValue;
- target.FindPropertyRelative("m_Unicode").intValue = source.FindPropertyRelative("m_Unicode").intValue;
- target.FindPropertyRelative("m_GlyphIndex").intValue = source.FindPropertyRelative("m_GlyphIndex").intValue;
- target.FindPropertyRelative("m_Scale").floatValue = source.FindPropertyRelative("m_Scale").floatValue;
- }
-
- void CopyGlyphSerializedProperty(SerializedProperty srcGlyph, ref SerializedProperty dstGlyph)
- {
- // TODO : Should make a generic function which copies each of the properties.
-
- // Index
- dstGlyph.FindPropertyRelative("m_Index").intValue = srcGlyph.FindPropertyRelative("m_Index").intValue;
-
- // GlyphMetrics
- SerializedProperty srcGlyphMetrics = srcGlyph.FindPropertyRelative("m_Metrics");
- SerializedProperty dstGlyphMetrics = dstGlyph.FindPropertyRelative("m_Metrics");
-
- dstGlyphMetrics.FindPropertyRelative("m_Width").floatValue = srcGlyphMetrics.FindPropertyRelative("m_Width").floatValue;
- dstGlyphMetrics.FindPropertyRelative("m_Height").floatValue = srcGlyphMetrics.FindPropertyRelative("m_Height").floatValue;
- dstGlyphMetrics.FindPropertyRelative("m_HorizontalBearingX").floatValue = srcGlyphMetrics.FindPropertyRelative("m_HorizontalBearingX").floatValue;
- dstGlyphMetrics.FindPropertyRelative("m_HorizontalBearingY").floatValue = srcGlyphMetrics.FindPropertyRelative("m_HorizontalBearingY").floatValue;
- dstGlyphMetrics.FindPropertyRelative("m_HorizontalAdvance").floatValue = srcGlyphMetrics.FindPropertyRelative("m_HorizontalAdvance").floatValue;
-
- // GlyphRect
- SerializedProperty srcGlyphRect = srcGlyph.FindPropertyRelative("m_GlyphRect");
- SerializedProperty dstGlyphRect = dstGlyph.FindPropertyRelative("m_GlyphRect");
-
- dstGlyphRect.FindPropertyRelative("m_X").intValue = srcGlyphRect.FindPropertyRelative("m_X").intValue;
- dstGlyphRect.FindPropertyRelative("m_Y").intValue = srcGlyphRect.FindPropertyRelative("m_Y").intValue;
- dstGlyphRect.FindPropertyRelative("m_Width").intValue = srcGlyphRect.FindPropertyRelative("m_Width").intValue;
- dstGlyphRect.FindPropertyRelative("m_Height").intValue = srcGlyphRect.FindPropertyRelative("m_Height").intValue;
-
- dstGlyph.FindPropertyRelative("m_Scale").floatValue = srcGlyph.FindPropertyRelative("m_Scale").floatValue;
- dstGlyph.FindPropertyRelative("m_AtlasIndex").intValue = srcGlyph.FindPropertyRelative("m_AtlasIndex").intValue;
- }
-
-
- ///
- ///
- ///
- ///
- ///
- void SearchCharacterTable(string searchPattern, ref List searchResults)
- {
- if (searchResults == null) searchResults = new List();
- searchResults.Clear();
-
- int arraySize = m_SpriteCharacterTableProperty.arraySize;
-
- for (int i = 0; i < arraySize; i++)
- {
- SerializedProperty sourceSprite = m_SpriteCharacterTableProperty.GetArrayElementAtIndex(i);
-
- // Check for potential match against array index
- if (i.ToString().Contains(searchPattern))
- {
- searchResults.Add(i);
- continue;
- }
-
- // Check for potential match against decimal id
- int id = sourceSprite.FindPropertyRelative("m_GlyphIndex").intValue;
- if (id.ToString().Contains(searchPattern))
- {
- searchResults.Add(i);
- continue;
- }
-
- // Check for potential match against name
- string name = sourceSprite.FindPropertyRelative("m_Name").stringValue.ToLower(System.Globalization.CultureInfo.InvariantCulture).Trim();
- if (name.Contains(searchPattern))
- {
- searchResults.Add(i);
- continue;
- }
- }
- }
-
- void SearchGlyphTable(string searchPattern, ref List searchResults)
- {
- if (searchResults == null) searchResults = new List();
- searchResults.Clear();
-
- int arraySize = m_SpriteGlyphTableProperty.arraySize;
-
- for (int i = 0; i < arraySize; i++)
- {
- SerializedProperty sourceSprite = m_SpriteGlyphTableProperty.GetArrayElementAtIndex(i);
-
- // Check for potential match against array index
- if (i.ToString().Contains(searchPattern))
- {
- searchResults.Add(i);
- continue;
- }
-
- // Check for potential match against decimal id
- int id = sourceSprite.FindPropertyRelative("m_GlyphIndex").intValue;
- if (id.ToString().Contains(searchPattern))
- {
- searchResults.Add(i);
- continue;
- }
-
- // Check for potential match against name
- string name = sourceSprite.FindPropertyRelative("m_Name").stringValue.ToLower(System.Globalization.CultureInfo.InvariantCulture).Trim();
- if (name.Contains(searchPattern))
- {
- searchResults.Add(i);
- continue;
- }
- }
- }
-
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteAssetEditor.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteAssetEditor.cs.meta
deleted file mode 100644
index 9fcede33..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteAssetEditor.cs.meta
+++ /dev/null
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: b09be1f217d34247af54863a2f5587e1
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteAssetImporter.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteAssetImporter.cs
deleted file mode 100644
index 89be4adf..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteAssetImporter.cs
+++ /dev/null
@@ -1,257 +0,0 @@
-using System;
-using UnityEngine;
-using UnityEngine.TextCore;
-using UnityEditor;
-using System.IO;
-using System.Collections.Generic;
-using TMPro.EditorUtilities;
-using TMPro.SpriteAssetUtilities;
-
-namespace TMPro
-{
- public class TMP_SpriteAssetImporter : EditorWindow
- {
- // Create Sprite Asset Editor Window
- [MenuItem("Window/TextMeshPro/Sprite Importer", false, 2026)]
- public static void ShowFontAtlasCreatorWindow()
- {
- var window = GetWindow();
- window.titleContent = new GUIContent("Sprite Importer");
- window.Focus();
- }
-
- Texture2D m_SpriteAtlas;
- SpriteAssetImportFormats m_SpriteDataFormat = SpriteAssetImportFormats.TexturePackerJsonArray;
- TextAsset m_JsonFile;
-
- string m_CreationFeedback;
-
- TMP_SpriteAsset m_SpriteAsset;
- List m_SpriteInfoList = new List();
-
- ///
- ///
- ///
- void OnEnable()
- {
- // Set Editor Window Size
- SetEditorWindowSize();
- }
-
- ///
- ///
- ///
- public void OnGUI()
- {
- DrawEditorPanel();
- }
-
- ///
- ///
- ///
- private void OnDisable()
- {
- // Clean up sprite asset object that may have been created and not saved.
- if (m_SpriteAsset != null && !EditorUtility.IsPersistent(m_SpriteAsset))
- DestroyImmediate(m_SpriteAsset);
- }
-
- ///
- ///
- ///
- void DrawEditorPanel()
- {
- // label
- GUILayout.Label("Import Settings", EditorStyles.boldLabel);
-
- EditorGUI.BeginChangeCheck();
-
- // Sprite Texture Selection
- m_JsonFile = EditorGUILayout.ObjectField("Sprite Data Source", m_JsonFile, typeof(TextAsset), false) as TextAsset;
-
- m_SpriteDataFormat = (SpriteAssetImportFormats)EditorGUILayout.EnumPopup("Import Format", m_SpriteDataFormat);
-
- // Sprite Texture Selection
- m_SpriteAtlas = EditorGUILayout.ObjectField("Sprite Texture Atlas", m_SpriteAtlas, typeof(Texture2D), false) as Texture2D;
-
- if (EditorGUI.EndChangeCheck())
- {
- m_CreationFeedback = string.Empty;
- }
-
- GUILayout.Space(10);
-
- GUI.enabled = m_JsonFile != null && m_SpriteAtlas != null && m_SpriteDataFormat != SpriteAssetImportFormats.None;
-
- // Create Sprite Asset
- if (GUILayout.Button("Create Sprite Asset"))
- {
- m_CreationFeedback = string.Empty;
-
- // Clean up sprite asset object that may have been previously created.
- if (m_SpriteAsset != null && !EditorUtility.IsPersistent(m_SpriteAsset))
- DestroyImmediate(m_SpriteAsset);
-
- // Read json data file
- if (m_JsonFile != null)
- {
- switch (m_SpriteDataFormat)
- {
- case SpriteAssetImportFormats.TexturePackerJsonArray:
- TexturePacker_JsonArray.SpriteDataObject jsonData = null;
- try
- {
- jsonData = JsonUtility.FromJson(m_JsonFile.text);
- }
- catch
- {
- m_CreationFeedback = "The Sprite Data Source file [" + m_JsonFile.name + "] appears to be invalid or incorrectly formatted.";
- }
-
- if (jsonData != null && jsonData.frames != null && jsonData.frames.Count > 0)
- {
- int spriteCount = jsonData.frames.Count;
-
- // Update import results
- m_CreationFeedback = "Import Results\n--------------------\n";
- m_CreationFeedback += "" + spriteCount + " Sprites were imported from file.";
-
- // Create new Sprite Asset
- m_SpriteAsset = CreateInstance();
-
- // Assign sprite sheet / atlas texture to sprite asset
- m_SpriteAsset.spriteSheet = m_SpriteAtlas;
-
- List spriteGlyphTable = new List();
- List spriteCharacterTable = new List();
-
- PopulateSpriteTables(jsonData, spriteCharacterTable, spriteGlyphTable);
-
- m_SpriteAsset.spriteCharacterTable = spriteCharacterTable;
- m_SpriteAsset.spriteGlyphTable = spriteGlyphTable;
- }
- break;
- }
- }
- }
-
- GUI.enabled = true;
-
- // Creation Feedback
- GUILayout.Space(5);
- GUILayout.BeginVertical(EditorStyles.helpBox, GUILayout.Height(60));
- {
- EditorGUILayout.TextArea(m_CreationFeedback, TMP_UIStyleManager.label);
- }
- GUILayout.EndVertical();
-
- GUILayout.Space(5);
- GUI.enabled = m_JsonFile != null && m_SpriteAtlas && m_SpriteInfoList != null && m_SpriteAsset != null;
- if (GUILayout.Button("Save Sprite Asset") && m_JsonFile != null)
- {
- string filePath = EditorUtility.SaveFilePanel("Save Sprite Asset File", new FileInfo(AssetDatabase.GetAssetPath(m_JsonFile)).DirectoryName, m_JsonFile.name, "asset");
-
- if (filePath.Length == 0)
- return;
-
- SaveSpriteAsset(filePath);
- }
- GUI.enabled = true;
- }
-
- ///
- ///
- ///
- ///
- ///
- ///
- private static void PopulateSpriteTables(TexturePacker_JsonArray.SpriteDataObject spriteDataObject, List spriteCharacterTable, List spriteGlyphTable)
- {
- List importedSprites = spriteDataObject.frames;
-
- float atlasHeight = spriteDataObject.meta.size.h;
-
- for (int i = 0; i < importedSprites.Count; i++)
- {
- TexturePacker_JsonArray.Frame spriteData = importedSprites[i];
-
- TMP_SpriteGlyph spriteGlyph = new TMP_SpriteGlyph();
- spriteGlyph.index = (uint)i;
-
- spriteGlyph.metrics = new GlyphMetrics((int)spriteData.frame.w, (int)spriteData.frame.h, -spriteData.frame.w * spriteData.pivot.x, spriteData.frame.h * spriteData.pivot.y, (int)spriteData.frame.w);
- spriteGlyph.glyphRect = new GlyphRect((int)spriteData.frame.x, (int)(atlasHeight - spriteData.frame.h - spriteData.frame.y), (int)spriteData.frame.w, (int)spriteData.frame.h);
- spriteGlyph.scale = 1.0f;
-
- spriteGlyphTable.Add(spriteGlyph);
-
- TMP_SpriteCharacter spriteCharacter = new TMP_SpriteCharacter(0, spriteGlyph);
- spriteCharacter.name = spriteData.filename.Split('.')[0];
- spriteCharacter.unicode = 0xFFFE;
- spriteCharacter.scale = 1.0f;
-
- spriteCharacterTable.Add(spriteCharacter);
- }
- }
-
- ///
- ///
- ///
- ///
- void SaveSpriteAsset(string filePath)
- {
- filePath = filePath.Substring(0, filePath.Length - 6); // Trim file extension from filePath.
-
- string dataPath = Application.dataPath;
-
- if (filePath.IndexOf(dataPath, System.StringComparison.InvariantCultureIgnoreCase) == -1)
- {
- Debug.LogError("You're saving the font asset in a directory outside of this project folder. This is not supported. Please select a directory under \"" + dataPath + "\"");
- return;
- }
-
- string relativeAssetPath = filePath.Substring(dataPath.Length - 6);
- string dirName = Path.GetDirectoryName(relativeAssetPath);
- string fileName = Path.GetFileNameWithoutExtension(relativeAssetPath);
- string pathNoExt = dirName + "/" + fileName;
-
- // Save Sprite Asset
- AssetDatabase.CreateAsset(m_SpriteAsset, pathNoExt + ".asset");
-
- // Set version number
- m_SpriteAsset.version = "1.1.0";
-
- // Compute the hash code for the sprite asset.
- m_SpriteAsset.hashCode = TMP_TextUtilities.GetSimpleHashCode(m_SpriteAsset.name);
-
- // Add new default material for sprite asset.
- AddDefaultMaterial(m_SpriteAsset);
- }
-
- ///
- /// Create and add new default material to sprite asset.
- ///
- ///
- static void AddDefaultMaterial(TMP_SpriteAsset spriteAsset)
- {
- Shader shader = Shader.Find("TextMeshPro/Sprite");
- Material material = new Material(shader);
- material.SetTexture(ShaderUtilities.ID_MainTex, spriteAsset.spriteSheet);
-
- spriteAsset.material = material;
- material.hideFlags = HideFlags.HideInHierarchy;
- AssetDatabase.AddObjectToAsset(material, spriteAsset);
- }
-
- ///
- /// Limits the minimum size of the editor window.
- ///
- void SetEditorWindowSize()
- {
- EditorWindow editorWindow = this;
-
- Vector2 currentWindowSize = editorWindow.minSize;
-
- editorWindow.minSize = new Vector2(Mathf.Max(230, currentWindowSize.x), Mathf.Max(300, currentWindowSize.y));
- }
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteAssetImporter.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteAssetImporter.cs.meta
deleted file mode 100644
index d60763a5..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteAssetImporter.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: f1ea944dcf8849ebab391e461b99ccb7
-timeCreated: 1480023525
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteAssetMenu.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteAssetMenu.cs
deleted file mode 100644
index 344150b1..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteAssetMenu.cs
+++ /dev/null
@@ -1,389 +0,0 @@
-using UnityEngine;
-using UnityEngine.TextCore;
-using UnityEngine.U2D;
-using UnityEditor;
-using System.Linq;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-
-
-namespace TMPro.EditorUtilities
-{
- public static class TMP_SpriteAssetMenu
- {
- // Add a Context Menu to the Sprite Asset Editor Panel to Create and Add a Default Material.
- [MenuItem("CONTEXT/TMP_SpriteAsset/Add Default Material", false, 2200)]
- static void CopyTexture(MenuCommand command)
- {
- TMP_SpriteAsset spriteAsset = (TMP_SpriteAsset)command.context;
-
- // Make sure the sprite asset already contains a default material
- if (spriteAsset != null && spriteAsset.material == null)
- {
- // Add new default material for sprite asset.
- AddDefaultMaterial(spriteAsset);
- }
- }
-
- // Add a Context Menu to the Sprite Asset Editor Panel to update existing sprite assets.
- [MenuItem("CONTEXT/TMP_SpriteAsset/Update Sprite Asset", false, 2100)]
- static void UpdateSpriteAsset(MenuCommand command)
- {
- TMP_SpriteAsset spriteAsset = (TMP_SpriteAsset)command.context;
-
- if (spriteAsset == null)
- return;
-
- UpdateSpriteAsset(spriteAsset);
- }
-
- internal static void UpdateSpriteAsset(TMP_SpriteAsset spriteAsset)
- {
- // Get a list of all the sprites contained in the texture referenced by the sprite asset.
- // This only works if the texture is set to sprite mode.
- string filePath = AssetDatabase.GetAssetPath(spriteAsset.spriteSheet);
-
- if (string.IsNullOrEmpty(filePath))
- return;
-
- // Get all the sprites defined in the sprite sheet texture referenced by this sprite asset.
- Sprite[] sprites = AssetDatabase.LoadAllAssetsAtPath(filePath).Select(x => x as Sprite).Where(x => x != null).ToArray();
-
- // Return if sprite sheet texture does not have any sprites defined in it.
- if (sprites.Length == 0)
- {
- Debug.Log("Sprite Asset [" + spriteAsset.name + "]'s atlas texture does not appear to have any sprites defined in it. Use the Unity Sprite Editor to define sprites for this texture.", spriteAsset.spriteSheet);
- return;
- }
-
- List spriteGlyphTable = spriteAsset.spriteGlyphTable;
-
- // Find available glpyh indexes
- uint[] existingGlyphIndexes = spriteGlyphTable.Select(x => x.index).ToArray();
- List availableGlyphIndexes = new List();
-
- uint lastGlyphIndex = existingGlyphIndexes.Length > 0 ? existingGlyphIndexes.Last() : 0;
- int elementIndex = 0;
- for (uint i = 0; i < lastGlyphIndex; i++)
- {
- uint existingGlyphIndex = existingGlyphIndexes[elementIndex];
-
- if (i == existingGlyphIndex)
- elementIndex += 1;
- else
- availableGlyphIndexes.Add(i);
- }
-
- // Iterate over sprites contained in the updated sprite sheet to identify new and / or modified sprites.
- for (int i = 0; i < sprites.Length; i++)
- {
- Sprite sprite = sprites[i];
-
- // Check if current sprites is already contained in the sprite glyph table of the sprite asset.
- TMP_SpriteGlyph spriteGlyph = spriteGlyphTable.FirstOrDefault(x => x.sprite == sprite);
-
- if (spriteGlyph != null)
- {
- // update existing sprite glyph
- if (spriteGlyph.glyphRect.x != sprite.rect.x || spriteGlyph.glyphRect.y != sprite.rect.y || spriteGlyph.glyphRect.width != sprite.rect.width || spriteGlyph.glyphRect.height != sprite.rect.height)
- spriteGlyph.glyphRect = new GlyphRect(sprite.rect);
- }
- else
- {
- TMP_SpriteCharacter spriteCharacter;
-
- // Check if this sprite potentially exists under the same name in the sprite character table.
- if (spriteAsset.spriteCharacterTable != null && spriteAsset.spriteCharacterTable.Count > 0)
- {
- spriteCharacter = spriteAsset.spriteCharacterTable.FirstOrDefault(x => x.name == sprite.name);
- spriteGlyph = spriteCharacter != null ? spriteGlyphTable[(int)spriteCharacter.glyphIndex] : null;
-
- if (spriteGlyph != null)
- {
- // Update sprite reference and data
- spriteGlyph.sprite = sprite;
-
- if (spriteGlyph.glyphRect.x != sprite.rect.x || spriteGlyph.glyphRect.y != sprite.rect.y || spriteGlyph.glyphRect.width != sprite.rect.width || spriteGlyph.glyphRect.height != sprite.rect.height)
- spriteGlyph.glyphRect = new GlyphRect(sprite.rect);
- }
- }
-
- // Add new Sprite Glyph to the table
- spriteGlyph = new TMP_SpriteGlyph();
-
- // Get available glyph index
- if (availableGlyphIndexes.Count > 0)
- {
- spriteGlyph.index = availableGlyphIndexes[0];
- availableGlyphIndexes.RemoveAt(0);
- }
- else
- spriteGlyph.index = (uint)spriteGlyphTable.Count;
-
- spriteGlyph.metrics = new GlyphMetrics(sprite.rect.width, sprite.rect.height, -sprite.pivot.x, sprite.rect.height - sprite.pivot.y, sprite.rect.width);
- spriteGlyph.glyphRect = new GlyphRect(sprite.rect);
- spriteGlyph.scale = 1.0f;
- spriteGlyph.sprite = sprite;
-
- spriteGlyphTable.Add(spriteGlyph);
-
- spriteCharacter = new TMP_SpriteCharacter(0xFFFE, spriteGlyph);
- spriteCharacter.name = sprite.name;
- spriteCharacter.scale = 1.0f;
-
- spriteAsset.spriteCharacterTable.Add(spriteCharacter);
- }
- }
-
- // Update Sprite Character Table to replace unicode 0x0 by 0xFFFE
- for (int i = 0; i < spriteAsset.spriteCharacterTable.Count; i++)
- {
- TMP_SpriteCharacter spriteCharacter = spriteAsset.spriteCharacterTable[i];
- if (spriteCharacter.unicode == 0)
- spriteCharacter.unicode = 0xFFFE;
- }
-
- // Sort glyph table by glyph index
- spriteAsset.SortGlyphTable();
- spriteAsset.UpdateLookupTables();
- TMPro_EventManager.ON_SPRITE_ASSET_PROPERTY_CHANGED(true, spriteAsset);
-
- }
-
-
- [MenuItem("Assets/Create/TextMeshPro/Sprite Asset", false, 110)]
- public static void CreateSpriteAsset()
- {
- Object target = Selection.activeObject;
-
- if (target == null || target.GetType() != typeof(Texture2D)) // && target.GetType() != typeof(SpriteAtlas)))
- {
- Debug.LogWarning("A texture must first be selected in order to create a TextMesh Pro Sprite Asset.");
- return;
- }
-
- // Get the path to the selected asset.
- string filePathWithName = AssetDatabase.GetAssetPath(target);
- string fileNameWithExtension = Path.GetFileName(filePathWithName);
- string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(filePathWithName);
- string filePath = filePathWithName.Replace(fileNameWithExtension, "");
-
-
- // Create new Sprite Asset
- TMP_SpriteAsset spriteAsset = ScriptableObject.CreateInstance();
- AssetDatabase.CreateAsset(spriteAsset, filePath + fileNameWithoutExtension + ".asset");
-
- spriteAsset.version = "1.1.0";
-
- // Compute the hash code for the sprite asset.
- spriteAsset.hashCode = TMP_TextUtilities.GetSimpleHashCode(spriteAsset.name);
-
- List spriteGlyphTable = new List();
- List spriteCharacterTable = new List();
-
- if (target.GetType() == typeof(Texture2D))
- {
- Texture2D sourceTex = target as Texture2D;
-
- // Assign new Sprite Sheet texture to the Sprite Asset.
- spriteAsset.spriteSheet = sourceTex;
-
- PopulateSpriteTables(sourceTex, ref spriteCharacterTable, ref spriteGlyphTable);
-
- spriteAsset.spriteCharacterTable = spriteCharacterTable;
- spriteAsset.spriteGlyphTable = spriteGlyphTable;
-
- // Add new default material for sprite asset.
- AddDefaultMaterial(spriteAsset);
- }
- else if (target.GetType() == typeof(SpriteAtlas))
- {
- //SpriteAtlas spriteAtlas = target as SpriteAtlas;
-
- //PopulateSpriteTables(spriteAtlas, ref spriteCharacterTable, ref spriteGlyphTable);
-
- //spriteAsset.spriteCharacterTable = spriteCharacterTable;
- //spriteAsset.spriteGlyphTable = spriteGlyphTable;
-
- //spriteAsset.spriteSheet = spriteGlyphTable[0].sprite.texture;
-
- //// Add new default material for sprite asset.
- //AddDefaultMaterial(spriteAsset);
- }
-
- // Update Lookup tables.
- spriteAsset.UpdateLookupTables();
-
- // Get the Sprites contained in the Sprite Sheet
- EditorUtility.SetDirty(spriteAsset);
-
- //spriteAsset.sprites = sprites;
-
- // Set source texture back to Not Readable.
- //texImporter.isReadable = false;
-
- AssetDatabase.SaveAssets();
-
- AssetDatabase.ImportAsset(AssetDatabase.GetAssetPath(spriteAsset)); // Re-import font asset to get the new updated version.
-
- //AssetDatabase.Refresh();
- }
-
-
- private static void PopulateSpriteTables(Texture source, ref List spriteCharacterTable, ref List spriteGlyphTable)
- {
- //Debug.Log("Creating new Sprite Asset.");
-
- string filePath = AssetDatabase.GetAssetPath(source);
-
- // Get all the Sprites sorted by Index
- Sprite[] sprites = AssetDatabase.LoadAllAssetsAtPath(filePath).Select(x => x as Sprite).Where(x => x != null).OrderByDescending(x => x.rect.y).ThenBy(x => x.rect.x).ToArray();
-
- for (int i = 0; i < sprites.Length; i++)
- {
- Sprite sprite = sprites[i];
-
- TMP_SpriteGlyph spriteGlyph = new TMP_SpriteGlyph();
- spriteGlyph.index = (uint)i;
- spriteGlyph.metrics = new GlyphMetrics(sprite.rect.width, sprite.rect.height, -sprite.pivot.x, sprite.rect.height - sprite.pivot.y, sprite.rect.width);
- spriteGlyph.glyphRect = new GlyphRect(sprite.rect);
- spriteGlyph.scale = 1.0f;
- spriteGlyph.sprite = sprite;
-
- spriteGlyphTable.Add(spriteGlyph);
-
- TMP_SpriteCharacter spriteCharacter = new TMP_SpriteCharacter(0xFFFE, spriteGlyph);
- spriteCharacter.name = sprite.name;
- spriteCharacter.scale = 1.0f;
-
- spriteCharacterTable.Add(spriteCharacter);
- }
- }
-
-
- private static void PopulateSpriteTables(SpriteAtlas spriteAtlas, ref List spriteCharacterTable, ref List spriteGlyphTable)
- {
- // Get number of sprites contained in the sprite atlas.
- int spriteCount = spriteAtlas.spriteCount;
- Sprite[] sprites = new Sprite[spriteCount];
-
- // Get all the sprites
- spriteAtlas.GetSprites(sprites);
-
- for (int i = 0; i < sprites.Length; i++)
- {
- Sprite sprite = sprites[i];
-
- TMP_SpriteGlyph spriteGlyph = new TMP_SpriteGlyph();
- spriteGlyph.index = (uint)i;
- spriteGlyph.metrics = new GlyphMetrics(sprite.textureRect.width, sprite.textureRect.height, -sprite.pivot.x, sprite.textureRect.height - sprite.pivot.y, sprite.textureRect.width);
- spriteGlyph.glyphRect = new GlyphRect(sprite.textureRect);
- spriteGlyph.scale = 1.0f;
- spriteGlyph.sprite = sprite;
-
- spriteGlyphTable.Add(spriteGlyph);
-
- TMP_SpriteCharacter spriteCharacter = new TMP_SpriteCharacter(0xFFFE, spriteGlyph);
- spriteCharacter.name = sprite.name;
- spriteCharacter.scale = 1.0f;
-
- spriteCharacterTable.Add(spriteCharacter);
- }
- }
-
-
- ///
- /// Create and add new default material to sprite asset.
- ///
- ///
- private static void AddDefaultMaterial(TMP_SpriteAsset spriteAsset)
- {
- Shader shader = Shader.Find("TextMeshPro/Sprite");
- Material material = new Material(shader);
- material.SetTexture(ShaderUtilities.ID_MainTex, spriteAsset.spriteSheet);
-
- spriteAsset.material = material;
- material.hideFlags = HideFlags.HideInHierarchy;
- AssetDatabase.AddObjectToAsset(material, spriteAsset);
- }
-
-
- // Update existing SpriteInfo
- private static List UpdateSpriteInfo(TMP_SpriteAsset spriteAsset)
- {
- //Debug.Log("Updating Sprite Asset.");
-
- string filePath = AssetDatabase.GetAssetPath(spriteAsset.spriteSheet);
-
- // Get all the Sprites sorted Left to Right / Top to Bottom
- Sprite[] sprites = AssetDatabase.LoadAllAssetsAtPath(filePath).Select(x => x as Sprite).Where(x => x != null).OrderByDescending(x => x.rect.y).ThenBy(x => x.rect.x).ToArray();
-
- for (int i = 0; i < sprites.Length; i++)
- {
- Sprite sprite = sprites[i];
-
- // Check if the sprite is already contained in the SpriteInfoList
- int index = -1;
- if (spriteAsset.spriteInfoList.Count > i && spriteAsset.spriteInfoList[i].sprite != null)
- index = spriteAsset.spriteInfoList.FindIndex(item => item.sprite.GetInstanceID() == sprite.GetInstanceID());
-
- // Use existing SpriteInfo if it already exists
- TMP_Sprite spriteInfo = index == -1 ? new TMP_Sprite() : spriteAsset.spriteInfoList[index];
-
- Rect spriteRect = sprite.rect;
- spriteInfo.x = spriteRect.x;
- spriteInfo.y = spriteRect.y;
- spriteInfo.width = spriteRect.width;
- spriteInfo.height = spriteRect.height;
-
- // Get Sprite Pivot
- Vector2 pivot = new Vector2(0 - (sprite.bounds.min.x) / (sprite.bounds.extents.x * 2), 0 - (sprite.bounds.min.y) / (sprite.bounds.extents.y * 2));
-
- // The position of the pivot influences the Offset position.
- spriteInfo.pivot = new Vector2(0 - pivot.x * spriteRect.width, spriteRect.height - pivot.y * spriteRect.height);
-
- if (index == -1)
- {
- // Find the next available index for this Sprite
- int[] ids = spriteAsset.spriteInfoList.Select(item => item.id).ToArray();
-
- int id = 0;
- for (int j = 0; j < ids.Length; j++ )
- {
- if (ids[0] != 0) break;
-
- if (j > 0 && (ids[j] - ids[j - 1]) > 1)
- {
- id = ids[j - 1] + 1;
- break;
- }
-
- id = j + 1;
- }
-
- spriteInfo.sprite = sprite;
- spriteInfo.name = sprite.name;
- spriteInfo.hashCode = TMP_TextUtilities.GetSimpleHashCode(spriteInfo.name);
- spriteInfo.id = id;
- spriteInfo.xAdvance = spriteRect.width;
- spriteInfo.scale = 1.0f;
-
- spriteInfo.xOffset = spriteInfo.pivot.x;
- spriteInfo.yOffset = spriteInfo.pivot.y;
-
- spriteAsset.spriteInfoList.Add(spriteInfo);
-
- // Sort the Sprites by ID
- spriteAsset.spriteInfoList = spriteAsset.spriteInfoList.OrderBy(s => s.id).ToList();
- }
- else
- {
- spriteAsset.spriteInfoList[index] = spriteInfo;
- }
- }
-
- return spriteAsset.spriteInfoList;
- }
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteAssetMenu.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteAssetMenu.cs.meta
deleted file mode 100644
index 850ab1f2..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteAssetMenu.cs.meta
+++ /dev/null
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 1048a87135154606808bf2030da32d18
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteCharacterPropertyDrawer.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteCharacterPropertyDrawer.cs
deleted file mode 100644
index bc501618..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteCharacterPropertyDrawer.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-using UnityEngine;
-using UnityEngine.TextCore;
-using UnityEditor;
-using System.Collections;
-
-
-namespace TMPro.EditorUtilities
-{
-
- [CustomPropertyDrawer(typeof(TMP_SpriteCharacter))]
- public class TMP_SpriteCharacterPropertyDrawer : PropertyDrawer
- {
- int m_GlyphSelectedForEditing = -1;
-
- public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
- {
- SerializedProperty prop_SpriteName = property.FindPropertyRelative("m_Name");
- SerializedProperty prop_SpriteNameHashCode = property.FindPropertyRelative("m_HashCode");
- SerializedProperty prop_SpriteUnicode = property.FindPropertyRelative("m_Unicode");
- SerializedProperty prop_SpriteGlyphIndex = property.FindPropertyRelative("m_GlyphIndex");
- SerializedProperty prop_SpriteScale = property.FindPropertyRelative("m_Scale");
-
-
- GUIStyle style = new GUIStyle(EditorStyles.label);
- style.richText = true;
-
- EditorGUIUtility.labelWidth = 40f;
- EditorGUIUtility.fieldWidth = 50;
-
- Rect rect = new Rect(position.x + 60, position.y, position.width, 49);
-
- // Display non-editable fields
- if (GUI.enabled == false)
- {
- // Sprite Character Index
- int spriteCharacterIndex;
- int.TryParse(property.displayName.Split(' ')[1], out spriteCharacterIndex);
- EditorGUI.LabelField(new Rect(rect.x, rect.y, 75f, 18), new GUIContent("Index: " + spriteCharacterIndex + ""), style);
-
- EditorGUI.LabelField(new Rect(rect.x + 75f, rect.y, 120f, 18), new GUIContent("Unicode: 0x" + prop_SpriteUnicode.intValue.ToString("X") + ""), style);
- EditorGUI.LabelField(new Rect(rect.x + 195f, rect.y, rect.width - 255, 18), new GUIContent("Name: " + prop_SpriteName.stringValue + ""), style);
-
- EditorGUI.LabelField(new Rect(rect.x, rect.y + 18, 120, 18), new GUIContent("Glyph ID: " + prop_SpriteGlyphIndex.intValue + ""), style);
-
- // Draw Sprite Glyph (if exists)
- DrawSpriteGlyph(position, property);
-
- EditorGUI.LabelField(new Rect(rect.x, rect.y + 36, 80, 18), new GUIContent("Scale: " + prop_SpriteScale.floatValue + ""), style);
- }
- else // Display editable fields
- {
- // Get a reference to the underlying Sprite Asset
- TMP_SpriteAsset spriteAsset = property.serializedObject.targetObject as TMP_SpriteAsset;
-
- // Sprite Character Index
- int spriteCharacterIndex;
- int.TryParse(property.displayName.Split(' ')[1], out spriteCharacterIndex);
-
- EditorGUI.LabelField(new Rect(rect.x, rect.y, 75f, 18), new GUIContent("Index: " + spriteCharacterIndex + ""), style);
-
- EditorGUIUtility.labelWidth = 55f;
- GUI.SetNextControlName("Unicode Input");
- EditorGUI.BeginChangeCheck();
- string unicode = EditorGUI.DelayedTextField(new Rect(rect.x + 75f, rect.y, 120, 18), "Unicode:", prop_SpriteUnicode.intValue.ToString("X"));
-
- if (GUI.GetNameOfFocusedControl() == "Unicode Input")
- {
- //Filter out unwanted characters.
- char chr = Event.current.character;
- if ((chr < '0' || chr > '9') && (chr < 'a' || chr > 'f') && (chr < 'A' || chr > 'F'))
- {
- Event.current.character = '\0';
- }
- }
-
- if (EditorGUI.EndChangeCheck())
- {
- // Update Unicode value
- prop_SpriteUnicode.intValue = TMP_TextUtilities.StringHexToInt(unicode);
- spriteAsset.m_IsSpriteAssetLookupTablesDirty = true;
- }
-
- EditorGUIUtility.labelWidth = 41f;
- EditorGUI.BeginChangeCheck();
- EditorGUI.DelayedTextField(new Rect(rect.x + 195f, rect.y, rect.width - 255, 18), prop_SpriteName, new GUIContent("Name:"));
- if (EditorGUI.EndChangeCheck())
- {
- // Recompute hashCode for new name
- prop_SpriteNameHashCode.intValue = TMP_TextUtilities.GetSimpleHashCode(prop_SpriteName.stringValue);
- spriteAsset.m_IsSpriteAssetLookupTablesDirty = true;
- }
-
- EditorGUIUtility.labelWidth = 59f;
- EditorGUI.BeginChangeCheck();
- EditorGUI.DelayedIntField(new Rect(rect.x, rect.y + 18, 100, 18), prop_SpriteGlyphIndex, new GUIContent("Glyph ID:"));
- if (EditorGUI.EndChangeCheck())
- {
- spriteAsset.m_IsSpriteAssetLookupTablesDirty = true;
- }
-
- // Draw Sprite Glyph (if exists)
- DrawSpriteGlyph(position, property);
-
- int glyphIndex = prop_SpriteGlyphIndex.intValue;
-
- // Reset glyph selection if new character has been selected.
- if (GUI.enabled && m_GlyphSelectedForEditing != glyphIndex)
- m_GlyphSelectedForEditing = -1;
-
- // Display button to edit the glyph data.
- if (GUI.Button(new Rect(rect.x + 120, rect.y + 18, 75, 18), new GUIContent("Edit Glyph")))
- {
- if (m_GlyphSelectedForEditing == -1)
- m_GlyphSelectedForEditing = glyphIndex;
- else
- m_GlyphSelectedForEditing = -1;
-
- // Button clicks should not result in potential change.
- GUI.changed = false;
- }
-
- // Show the glyph property drawer if selected
- if (glyphIndex == m_GlyphSelectedForEditing && GUI.enabled)
- {
- if (spriteAsset != null)
- {
- // Lookup glyph and draw glyph (if available)
- int elementIndex = spriteAsset.spriteGlyphTable.FindIndex(item => item.index == glyphIndex);
-
- if (elementIndex != -1)
- {
- // Get a reference to the Sprite Glyph Table
- SerializedProperty prop_SpriteGlyphTable = property.serializedObject.FindProperty("m_SpriteGlyphTable");
-
- SerializedProperty prop_SpriteGlyph = prop_SpriteGlyphTable.GetArrayElementAtIndex(elementIndex);
- SerializedProperty prop_GlyphMetrics = prop_SpriteGlyph.FindPropertyRelative("m_Metrics");
- SerializedProperty prop_GlyphRect = prop_SpriteGlyph.FindPropertyRelative("m_GlyphRect");
-
- Rect newRect = EditorGUILayout.GetControlRect(false, 115);
- EditorGUI.DrawRect(new Rect(newRect.x + 62, newRect.y - 20, newRect.width - 62, newRect.height - 5), new Color(0.1f, 0.1f, 0.1f, 0.45f));
- EditorGUI.DrawRect(new Rect(newRect.x + 63, newRect.y - 19, newRect.width - 64, newRect.height - 7), new Color(0.3f, 0.3f, 0.3f, 0.8f));
-
- // Display GlyphRect
- newRect.x += 65;
- newRect.y -= 18;
- newRect.width += 5;
- EditorGUI.PropertyField(newRect, prop_GlyphRect);
-
- // Display GlyphMetrics
- newRect.y += 45;
- EditorGUI.PropertyField(newRect, prop_GlyphMetrics);
-
- rect.y += 120;
- }
- }
- }
-
- EditorGUIUtility.labelWidth = 39f;
- EditorGUI.PropertyField(new Rect(rect.x, rect.y + 36, 80, 18), prop_SpriteScale, new GUIContent("Scale:"));
- }
- }
-
-
- public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
- {
- return 58;
- }
-
-
- void DrawSpriteGlyph(Rect position, SerializedProperty property)
- {
- // Get a reference to the sprite glyph table
- TMP_SpriteAsset spriteAsset = property.serializedObject.targetObject as TMP_SpriteAsset;
-
- if (spriteAsset == null)
- return;
-
- int glyphIndex = property.FindPropertyRelative("m_GlyphIndex").intValue;
-
- // Lookup glyph and draw glyph (if available)
- int elementIndex = spriteAsset.spriteGlyphTable.FindIndex(item => item.index == glyphIndex);
-
- if (elementIndex != -1)
- {
- // Get a reference to the Sprite Glyph Table
- SerializedProperty prop_SpriteGlyphTable = property.serializedObject.FindProperty("m_SpriteGlyphTable");
- SerializedProperty prop_SpriteGlyph = prop_SpriteGlyphTable.GetArrayElementAtIndex(elementIndex);
- SerializedProperty prop_GlyphRect = prop_SpriteGlyph.FindPropertyRelative("m_GlyphRect");
-
- // Get a reference to the sprite texture
- Texture tex = spriteAsset.spriteSheet;
-
- // Return if we don't have a texture assigned to the sprite asset.
- if (tex == null)
- {
- Debug.LogWarning("Please assign a valid Sprite Atlas texture to the [" + spriteAsset.name + "] Sprite Asset.", spriteAsset);
- return;
- }
-
- Vector2 spriteTexPosition = new Vector2(position.x, position.y);
- Vector2 spriteSize = new Vector2(48, 48);
- Vector2 alignmentOffset = new Vector2((58 - spriteSize.x) / 2, (58 - spriteSize.y) / 2);
-
- float x = prop_GlyphRect.FindPropertyRelative("m_X").intValue;
- float y = prop_GlyphRect.FindPropertyRelative("m_Y").intValue;
- float spriteWidth = prop_GlyphRect.FindPropertyRelative("m_Width").intValue;
- float spriteHeight = prop_GlyphRect.FindPropertyRelative("m_Height").intValue;
-
- if (spriteWidth >= spriteHeight)
- {
- spriteSize.y = spriteHeight * spriteSize.x / spriteWidth;
- spriteTexPosition.y += (spriteSize.x - spriteSize.y) / 2;
- }
- else
- {
- spriteSize.x = spriteWidth * spriteSize.y / spriteHeight;
- spriteTexPosition.x += (spriteSize.y - spriteSize.x) / 2;
- }
-
- // Compute the normalized texture coordinates
- Rect texCoords = new Rect(x / tex.width, y / tex.height, spriteWidth / tex.width, spriteHeight / tex.height);
- GUI.DrawTextureWithTexCoords(new Rect(spriteTexPosition.x + alignmentOffset.x, spriteTexPosition.y + alignmentOffset.y, spriteSize.x, spriteSize.y), tex, texCoords, true);
- }
- }
-
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteCharacterPropertyDrawer.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteCharacterPropertyDrawer.cs.meta
deleted file mode 100644
index 0733749d..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteCharacterPropertyDrawer.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 37cff9f5a86ae494c8cb04423580480d
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteGlyphPropertyDrawer.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteGlyphPropertyDrawer.cs
deleted file mode 100644
index cf79bc82..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteGlyphPropertyDrawer.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using UnityEngine;
-using UnityEngine.TextCore;
-using UnityEditor;
-using System.Collections;
-
-
-namespace TMPro.EditorUtilities
-{
-
- [CustomPropertyDrawer(typeof(TMP_SpriteGlyph))]
- public class TMP_SpriteGlyphPropertyDrawer : PropertyDrawer
- {
- public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
- {
- SerializedProperty prop_GlyphIndex = property.FindPropertyRelative("m_Index");
- SerializedProperty prop_GlyphMetrics = property.FindPropertyRelative("m_Metrics");
- SerializedProperty prop_GlyphRect = property.FindPropertyRelative("m_GlyphRect");
- SerializedProperty prop_Scale = property.FindPropertyRelative("m_Scale");
- SerializedProperty prop_AtlasIndex = property.FindPropertyRelative("m_AtlasIndex");
-
- GUIStyle style = new GUIStyle(EditorStyles.label);
- style.richText = true;
-
- Rect rect = new Rect(position.x + 70, position.y, position.width, 49);
-
- // Draw GlyphRect
- EditorGUI.PropertyField(rect, prop_GlyphRect);
-
- // Draw GlyphMetrics
- rect.y += 45;
- EditorGUI.PropertyField(rect, prop_GlyphMetrics);
-
- EditorGUIUtility.labelWidth = 40f;
- EditorGUI.PropertyField(new Rect(rect.x, rect.y + 65, 75, 18), prop_Scale, new GUIContent("Scale:"));
-
- EditorGUIUtility.labelWidth = 74f;
- EditorGUI.PropertyField(new Rect(rect.x + 85, rect.y + 65, 95, 18), prop_AtlasIndex, new GUIContent("Atlas Index:"));
-
- DrawGlyph(position, property);
-
- int spriteCharacterIndex;
- int.TryParse(property.displayName.Split(' ')[1], out spriteCharacterIndex);
-
- EditorGUI.LabelField(new Rect(position.x, position.y + 5, 64f, 18f), new GUIContent("#" + spriteCharacterIndex), style);
-
- float labelWidthID = GUI.skin.label.CalcSize(new GUIContent("ID: " + prop_GlyphIndex.intValue)).x;
- EditorGUI.LabelField(new Rect(position.x + (64 - labelWidthID) / 2, position.y + 110, 64f, 18f), new GUIContent("ID: " + prop_GlyphIndex.intValue + ""), style);
- }
-
- void DrawGlyph(Rect position, SerializedProperty property)
- {
- // Get a reference to the sprite texture
- Texture tex = (property.serializedObject.targetObject as TMP_SpriteAsset).spriteSheet;
-
- // Return if we don't have a texture assigned to the sprite asset.
- if (tex == null)
- {
- Debug.LogWarning("Please assign a valid Sprite Atlas texture to the [" + property.serializedObject.targetObject.name + "] Sprite Asset.", property.serializedObject.targetObject);
- return;
- }
-
- Vector2 spriteTexPosition = new Vector2(position.x, position.y);
- Vector2 spriteSize = new Vector2(65, 65);
-
- SerializedProperty prop_GlyphRect = property.FindPropertyRelative("m_GlyphRect");
-
- int spriteImageX = prop_GlyphRect.FindPropertyRelative("m_X").intValue;
- int spriteImageY = prop_GlyphRect.FindPropertyRelative("m_Y").intValue;
- int spriteImageWidth = prop_GlyphRect.FindPropertyRelative("m_Width").intValue;
- int spriteImageHeight = prop_GlyphRect.FindPropertyRelative("m_Height").intValue;
-
- if (spriteImageWidth >= spriteImageHeight)
- {
- spriteSize.y = spriteImageHeight * spriteSize.x / spriteImageWidth;
- spriteTexPosition.y += (spriteSize.x - spriteSize.y) / 2;
- }
- else
- {
- spriteSize.x = spriteImageWidth * spriteSize.y / spriteImageHeight;
- spriteTexPosition.x += (spriteSize.y - spriteSize.x) / 2;
- }
-
- // Compute the normalized texture coordinates
- Rect texCoords = new Rect((float)spriteImageX / tex.width, (float)spriteImageY / tex.height, (float)spriteImageWidth / tex.width, (float)spriteImageHeight / tex.height);
- GUI.DrawTextureWithTexCoords(new Rect(spriteTexPosition.x + 5, spriteTexPosition.y + 32f, spriteSize.x, spriteSize.y), tex, texCoords, true);
- }
-
- public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
- {
- return 130f;
- }
-
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteGlyphPropertyDrawer.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteGlyphPropertyDrawer.cs.meta
deleted file mode 100644
index 04145626..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SpriteGlyphPropertyDrawer.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 056819c66570ca54cadb72330a354050
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_StyleAssetMenu.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_StyleAssetMenu.cs
deleted file mode 100644
index 480a7767..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_StyleAssetMenu.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using UnityEngine;
-using UnityEditor;
-using System.IO;
-using System.Collections;
-
-
-namespace TMPro.EditorUtilities
-{
-
- public static class TMP_StyleAssetMenu
- {
-
- [MenuItem("Assets/Create/TextMeshPro/Style Sheet", false, 120)]
- public static void CreateTextMeshProObjectPerform()
- {
- string filePath;
- if (Selection.assetGUIDs.Length == 0)
- {
- // No asset selected.
- filePath = "Assets";
- }
- else
- {
- // Get the path of the selected folder or asset.
- filePath = AssetDatabase.GUIDToAssetPath(Selection.assetGUIDs[0]);
-
- // Get the file extension of the selected asset as it might need to be removed.
- string fileExtension = Path.GetExtension(filePath);
- if (fileExtension != "")
- {
- filePath = Path.GetDirectoryName(filePath);
- }
- }
-
-
- string filePathWithName = AssetDatabase.GenerateUniqueAssetPath(filePath + "/Text StyleSheet.asset");
-
- //// Create new Style Sheet Asset.
- TMP_StyleSheet styleSheet = ScriptableObject.CreateInstance();
-
- // Create Normal default style
- TMP_Style style = new TMP_Style("Normal", string.Empty, string.Empty);
- styleSheet.styles.Add(style);
-
- AssetDatabase.CreateAsset(styleSheet, filePathWithName);
-
- EditorUtility.SetDirty(styleSheet);
-
- AssetDatabase.SaveAssets();
-
- EditorUtility.FocusProjectWindow();
- EditorGUIUtility.PingObject(styleSheet);
- }
- }
-
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_StyleAssetMenu.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_StyleAssetMenu.cs.meta
deleted file mode 100644
index cb44dc27..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_StyleAssetMenu.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 23a562f2cac6401f9f91251c68a1a794
-timeCreated: 1432690168
-licenseType: Store
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_StyleSheetEditor.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_StyleSheetEditor.cs
deleted file mode 100644
index 2968c29c..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_StyleSheetEditor.cs
+++ /dev/null
@@ -1,318 +0,0 @@
-using System;
-using UnityEngine;
-using UnityEditor;
-
-
-namespace TMPro.EditorUtilities
-{
-
- [CustomPropertyDrawer(typeof(TMP_Style))]
- public class StyleDrawer : PropertyDrawer
- {
- public static readonly float height = 95f;
-
- public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
- {
- return height;
- }
-
- public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
- {
- SerializedProperty nameProperty = property.FindPropertyRelative("m_Name");
- SerializedProperty hashCodeProperty = property.FindPropertyRelative("m_HashCode");
- SerializedProperty openingDefinitionProperty = property.FindPropertyRelative("m_OpeningDefinition");
- SerializedProperty closingDefinitionProperty = property.FindPropertyRelative("m_ClosingDefinition");
- SerializedProperty openingDefinitionArray = property.FindPropertyRelative("m_OpeningTagArray");
- SerializedProperty closingDefinitionArray = property.FindPropertyRelative("m_ClosingTagArray");
-
-
- EditorGUIUtility.labelWidth = 86;
- position.height = EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
- float labelHeight = position.height + 2f;
-
- EditorGUI.BeginChangeCheck();
- Rect rect0 = new Rect(position.x, position.y, (position.width) / 2 + 5, position.height);
- EditorGUI.PropertyField(rect0, nameProperty);
- if (EditorGUI.EndChangeCheck())
- {
- // Recompute HashCode if name has changed.
- hashCodeProperty.intValue = TMP_TextUtilities.GetSimpleHashCode(nameProperty.stringValue);
-
- property.serializedObject.ApplyModifiedProperties();
-
- // Dictionary needs to be updated since HashCode has changed.
- TMP_StyleSheet styleSheet = property.serializedObject.targetObject as TMP_StyleSheet;
- styleSheet.RefreshStyles();
- }
-
- // HashCode
- Rect rect1 = new Rect(rect0.x + rect0.width + 5, position.y, 65, position.height);
- GUI.Label(rect1, "HashCode");
- GUI.enabled = false;
- rect1.x += 65;
- rect1.width = position.width / 2 - 75;
- EditorGUI.PropertyField(rect1, hashCodeProperty, GUIContent.none);
-
- GUI.enabled = true;
-
- // Text Tags
- EditorGUI.BeginChangeCheck();
-
- // Opening Tags
- position.y += labelHeight;
- GUI.Label(position, "Opening Tags");
- Rect textRect1 = new Rect(110, position.y, position.width - 86, 35);
- openingDefinitionProperty.stringValue = EditorGUI.TextArea(textRect1, openingDefinitionProperty.stringValue);
- if (EditorGUI.EndChangeCheck())
- {
- // If any properties have changed, we need to update the Opening and Closing Arrays.
- int size = openingDefinitionProperty.stringValue.Length;
-
- // Adjust array size to match new string length.
- if (openingDefinitionArray.arraySize != size) openingDefinitionArray.arraySize = size;
-
- for (int i = 0; i < size; i++)
- {
- SerializedProperty element = openingDefinitionArray.GetArrayElementAtIndex(i);
- element.intValue = openingDefinitionProperty.stringValue[i];
- }
- }
-
- EditorGUI.BeginChangeCheck();
-
- // Closing Tags
- position.y += 38;
- GUI.Label(position, "Closing Tags");
- Rect textRect2 = new Rect(110, position.y, position.width - 86, 35);
- closingDefinitionProperty.stringValue = EditorGUI.TextArea(textRect2, closingDefinitionProperty.stringValue);
-
- if (EditorGUI.EndChangeCheck())
- {
- // If any properties have changed, we need to update the Opening and Closing Arrays.
- int size = closingDefinitionProperty.stringValue.Length;
-
- // Adjust array size to match new string length.
- if (closingDefinitionArray.arraySize != size) closingDefinitionArray.arraySize = size;
-
- for (int i = 0; i < size; i++)
- {
- SerializedProperty element = closingDefinitionArray.GetArrayElementAtIndex(i);
- element.intValue = closingDefinitionProperty.stringValue[i];
- }
- }
-
- }
- }
-
-
-
- [CustomEditor(typeof(TMP_StyleSheet)), CanEditMultipleObjects]
- public class TMP_StyleEditor : Editor
- {
-
- TMP_StyleSheet m_StyleSheet;
- SerializedProperty m_StyleListProp;
-
- int m_SelectedElement = -1;
- int m_Page;
-
- bool m_IsStyleSheetDirty;
-
-
- void OnEnable()
- {
- m_StyleSheet = target as TMP_StyleSheet;
- m_StyleListProp = serializedObject.FindProperty("m_StyleList");
- }
-
-
- public override void OnInspectorGUI()
- {
- Event currentEvent = Event.current;
-
- serializedObject.Update();
-
- m_IsStyleSheetDirty = false;
- int elementCount = m_StyleListProp.arraySize;
- int itemsPerPage = (Screen.height - 100) / 110;
-
- if (elementCount > 0)
- {
- // Display each Style entry using the StyleDrawer PropertyDrawer.
- for (int i = itemsPerPage * m_Page; i < elementCount && i < itemsPerPage * (m_Page + 1); i++)
- {
- // Define the start of the selection region of the element.
- Rect elementStartRegion = GUILayoutUtility.GetRect(0f, 0f, GUILayout.ExpandWidth(true));
-
- EditorGUILayout.BeginVertical(EditorStyles.helpBox);
-
- SerializedProperty styleProperty = m_StyleListProp.GetArrayElementAtIndex(i);
- EditorGUI.BeginChangeCheck();
- EditorGUILayout.PropertyField(styleProperty);
- EditorGUILayout.EndVertical();
- if (EditorGUI.EndChangeCheck())
- {
- //
- }
-
- // Define the end of the selection region of the element.
- Rect elementEndRegion = GUILayoutUtility.GetRect(0f, 0f, GUILayout.ExpandWidth(true));
-
- // Check for Item selection
- Rect selectionArea = new Rect(elementStartRegion.x, elementStartRegion.y, elementEndRegion.width, elementEndRegion.y - elementStartRegion.y);
- if (DoSelectionCheck(selectionArea))
- {
- if (m_SelectedElement == i)
- {
- m_SelectedElement = -1;
- }
- else
- {
- m_SelectedElement = i;
- GUIUtility.keyboardControl = 0;
- }
- }
-
- // Handle Selection Highlighting
- if (m_SelectedElement == i)
- TMP_EditorUtility.DrawBox(selectionArea, 2f, new Color32(40, 192, 255, 255));
- }
- }
-
- // STYLE LIST MANAGEMENT
- Rect rect = EditorGUILayout.GetControlRect(false, 20);
- rect.width /= 6;
-
- // Move Style up.
- bool guiEnabled = GUI.enabled;
- if (m_SelectedElement == -1 || m_SelectedElement == 0) { GUI.enabled = false; }
- if (GUI.Button(rect, "Up"))
- {
- SwapStyleElements(m_SelectedElement, m_SelectedElement - 1);
- }
- GUI.enabled = guiEnabled;
-
- // Move Style down.
- rect.x += rect.width;
- if (m_SelectedElement == elementCount - 1) { GUI.enabled = false; }
- if (GUI.Button(rect, "Down"))
- {
- SwapStyleElements(m_SelectedElement, m_SelectedElement + 1);
- }
- GUI.enabled = guiEnabled;
-
- // Add Style
- rect.x += rect.width * 3;
- if (GUI.Button(rect, "+"))
- {
- int index = m_SelectedElement == -1 ? 0 : m_SelectedElement;
-
- if (index > elementCount)
- index = elementCount;
-
- // Copy selected element
- m_StyleListProp.InsertArrayElementAtIndex(index);
-
- // Select newly inserted element
- m_SelectedElement = index + 1;
-
- serializedObject.ApplyModifiedProperties();
- m_StyleSheet.RefreshStyles();
- }
-
- // Delete style
- rect.x += rect.width;
- if (m_SelectedElement == -1 || m_SelectedElement >= elementCount) GUI.enabled = false;
- if (GUI.Button(rect, "-"))
- {
- int index = m_SelectedElement == -1 ? 0 : m_SelectedElement;
-
- m_StyleListProp.DeleteArrayElementAtIndex(index);
-
- m_SelectedElement = -1;
- serializedObject.ApplyModifiedProperties();
- m_StyleSheet.RefreshStyles();
- return;
- }
-
- // Return if we can't display any items.
- if (itemsPerPage == 0) return;
-
- // DISPLAY PAGE CONTROLS
- int shiftMultiplier = currentEvent.shift ? 10 : 1; // Page + Shift goes 10 page forward
-
- Rect pagePos = EditorGUILayout.GetControlRect(false, 20);
- pagePos.width /= 3;
-
- // Previous Page
- if (m_Page > 0) GUI.enabled = true;
- else GUI.enabled = false;
-
- if (GUI.Button(pagePos, "Previous"))
- m_Page -= 1 * shiftMultiplier;
-
- // PAGE COUNTER
- GUI.enabled = true;
- pagePos.x += pagePos.width;
- int totalPages = (int)(elementCount / (float)itemsPerPage + 0.999f);
- GUI.Label(pagePos, "Page " + (m_Page + 1) + " / " + totalPages, TMP_UIStyleManager.centeredLabel);
-
- // Next Page
- pagePos.x += pagePos.width;
- if (itemsPerPage * (m_Page + 1) < elementCount) GUI.enabled = true;
- else GUI.enabled = false;
-
- if (GUI.Button(pagePos, "Next"))
- m_Page += 1 * shiftMultiplier;
-
- // Clamp page range
- m_Page = Mathf.Clamp(m_Page, 0, elementCount / itemsPerPage);
-
-
- if (serializedObject.ApplyModifiedProperties())
- {
- TMPro_EventManager.ON_TEXT_STYLE_PROPERTY_CHANGED(true);
-
- if (m_IsStyleSheetDirty)
- {
- m_IsStyleSheetDirty = false;
- m_StyleSheet.RefreshStyles();
- }
- }
-
- // Clear selection if mouse event was not consumed.
- GUI.enabled = true;
- if (currentEvent.type == EventType.MouseDown && currentEvent.button == 0)
- m_SelectedElement = -1;
-
- }
-
-
- // Check if any of the Style elements were clicked on.
- static bool DoSelectionCheck(Rect selectionArea)
- {
- Event currentEvent = Event.current;
-
- switch (currentEvent.type)
- {
- case EventType.MouseDown:
- if (selectionArea.Contains(currentEvent.mousePosition) && currentEvent.button == 0)
- {
- currentEvent.Use();
- return true;
- }
- break;
- }
-
- return false;
- }
-
- void SwapStyleElements(int selectedIndex, int newIndex)
- {
- m_StyleListProp.MoveArrayElement(selectedIndex, newIndex);
- m_SelectedElement = newIndex;
- m_IsStyleSheetDirty = true;
- }
-
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_StyleSheetEditor.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_StyleSheetEditor.cs.meta
deleted file mode 100644
index a3bff26f..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_StyleSheetEditor.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 34e2c9b9d9e44953933afe37461f44e6
-timeCreated: 1432683777
-licenseType: Store
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SubMeshUI_Editor.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SubMeshUI_Editor.cs
deleted file mode 100644
index 679f4458..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SubMeshUI_Editor.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using UnityEngine;
-using UnityEditor;
-using System.Collections;
-
-namespace TMPro.EditorUtilities
-{
- [CustomEditor(typeof(TMP_SubMeshUI)), CanEditMultipleObjects]
- public class TMP_SubMeshUI_Editor : Editor
- {
- private struct m_foldout
- { // Track Inspector foldout panel states, globally.
- //public static bool textInput = true;
- public static bool fontSettings = true;
- //public static bool extraSettings = false;
- //public static bool shadowSetting = false;
- //public static bool materialEditor = true;
- }
-
- private SerializedProperty fontAsset_prop;
- private SerializedProperty spriteAsset_prop;
-
- //private TMP_SubMeshUI m_SubMeshComponent;
-
- //private CanvasRenderer m_canvasRenderer;
- private Editor m_materialEditor;
- private Material m_targetMaterial;
-
-
- public void OnEnable()
- {
- fontAsset_prop = serializedObject.FindProperty("m_fontAsset");
- spriteAsset_prop = serializedObject.FindProperty("m_spriteAsset");
-
- //m_SubMeshComponent = target as TMP_SubMeshUI;
- //m_rectTransform = m_SubMeshComponent.rectTransform;
- //m_canvasRenderer = m_SubMeshComponent.canvasRenderer;
-
-
- // Create new Material Editor if one does not exists
- /*
- if (m_canvasRenderer != null && m_canvasRenderer.GetMaterial() != null)
- {
- m_materialEditor = Editor.CreateEditor(m_canvasRenderer.GetMaterial());
- m_targetMaterial = m_canvasRenderer.GetMaterial();
- }
- */
- }
-
-
- public void OnDisable()
- {
- // Destroy material editor if one exists
- /*
- if (m_materialEditor != null)
- {
- //Debug.Log("Destroying Inline Material Editor.");
- DestroyImmediate(m_materialEditor);
- }
- */
- }
-
-
-
- public override void OnInspectorGUI()
- {
- GUI.enabled = false;
- EditorGUILayout.PropertyField(fontAsset_prop);
- EditorGUILayout.PropertyField(spriteAsset_prop);
- GUI.enabled = true;
-
- EditorGUILayout.Space();
-
- // If a Custom Material Editor exists, we use it.
- /*
- if (m_canvasRenderer != null && m_canvasRenderer.GetMaterial() != null)
- {
- Material mat = m_canvasRenderer.GetMaterial();
-
- //Debug.Log(mat + " " + m_targetMaterial);
-
- if (mat != m_targetMaterial)
- {
- // Destroy previous Material Instance
- //Debug.Log("New Material has been assigned.");
- m_targetMaterial = mat;
- DestroyImmediate(m_materialEditor);
- }
-
-
- if (m_materialEditor == null)
- {
- m_materialEditor = Editor.CreateEditor(mat);
- }
-
- m_materialEditor.DrawHeader();
-
-
- m_materialEditor.OnInspectorGUI();
- }
- */
- }
-
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SubMeshUI_Editor.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SubMeshUI_Editor.cs.meta
deleted file mode 100644
index b82410e5..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SubMeshUI_Editor.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 6b01141ed8f74d198965c86f25eb7040
-timeCreated: 1452757501
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SubMesh_Editor.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SubMesh_Editor.cs
deleted file mode 100644
index f668af96..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SubMesh_Editor.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using UnityEngine;
-using UnityEditor;
-using System.Collections;
-
-namespace TMPro.EditorUtilities
-{
- [CustomEditor(typeof(TMP_SubMesh)), CanEditMultipleObjects]
- public class TMP_SubMesh_Editor : Editor
- {
- private struct m_foldout
- { // Track Inspector foldout panel states, globally.
- //public static bool textInput = true;
- public static bool fontSettings = true;
- //public static bool extraSettings = false;
- //public static bool shadowSetting = false;
- //public static bool materialEditor = true;
- }
-
- private SerializedProperty fontAsset_prop;
- private SerializedProperty spriteAsset_prop;
-
- private TMP_SubMesh m_SubMeshComponent;
- private Renderer m_Renderer;
-
- private string[] m_SortingLayerNames;
-
- public void OnEnable()
- {
- fontAsset_prop = serializedObject.FindProperty("m_fontAsset");
- spriteAsset_prop = serializedObject.FindProperty("m_spriteAsset");
-
- m_SubMeshComponent = target as TMP_SubMesh;
-
- m_Renderer = m_SubMeshComponent.renderer;
-
- m_SortingLayerNames = SortingLayerHelper.sortingLayerNames;
- }
-
-
- public override void OnInspectorGUI()
- {
- EditorGUI.indentLevel = 0;
-
- GUI.enabled = false;
- EditorGUILayout.PropertyField(fontAsset_prop);
- EditorGUILayout.PropertyField(spriteAsset_prop);
- GUI.enabled = true;
-
- EditorGUI.BeginChangeCheck();
-
- // Look up the layer name using the current layer ID
- string oldName = SortingLayer.IDToName(m_Renderer.sortingLayerID);
-
- // Use the name to look up our array index into the names list
- int oldLayerIndex = System.Array.IndexOf(m_SortingLayerNames, oldName);
-
- // Show the pop-up for the names
- int newLayerIndex = EditorGUILayout.Popup("Sorting Layer", oldLayerIndex, m_SortingLayerNames);
-
- // If the index changes, look up the ID for the new index to store as the new ID
- if (newLayerIndex != oldLayerIndex)
- m_Renderer.sortingLayerID = SortingLayer.NameToID(m_SortingLayerNames[newLayerIndex]);
-
- // Expose the manual sorting order
- int newSortingLayerOrder = EditorGUILayout.IntField("Order in Layer", m_Renderer.sortingOrder);
- if (newSortingLayerOrder != m_Renderer.sortingOrder)
- m_Renderer.sortingOrder = newSortingLayerOrder;
-
- }
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SubMesh_Editor.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SubMesh_Editor.cs.meta
deleted file mode 100644
index fd4713b3..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_SubMesh_Editor.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: dd2fe74169b54bf58fca17288513ef38
-timeCreated: 1456189048
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_TextAlignmentDrawer.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_TextAlignmentDrawer.cs
deleted file mode 100644
index 1361de73..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_TextAlignmentDrawer.cs
+++ /dev/null
@@ -1,273 +0,0 @@
-using UnityEngine;
-using UnityEditor;
-
-namespace TMPro.EditorUtilities
-{
-
- [CustomPropertyDrawer(typeof(TextAlignmentOptions))]
- public class TMP_TextAlignmentDrawer : PropertyDrawer
- {
- const int k_AlignmentButtonWidth = 24;
- const int k_AlignmentButtonHeight = 20;
- const int k_WideViewWidth = 504;
- const int k_ControlsSpacing = 6;
- const int k_GroupWidth = k_AlignmentButtonWidth * 6;
- static readonly int k_TextAlignmentHash = "DoTextAligmentControl".GetHashCode();
-
- public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
- {
- return EditorGUIUtility.currentViewWidth > k_WideViewWidth ? k_AlignmentButtonHeight : k_AlignmentButtonHeight * 2 + 3;
- }
-
- public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
- {
- var id = GUIUtility.GetControlID(k_TextAlignmentHash, FocusType.Keyboard, position);
-
- EditorGUI.BeginProperty(position, label, property);
- {
- var controlArea = EditorGUI.PrefixLabel(position, id, label);
-
- var horizontalAligment = new Rect(controlArea.x, controlArea.y, k_GroupWidth, k_AlignmentButtonHeight);
- var verticalAligment = new Rect(!(EditorGUIUtility.currentViewWidth > k_WideViewWidth) ? controlArea.x : horizontalAligment.xMax + k_ControlsSpacing, !(EditorGUIUtility.currentViewWidth > k_WideViewWidth) ? controlArea.y + k_AlignmentButtonHeight + 3 : controlArea.y, k_GroupWidth, k_AlignmentButtonHeight);
-
- EditorGUI.BeginChangeCheck();
-
- var selectedHorizontal = DoHorizontalAligmentControl(horizontalAligment, property);
- var selectedVertical = DoVerticalAligmentControl(verticalAligment, property);
-
- if (EditorGUI.EndChangeCheck())
- {
- var value = (0x1 << selectedHorizontal) | (0x100 << selectedVertical);
- property.intValue = value;
- }
- }
- EditorGUI.EndProperty();
- }
-
- static int DoHorizontalAligmentControl(Rect position, SerializedProperty alignment)
- {
- var selected = TMP_EditorUtility.GetHorizontalAlignmentGridValue(alignment.intValue);
-
- var values = new bool[6];
-
- values[selected] = true;
-
- if (alignment.hasMultipleDifferentValues)
- {
- foreach (var obj in alignment.serializedObject.targetObjects)
- {
- var text = obj as TMP_Text;
- if (text != null)
- {
- values[TMP_EditorUtility.GetHorizontalAlignmentGridValue((int)text.alignment)] = true;
- }
- }
- }
-
- position.width = k_AlignmentButtonWidth;
-
- for (var i = 0; i < values.Length; i++)
- {
- var oldValue = values[i];
- var newValue = TMP_EditorUtility.EditorToggle(position, oldValue, TMP_UIStyleManager.alignContentA[i], i == 0 ? TMP_UIStyleManager.alignmentButtonLeft : (i == 5 ? TMP_UIStyleManager.alignmentButtonRight : TMP_UIStyleManager.alignmentButtonMid));
- if (newValue != oldValue)
- {
- selected = i;
- }
- position.x += position.width;
- }
-
- return selected;
- }
-
- static int DoVerticalAligmentControl(Rect position, SerializedProperty alignment)
- {
- var selected = TMP_EditorUtility.GetVerticalAlignmentGridValue(alignment.intValue);
-
- var values = new bool[6];
-
- values[selected] = true;
-
- if (alignment.hasMultipleDifferentValues)
- {
- foreach (var obj in alignment.serializedObject.targetObjects)
- {
- var text = obj as TMP_Text;
- if (text != null)
- {
- values[TMP_EditorUtility.GetVerticalAlignmentGridValue((int)text.alignment)] = true;
- }
- }
- }
-
- position.width = k_AlignmentButtonWidth;
-
- for (var i = 0; i < values.Length; i++)
- {
- var oldValue = values[i];
- var newValue = TMP_EditorUtility.EditorToggle(position, oldValue, TMP_UIStyleManager.alignContentB[i], i == 0 ? TMP_UIStyleManager.alignmentButtonLeft : (i == 5 ? TMP_UIStyleManager.alignmentButtonRight : TMP_UIStyleManager.alignmentButtonMid));
- if (newValue != oldValue)
- {
- selected = i;
- }
- position.x += position.width;
- }
-
- return selected;
- }
- }
-
- [CustomPropertyDrawer(typeof(HorizontalAlignmentOptions))]
- public class TMP_HorizontalAlignmentDrawer : PropertyDrawer
- {
- const int k_AlignmentButtonWidth = 24;
- const int k_AlignmentButtonHeight = 20;
- const int k_WideViewWidth = 504;
- const int k_ControlsSpacing = 6;
- const int k_GroupWidth = k_AlignmentButtonWidth * 6;
- static readonly int k_TextAlignmentHash = "DoTextAligmentControl".GetHashCode();
-
- public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
- {
- return EditorGUIUtility.currentViewWidth > k_WideViewWidth ? k_AlignmentButtonHeight : k_AlignmentButtonHeight * 2 + 3;
- }
-
- public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
- {
- var id = GUIUtility.GetControlID(k_TextAlignmentHash, FocusType.Keyboard, position);
-
- EditorGUI.BeginProperty(position, label, property);
- {
- var controlArea = EditorGUI.PrefixLabel(position, id, label);
-
- var horizontalAligment = new Rect(controlArea.x, controlArea.y, k_GroupWidth, k_AlignmentButtonHeight);
- //var verticalAligment = new Rect(!(EditorGUIUtility.currentViewWidth > k_WideViewWidth) ? controlArea.x : horizontalAligment.xMax + k_ControlsSpacing, !(EditorGUIUtility.currentViewWidth > k_WideViewWidth) ? controlArea.y + k_AlignmentButtonHeight + 3 : controlArea.y, k_GroupWidth, k_AlignmentButtonHeight);
-
- EditorGUI.BeginChangeCheck();
-
- var selectedHorizontal = DoHorizontalAligmentControl(horizontalAligment, property);
-
- if (EditorGUI.EndChangeCheck())
- {
- var value = 0x1 << selectedHorizontal;
- property.intValue = value;
- }
- }
- EditorGUI.EndProperty();
- }
-
- static int DoHorizontalAligmentControl(Rect position, SerializedProperty alignment)
- {
- var selected = TMP_EditorUtility.GetHorizontalAlignmentGridValue(alignment.intValue);
-
- var values = new bool[6];
-
- values[selected] = true;
-
- if (alignment.hasMultipleDifferentValues)
- {
- foreach (var obj in alignment.serializedObject.targetObjects)
- {
- var text = obj as TMP_Text;
- if (text != null)
- {
- values[TMP_EditorUtility.GetHorizontalAlignmentGridValue((int)text.horizontalAlignment)] = true;
- }
- }
- }
-
- position.width = k_AlignmentButtonWidth;
-
- for (var i = 0; i < values.Length; i++)
- {
- var oldValue = values[i];
- var newValue = TMP_EditorUtility.EditorToggle(position, oldValue, TMP_UIStyleManager.alignContentA[i], i == 0 ? TMP_UIStyleManager.alignmentButtonLeft : (i == 5 ? TMP_UIStyleManager.alignmentButtonRight : TMP_UIStyleManager.alignmentButtonMid));
- if (newValue != oldValue)
- {
- selected = i;
- }
- position.x += position.width;
- }
-
- return selected;
- }
- }
-
-
- [CustomPropertyDrawer(typeof(VerticalAlignmentOptions))]
- public class TMP_VerticalAlignmentDrawer : PropertyDrawer
- {
- const int k_AlignmentButtonWidth = 24;
- const int k_AlignmentButtonHeight = 20;
- const int k_WideViewWidth = 504;
- const int k_ControlsSpacing = 6;
- const int k_GroupWidth = k_AlignmentButtonWidth * 6;
- static readonly int k_TextAlignmentHash = "DoTextAligmentControl".GetHashCode();
-
- public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
- {
- return EditorGUIUtility.currentViewWidth > k_WideViewWidth ? k_AlignmentButtonHeight : k_AlignmentButtonHeight * 2 + 3;
- }
-
- public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
- {
- var id = GUIUtility.GetControlID(k_TextAlignmentHash, FocusType.Keyboard, position);
-
- EditorGUI.BeginProperty(position, label, property);
- {
- var controlArea = EditorGUI.PrefixLabel(position, id, label);
-
- var horizontalAligment = new Rect(controlArea.x, controlArea.y, k_GroupWidth, k_AlignmentButtonHeight);
- var verticalAligment = new Rect(!(EditorGUIUtility.currentViewWidth > k_WideViewWidth) ? controlArea.x : horizontalAligment.xMax + k_ControlsSpacing, !(EditorGUIUtility.currentViewWidth > k_WideViewWidth) ? controlArea.y + k_AlignmentButtonHeight + 3 : controlArea.y, k_GroupWidth, k_AlignmentButtonHeight);
-
- EditorGUI.BeginChangeCheck();
-
- //var selectedHorizontal = DoHorizontalAligmentControl(horizontalAligment, property);
- var selectedVertical = DoVerticalAligmentControl(verticalAligment, property);
-
- if (EditorGUI.EndChangeCheck())
- {
- var value = 0x100 << selectedVertical;
- property.intValue = value;
- }
- }
- EditorGUI.EndProperty();
- }
-
- static int DoVerticalAligmentControl(Rect position, SerializedProperty alignment)
- {
- var selected = TMP_EditorUtility.GetVerticalAlignmentGridValue(alignment.intValue);
-
- var values = new bool[6];
-
- values[selected] = true;
-
- if (alignment.hasMultipleDifferentValues)
- {
- foreach (var obj in alignment.serializedObject.targetObjects)
- {
- var text = obj as TMP_Text;
- if (text != null)
- {
- values[TMP_EditorUtility.GetVerticalAlignmentGridValue((int)text.verticalAlignment)] = true;
- }
- }
- }
-
- position.width = k_AlignmentButtonWidth;
-
- for (var i = 0; i < values.Length; i++)
- {
- var oldValue = values[i];
- var newValue = TMP_EditorUtility.EditorToggle(position, oldValue, TMP_UIStyleManager.alignContentB[i], i == 0 ? TMP_UIStyleManager.alignmentButtonLeft : (i == 5 ? TMP_UIStyleManager.alignmentButtonRight : TMP_UIStyleManager.alignmentButtonMid));
- if (newValue != oldValue)
- {
- selected = i;
- }
- position.x += position.width;
- }
-
- return selected;
- }
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_TextAlignmentDrawer.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_TextAlignmentDrawer.cs.meta
deleted file mode 100644
index a68a2739..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_TextAlignmentDrawer.cs.meta
+++ /dev/null
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: c55a64c7570474f47a94abe39ebfef04
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_UIStyleManager.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_UIStyleManager.cs
deleted file mode 100644
index 0a94a997..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_UIStyleManager.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using UnityEngine;
-using UnityEditor;
-using System.Collections;
-
-
-namespace TMPro.EditorUtilities
-{
-
- public static class TMP_UIStyleManager
- {
- public static GUIStyle label;
- public static GUIStyle textAreaBoxWindow;
- public static GUIStyle boldFoldout;
- public static GUIStyle panelTitle;
- public static GUIStyle sectionHeader;
- public static GUIStyle centeredLabel;
- public static GUIStyle rightLabel;
- public static GUIStyle wrappingTextArea;
-
- public static GUIStyle alignmentButtonLeft;
- public static GUIStyle alignmentButtonMid;
- public static GUIStyle alignmentButtonRight;
-
- // Alignment Button Textures
- public static Texture2D alignLeft;
- public static Texture2D alignCenter;
- public static Texture2D alignRight;
- public static Texture2D alignJustified;
- public static Texture2D alignFlush;
- public static Texture2D alignGeoCenter;
- public static Texture2D alignTop;
- public static Texture2D alignMiddle;
- public static Texture2D alignBottom;
- public static Texture2D alignBaseline;
- public static Texture2D alignMidline;
- public static Texture2D alignCapline;
- public static Texture2D sectionHeaderTexture;
-
- public static GUIContent[] alignContentA;
- public static GUIContent[] alignContentB;
-
- static TMP_UIStyleManager()
- {
- // Find to location of the TextMesh Pro Asset Folder (as users may have moved it)
- var tmproAssetFolderPath = TMP_EditorUtility.packageRelativePath;
-
- if (EditorGUIUtility.isProSkin)
- {
- alignLeft = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignLeft.psd", typeof(Texture2D)) as Texture2D;
- alignCenter = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignCenter.psd", typeof(Texture2D)) as Texture2D;
- alignRight = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignRight.psd", typeof(Texture2D)) as Texture2D;
- alignJustified = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignJustified.psd", typeof(Texture2D)) as Texture2D;
- alignFlush = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignFlush.psd", typeof(Texture2D)) as Texture2D;
- alignGeoCenter = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignCenterGeo.psd", typeof(Texture2D)) as Texture2D;
- alignTop = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignTop.psd", typeof(Texture2D)) as Texture2D;
- alignMiddle = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignMiddle.psd", typeof(Texture2D)) as Texture2D;
- alignBottom = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignBottom.psd", typeof(Texture2D)) as Texture2D;
- alignBaseline = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignBaseLine.psd", typeof(Texture2D)) as Texture2D;
- alignMidline = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignMidLine.psd", typeof(Texture2D)) as Texture2D;
- alignCapline = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignCapLine.psd", typeof(Texture2D)) as Texture2D;
- sectionHeaderTexture = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/SectionHeader_Dark.psd", typeof(Texture2D)) as Texture2D;
- }
- else
- {
- alignLeft = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignLeft_Light.psd", typeof(Texture2D)) as Texture2D;
- alignCenter = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignCenter_Light.psd", typeof(Texture2D)) as Texture2D;
- alignRight = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignRight_Light.psd", typeof(Texture2D)) as Texture2D;
- alignJustified = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignJustified_Light.psd", typeof(Texture2D)) as Texture2D;
- alignFlush = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignFlush_Light.psd", typeof(Texture2D)) as Texture2D;
- alignGeoCenter = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignCenterGeo_Light.psd", typeof(Texture2D)) as Texture2D;
- alignTop = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignTop_Light.psd", typeof(Texture2D)) as Texture2D;
- alignMiddle = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignMiddle_Light.psd", typeof(Texture2D)) as Texture2D;
- alignBottom = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignBottom_Light.psd", typeof(Texture2D)) as Texture2D;
- alignBaseline = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignBaseLine_Light.psd", typeof(Texture2D)) as Texture2D;
- alignMidline = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignMidLine_Light.psd", typeof(Texture2D)) as Texture2D;
- alignCapline = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/btn_AlignCapLine_Light.psd", typeof(Texture2D)) as Texture2D;
- sectionHeaderTexture = AssetDatabase.LoadAssetAtPath(tmproAssetFolderPath + "/Editor Resources/Textures/SectionHeader_Light.psd", typeof(Texture2D)) as Texture2D;
- }
-
- label = new GUIStyle(EditorStyles.label) { richText = true, wordWrap = true, stretchWidth = true };
- textAreaBoxWindow = new GUIStyle(EditorStyles.textArea) { richText = true };
- boldFoldout = new GUIStyle(EditorStyles.foldout) { fontStyle = FontStyle.Bold };
- panelTitle = new GUIStyle(EditorStyles.label) { fontStyle = FontStyle.Bold };
-
- sectionHeader = new GUIStyle(EditorStyles.label) { fixedHeight = 22, richText = true, border = new RectOffset(9, 9, 0, 0), overflow = new RectOffset(9, 0, 0, 0), padding = new RectOffset(0, 0, 4, 0) };
- sectionHeader.normal.background = sectionHeaderTexture;
-
- centeredLabel = new GUIStyle(EditorStyles.label) { alignment = TextAnchor.MiddleCenter};
- rightLabel = new GUIStyle(EditorStyles.label) { alignment = TextAnchor.MiddleRight, richText = true };
-
-
- alignmentButtonLeft = new GUIStyle(EditorStyles.miniButtonLeft);
- alignmentButtonLeft.padding.left = 4;
- alignmentButtonLeft.padding.right = 4;
- alignmentButtonLeft.padding.top = 2;
- alignmentButtonLeft.padding.bottom = 2;
-
- alignmentButtonMid = new GUIStyle(EditorStyles.miniButtonMid);
- alignmentButtonMid.padding.left = 4;
- alignmentButtonMid.padding.right = 4;
- alignmentButtonLeft.padding.top = 2;
- alignmentButtonLeft.padding.bottom = 2;
-
- alignmentButtonRight = new GUIStyle(EditorStyles.miniButtonRight);
- alignmentButtonRight.padding.left = 4;
- alignmentButtonRight.padding.right = 4;
- alignmentButtonLeft.padding.top = 2;
- alignmentButtonLeft.padding.bottom = 2;
-
- wrappingTextArea = new GUIStyle(EditorStyles.textArea);
- wrappingTextArea.wordWrap = true;
-
- alignContentA = new []
- {
- new GUIContent(alignLeft, "Left"),
- new GUIContent(alignCenter, "Center"),
- new GUIContent(alignRight, "Right"),
- new GUIContent(alignJustified, "Justified"),
- new GUIContent(alignFlush, "Flush"),
- new GUIContent(alignGeoCenter, "Geometry Center")
- };
-
- alignContentB = new []
- {
- new GUIContent(alignTop, "Top"),
- new GUIContent(alignMiddle, "Middle"),
- new GUIContent(alignBottom, "Bottom"),
- new GUIContent(alignBaseline, "Baseline"),
- new GUIContent(alignMidline, "Midline"),
- new GUIContent(alignCapline, "Capline")
- };
- }
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_UIStyleManager.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_UIStyleManager.cs.meta
deleted file mode 100644
index 9c09bfa3..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMP_UIStyleManager.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 30a939dce2fd4073955f2f20e659d506
-timeCreated: 1426454127
-licenseType: Store
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMPro_ContextMenus.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMPro_ContextMenus.cs
deleted file mode 100644
index a01760da..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMPro_ContextMenus.cs
+++ /dev/null
@@ -1,367 +0,0 @@
-using UnityEngine;
-using UnityEditor;
-using System.IO;
-using System.Collections;
-
-
-namespace TMPro.EditorUtilities
-{
-
- public class TMP_ContextMenus : Editor
- {
-
- private static Texture m_copiedTexture;
-
- private static Material m_copiedProperties;
- private static Material m_copiedAtlasProperties;
-
-
- // Add a Context Menu to the Texture Editor Panel to allow Copy / Paste of Texture.
- [MenuItem("CONTEXT/Texture/Copy", false, 2000)]
- static void CopyTexture(MenuCommand command)
- {
- m_copiedTexture = command.context as Texture;
- }
-
-
- // Select the currently assigned material or material preset.
- [MenuItem("CONTEXT/Material/Select Material", false, 500)]
- static void SelectMaterial(MenuCommand command)
- {
- Material mat = command.context as Material;
-
- // Select current material
- EditorUtility.FocusProjectWindow();
- EditorGUIUtility.PingObject(mat);
- }
-
-
- // Add a Context Menu to allow easy duplication of the Material.
- [MenuItem("CONTEXT/Material/Create Material Preset", false)]
- static void DuplicateMaterial(MenuCommand command)
- {
- // Get the type of text object
- // If material is not a base material, we get material leaks...
-
- Material source_Mat = (Material)command.context;
- if (!EditorUtility.IsPersistent(source_Mat))
- {
- Debug.LogWarning("Material is an instance and cannot be converted into a persistent asset.");
- return;
- }
-
- string assetPath = AssetDatabase.GetAssetPath(source_Mat).Split('.')[0];
-
- if (assetPath.IndexOf("Assets/", System.StringComparison.InvariantCultureIgnoreCase) == -1)
- {
- Debug.LogWarning("Material Preset cannot be created from a material that is located outside the project.");
- return;
- }
-
- Material duplicate = new Material(source_Mat);
-
- // Need to manually copy the shader keywords
- duplicate.shaderKeywords = source_Mat.shaderKeywords;
-
- AssetDatabase.CreateAsset(duplicate, AssetDatabase.GenerateUniqueAssetPath(assetPath + ".mat"));
-
- GameObject[] selectedObjects = Selection.gameObjects;
-
- // Assign new Material Preset to selected text objects.
- for (int i = 0; i < selectedObjects.Length; i++)
- {
- TMP_Text textObject = selectedObjects[i].GetComponent();
-
- if (textObject != null)
- {
- textObject.fontSharedMaterial = duplicate;
- }
- else
- {
- TMP_SubMesh subMeshObject = selectedObjects[i].GetComponent();
-
- if (subMeshObject != null)
- subMeshObject.sharedMaterial = duplicate;
- else
- {
- TMP_SubMeshUI subMeshUIObject = selectedObjects[i].GetComponent();
-
- if (subMeshUIObject != null)
- subMeshUIObject.sharedMaterial = duplicate;
- }
- }
- }
-
- // Ping newly created Material Preset.
- EditorUtility.FocusProjectWindow();
- EditorGUIUtility.PingObject(duplicate);
- }
-
-
- // COPY MATERIAL PROPERTIES
- [MenuItem("CONTEXT/Material/Copy Material Properties", false)]
- static void CopyMaterialProperties(MenuCommand command)
- {
- Material mat = null;
- if (command.context.GetType() == typeof(Material))
- mat = (Material)command.context;
- else
- {
- mat = Selection.activeGameObject.GetComponent().GetMaterial();
- }
-
- m_copiedProperties = new Material(mat);
-
- m_copiedProperties.shaderKeywords = mat.shaderKeywords;
-
- m_copiedProperties.hideFlags = HideFlags.DontSave;
- }
-
-
- // PASTE MATERIAL
- //[MenuItem("CONTEXT/MaterialComponent/Paste Material Properties", false)]
- [MenuItem("CONTEXT/Material/Paste Material Properties", false)]
- static void PasteMaterialProperties(MenuCommand command)
- {
- if (m_copiedProperties == null)
- {
- Debug.LogWarning("No Material Properties to Paste. Use Copy Material Properties first.");
- return;
- }
-
- Material mat = null;
- if (command.context.GetType() == typeof(Material))
- mat = (Material)command.context;
- else
- {
- mat = Selection.activeGameObject.GetComponent().GetMaterial();
- }
-
- Undo.RecordObject(mat, "Paste Material");
-
- ShaderUtilities.GetShaderPropertyIDs(); // Make sure we have valid Property IDs
- if (mat.HasProperty(ShaderUtilities.ID_GradientScale))
- {
- // Preserve unique SDF properties from destination material.
- m_copiedProperties.SetTexture(ShaderUtilities.ID_MainTex, mat.GetTexture(ShaderUtilities.ID_MainTex));
- m_copiedProperties.SetFloat(ShaderUtilities.ID_GradientScale, mat.GetFloat(ShaderUtilities.ID_GradientScale));
- m_copiedProperties.SetFloat(ShaderUtilities.ID_TextureWidth, mat.GetFloat(ShaderUtilities.ID_TextureWidth));
- m_copiedProperties.SetFloat(ShaderUtilities.ID_TextureHeight, mat.GetFloat(ShaderUtilities.ID_TextureHeight));
- }
-
- EditorShaderUtilities.CopyMaterialProperties(m_copiedProperties, mat);
-
- // Copy ShaderKeywords from one material to the other.
- mat.shaderKeywords = m_copiedProperties.shaderKeywords;
-
- // Let TextMeshPro Objects that this mat has changed.
- TMPro_EventManager.ON_MATERIAL_PROPERTY_CHANGED(true, mat);
- }
-
-
- // Enable Resetting of Material properties without losing unique properties of the font atlas.
- [MenuItem("CONTEXT/Material/Reset", false, 2100)]
- static void ResetSettings(MenuCommand command)
- {
- Material mat = null;
- if (command.context.GetType() == typeof(Material))
- mat = (Material)command.context;
- else
- {
- mat = Selection.activeGameObject.GetComponent().GetMaterial();
- }
-
- Undo.RecordObject(mat, "Reset Material");
-
- ShaderUtilities.GetShaderPropertyIDs(); // Make sure we have valid Property IDs
- if (mat.HasProperty(ShaderUtilities.ID_GradientScale))
- {
- // Copy unique properties of the SDF Material
- var texture = mat.GetTexture(ShaderUtilities.ID_MainTex);
- var gradientScale = mat.GetFloat(ShaderUtilities.ID_GradientScale);
- var texWidth = mat.GetFloat(ShaderUtilities.ID_TextureWidth);
- var texHeight = mat.GetFloat(ShaderUtilities.ID_TextureHeight);
-
- var stencilId = 0.0f;
- var stencilComp = 0.0f;
-
- if (mat.HasProperty(ShaderUtilities.ID_StencilID))
- {
- stencilId = mat.GetFloat(ShaderUtilities.ID_StencilID);
- stencilComp = mat.GetFloat(ShaderUtilities.ID_StencilComp);
- }
-
- var normalWeight = mat.GetFloat(ShaderUtilities.ID_WeightNormal);
- var boldWeight = mat.GetFloat(ShaderUtilities.ID_WeightBold);
-
- // Reset the material
- Unsupported.SmartReset(mat);
-
- // Reset ShaderKeywords
- mat.shaderKeywords = new string[0]; // { "BEVEL_OFF", "GLOW_OFF", "UNDERLAY_OFF" };
-
- // Copy unique material properties back to the material.
- mat.SetTexture(ShaderUtilities.ID_MainTex, texture);
- mat.SetFloat(ShaderUtilities.ID_GradientScale, gradientScale);
- mat.SetFloat(ShaderUtilities.ID_TextureWidth, texWidth);
- mat.SetFloat(ShaderUtilities.ID_TextureHeight, texHeight);
-
- if (mat.HasProperty(ShaderUtilities.ID_StencilID))
- {
- mat.SetFloat(ShaderUtilities.ID_StencilID, stencilId);
- mat.SetFloat(ShaderUtilities.ID_StencilComp, stencilComp);
- }
-
- mat.SetFloat(ShaderUtilities.ID_WeightNormal, normalWeight);
- mat.SetFloat(ShaderUtilities.ID_WeightBold, boldWeight);
- }
- else
- {
- Unsupported.SmartReset(mat);
- }
-
- TMPro_EventManager.ON_MATERIAL_PROPERTY_CHANGED(true, mat);
- }
-
-
- //This function is used for debugging and fixing potentially broken font atlas links.
- [MenuItem("CONTEXT/Material/Copy Atlas", false, 2000)]
- static void CopyAtlas(MenuCommand command)
- {
- Material mat = command.context as Material;
-
- m_copiedAtlasProperties = new Material(mat);
- m_copiedAtlasProperties.hideFlags = HideFlags.DontSave;
- }
-
-
- // This function is used for debugging and fixing potentially broken font atlas links
- [MenuItem("CONTEXT/Material/Paste Atlas", false, 2001)]
- static void PasteAtlas(MenuCommand command)
- {
- Material mat = command.context as Material;
-
- if (mat == null)
- return;
-
- if (m_copiedAtlasProperties != null)
- {
- Undo.RecordObject(mat, "Paste Texture");
-
- ShaderUtilities.GetShaderPropertyIDs(); // Make sure we have valid Property IDs
-
- if (m_copiedAtlasProperties.HasProperty(ShaderUtilities.ID_MainTex))
- mat.SetTexture(ShaderUtilities.ID_MainTex, m_copiedAtlasProperties.GetTexture(ShaderUtilities.ID_MainTex));
-
- if (m_copiedAtlasProperties.HasProperty(ShaderUtilities.ID_GradientScale))
- {
- mat.SetFloat(ShaderUtilities.ID_GradientScale, m_copiedAtlasProperties.GetFloat(ShaderUtilities.ID_GradientScale));
- mat.SetFloat(ShaderUtilities.ID_TextureWidth, m_copiedAtlasProperties.GetFloat(ShaderUtilities.ID_TextureWidth));
- mat.SetFloat(ShaderUtilities.ID_TextureHeight, m_copiedAtlasProperties.GetFloat(ShaderUtilities.ID_TextureHeight));
- }
- }
- else if (m_copiedTexture != null)
- {
- Undo.RecordObject(mat, "Paste Texture");
-
- mat.SetTexture(ShaderUtilities.ID_MainTex, m_copiedTexture);
- }
-
- //DestroyImmediate(m_copiedAtlasProperties);
- }
-
-
- // Context Menus for TMPro Font Assets
- //This function is used for debugging and fixing potentially broken font atlas links.
- [MenuItem("CONTEXT/TMP_FontAsset/Extract Atlas", false, 2100)]
- static void ExtractAtlas(MenuCommand command)
- {
- TMP_FontAsset font = command.context as TMP_FontAsset;
-
- string fontPath = AssetDatabase.GetAssetPath(font);
- string texPath = Path.GetDirectoryName(fontPath) + "/" + Path.GetFileNameWithoutExtension(fontPath) + " Atlas.png";
-
- // Create a Serialized Object of the texture to allow us to make it readable.
- SerializedObject texprop = new SerializedObject(font.material.GetTexture(ShaderUtilities.ID_MainTex));
- texprop.FindProperty("m_IsReadable").boolValue = true;
- texprop.ApplyModifiedProperties();
-
- // Create a copy of the texture.
- Texture2D tex = Instantiate(font.material.GetTexture(ShaderUtilities.ID_MainTex)) as Texture2D;
-
- // Set the texture to not readable again.
- texprop.FindProperty("m_IsReadable").boolValue = false;
- texprop.ApplyModifiedProperties();
-
- Debug.Log(texPath);
- // Saving File for Debug
- var pngData = tex.EncodeToPNG();
- File.WriteAllBytes(texPath, pngData);
-
- AssetDatabase.Refresh();
- DestroyImmediate(tex);
- }
-
- ///
- ///
- ///
- ///
- [MenuItem("CONTEXT/TMP_FontAsset/Update Atlas Texture...", false, 2000)]
- static void RegenerateFontAsset(MenuCommand command)
- {
- TMP_FontAsset fontAsset = command.context as TMP_FontAsset;
-
- if (fontAsset != null)
- {
- TMPro_FontAssetCreatorWindow.ShowFontAtlasCreatorWindow(fontAsset);
- }
- }
-
- [MenuItem("CONTEXT/TMP_FontAsset/Force Upgrade To Version 1.1.0...", false, 2010)]
- static void ForceFontAssetUpgrade(MenuCommand command)
- {
- TMP_FontAsset fontAsset = command.context as TMP_FontAsset;
-
- if (fontAsset != null)
- {
- fontAsset.UpgradeFontAsset();
- TMPro_EventManager.ON_FONT_PROPERTY_CHANGED(true, fontAsset);
- }
- }
-
-
- ///
- /// Clear Dynamic Font Asset data such as glyph, character and font features.
- ///
- ///
- [MenuItem("CONTEXT/TMP_FontAsset/Reset", false, 100)]
- static void ClearFontAssetData(MenuCommand command)
- {
- TMP_FontAsset fontAsset = command.context as TMP_FontAsset;
-
- if (fontAsset != null && Selection.activeObject != fontAsset)
- {
- Selection.activeObject = fontAsset;
- }
-
- fontAsset.ClearFontAssetData(true);
-
- TMPro_EventManager.ON_FONT_PROPERTY_CHANGED(true, fontAsset);
- }
-
-
- [MenuItem("CONTEXT/TrueTypeFontImporter/Create TMP Font Asset...", false, 200)]
- static void CreateFontAsset(MenuCommand command)
- {
- TrueTypeFontImporter importer = command.context as TrueTypeFontImporter;
-
- if (importer != null)
- {
- Font sourceFontFile = AssetDatabase.LoadAssetAtPath(importer.assetPath);
-
- if (sourceFontFile)
- TMPro_FontAssetCreatorWindow.ShowFontAtlasCreatorWindow(sourceFontFile);
- }
- }
- }
-}
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMPro_ContextMenus.cs.meta b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMPro_ContextMenus.cs.meta
deleted file mode 100644
index f16753fe..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMPro_ContextMenus.cs.meta
+++ /dev/null
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 44e1d646473a40178712cb2150f54cec
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMPro_CreateObjectMenu.cs b/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMPro_CreateObjectMenu.cs
deleted file mode 100644
index 99b83a66..00000000
--- a/wb_unity_pro_2/Library/PackageCache/com.unity.textmeshpro@2.1.1/Scripts/Editor/TMPro_CreateObjectMenu.cs
+++ /dev/null
@@ -1,392 +0,0 @@
-using UnityEngine;
-using UnityEditor;
-using UnityEditor.Presets;
-using UnityEditor.SceneManagement;
-using UnityEditor.Experimental.SceneManagement;
-using UnityEngine.SceneManagement;
-using UnityEngine.UI;
-using UnityEngine.EventSystems;
-
-
-namespace TMPro.EditorUtilities
-{
- public static class TMPro_CreateObjectMenu
- {
-
- ///
- /// Create a TextMeshPro object that works with the Mesh Renderer
- ///
- ///
- [MenuItem("GameObject/3D Object/Text - TextMeshPro", false, 30)]
- static void CreateTextMeshProObjectPerform(MenuCommand command)
- {
- GameObject go = ObjectFactory.CreateGameObject("Text (TMP)");
-
- // Add support for new prefab mode
- StageUtility.PlaceGameObjectInCurrentStage(go);
-
- TextMeshPro textComponent = ObjectFactory.AddComponent(go);
-
- if (textComponent.m_isWaitingOnResourceLoad == false)
- {
- // Get reference to potential Presets for component
- #if UNITY_2019_3_OR_NEWER
- Preset[] presets = Preset.GetDefaultPresetsForObject(textComponent);
-
- if (presets == null || presets.Length == 0)
- {
- textComponent.text = "Sample text";
- textComponent.alignment = TextAlignmentOptions.TopLeft;
- }
- else
- {
- textComponent.renderer.sortingLayerID = textComponent._SortingLayerID;
- textComponent.renderer.sortingOrder = textComponent._SortingOrder;
- }
- #else
- if (Preset.GetDefaultForObject(textComponent) == null)
- {
- textComponent.text = "Sample text";
- textComponent.alignment = TextAlignmentOptions.TopLeft;
- }
- else
- {
- textComponent.renderer.sortingLayerID = textComponent._SortingLayerID;
- textComponent.renderer.sortingOrder = textComponent._SortingOrder;
- }
- #endif
-
- if (TMP_Settings.autoSizeTextContainer)
- {
- Vector2 size = textComponent.GetPreferredValues(TMP_Math.FLOAT_MAX, TMP_Math.FLOAT_MAX);
- textComponent.rectTransform.sizeDelta = size;
- }
- else
- {
- textComponent.rectTransform.sizeDelta = TMP_Settings.defaultTextMeshProTextContainerSize;
- }
- }
- else
- {
- textComponent.text = "Sample text";
- textComponent.alignment = TextAlignmentOptions.TopLeft;
- }
-
- Undo.RegisterCreatedObjectUndo(go, "Create " + go.name);
-
- GameObject contextObject = command.context as GameObject;
- if (contextObject != null)
- {
- GameObjectUtility.SetParentAndAlign(go, contextObject);
- Undo.SetTransformParent(go.transform, contextObject.transform, "Parent " + go.name);
- }
-
- Selection.activeGameObject = go;
- }
-
-
- ///
- /// Create a TextMeshPro object that works with the CanvasRenderer
- ///
- ///
- [MenuItem("GameObject/UI/Text - TextMeshPro", false, 2001)]
- static void CreateTextMeshProGuiObjectPerform(MenuCommand menuCommand)
- {
- GameObject go = TMP_DefaultControls.CreateText(GetStandardResources());
-
- // Override text color and font size
- TextMeshProUGUI textComponent = go.GetComponent();
-
- if (textComponent.m_isWaitingOnResourceLoad == false)
- {
- // Get reference to potential Presets for component
- #if UNITY_2019_3_OR_NEWER
- Preset[] presets = Preset.GetDefaultPresetsForObject(textComponent);
-
- if (presets == null || presets.Length == 0)
- {
- textComponent.fontSize = TMP_Settings.defaultFontSize;
- textComponent.color = Color.white;
- textComponent.text = "New Text";
- }
- #else
- if (Preset.GetDefaultForObject(textComponent) == null)
- {
- textComponent.fontSize = TMP_Settings.defaultFontSize;
- textComponent.color = Color.white;
- textComponent.text = "New Text";
- }
- #endif
-
- if (TMP_Settings.autoSizeTextContainer)
- {
- Vector2 size = textComponent.GetPreferredValues(TMP_Math.FLOAT_MAX, TMP_Math.FLOAT_MAX);
- textComponent.rectTransform.sizeDelta = size;
- }
- else
- {
- textComponent.rectTransform.sizeDelta = TMP_Settings.defaultTextMeshProUITextContainerSize;
- }
- }
- else
- {
- textComponent.fontSize = 36;
- textComponent.color = Color.white;
- textComponent.text = "New Text";
- }
-
- PlaceUIElementRoot(go, menuCommand);
- }
-
- [MenuItem("GameObject/UI/Button - TextMeshPro", false, 2031)]
- public static void AddButton(MenuCommand menuCommand)
- {
- GameObject go = TMP_DefaultControls.CreateButton(GetStandardResources());
-
- // Override font size
- TMP_Text textComponent = go.GetComponentInChildren();
- textComponent.fontSize = 24;
-
- PlaceUIElementRoot(go, menuCommand);
- }
-
-
-
- [MenuItem("GameObject/UI/Input Field - TextMeshPro", false, 2037)]
- static void AddTextMeshProInputField(MenuCommand menuCommand)
- {
- GameObject go = TMP_DefaultControls.CreateInputField(GetStandardResources());
- PlaceUIElementRoot(go, menuCommand);
- }
-
-
- [MenuItem("GameObject/UI/Dropdown - TextMeshPro", false, 2036)]
- public static void AddDropdown(MenuCommand menuCommand)
- {
- GameObject go = TMP_DefaultControls.CreateDropdown(GetStandardResources());
- PlaceUIElementRoot(go, menuCommand);
- }
-
-
- private const string kUILayerName = "UI";
-
- private const string kStandardSpritePath = "UI/Skin/UISprite.psd";
- private const string kBackgroundSpritePath = "UI/Skin/Background.psd";
- private const string kInputFieldBackgroundPath = "UI/Skin/InputFieldBackground.psd";
- private const string kKnobPath = "UI/Skin/Knob.psd";
- private const string kCheckmarkPath = "UI/Skin/Checkmark.psd";
- private const string kDropdownArrowPath = "UI/Skin/DropdownArrow.psd";
- private const string kMaskPath = "UI/Skin/UIMask.psd";
-
- private static TMP_DefaultControls.Resources s_StandardResources;
-
-
- private static TMP_DefaultControls.Resources GetStandardResources()
- {
- if (s_StandardResources.standard == null)
- {
- s_StandardResources.standard = AssetDatabase.GetBuiltinExtraResource(kStandardSpritePath);
- s_StandardResources.background = AssetDatabase.GetBuiltinExtraResource(kBackgroundSpritePath);
- s_StandardResources.inputField = AssetDatabase.GetBuiltinExtraResource(kInputFieldBackgroundPath);
- s_StandardResources.knob = AssetDatabase.GetBuiltinExtraResource(kKnobPath);
- s_StandardResources.checkmark = AssetDatabase.GetBuiltinExtraResource(kCheckmarkPath);
- s_StandardResources.dropdown = AssetDatabase.GetBuiltinExtraResource(kDropdownArrowPath);
- s_StandardResources.mask = AssetDatabase.GetBuiltinExtraResource(kMaskPath);
- }
- return s_StandardResources;
- }
-
-
- private static void SetPositionVisibleinSceneView(RectTransform canvasRTransform, RectTransform itemTransform)
- {
- // Find the best scene view
- SceneView sceneView = SceneView.lastActiveSceneView;
- if (sceneView == null && SceneView.sceneViews.Count > 0)
- sceneView = SceneView.sceneViews[0] as SceneView;
-
- // Couldn't find a SceneView. Don't set position.
- if (sceneView == null || sceneView.camera == null)
- return;
-
- // Create world space Plane from canvas position.
- Camera camera = sceneView.camera;
- Vector3 position = Vector3.zero;
- Vector2 localPlanePosition;
-
- if (RectTransformUtility.ScreenPointToLocalPointInRectangle(canvasRTransform, new Vector2(camera.pixelWidth / 2, camera.pixelHeight / 2), camera, out localPlanePosition))
- {
- // Adjust for canvas pivot
- localPlanePosition.x = localPlanePosition.x + canvasRTransform.sizeDelta.x * canvasRTransform.pivot.x;
- localPlanePosition.y = localPlanePosition.y + canvasRTransform.sizeDelta.y * canvasRTransform.pivot.y;
-
- localPlanePosition.x = Mathf.Clamp(localPlanePosition.x, 0, canvasRTransform.sizeDelta.x);
- localPlanePosition.y = Mathf.Clamp(localPlanePosition.y, 0, canvasRTransform.sizeDelta.y);
-
- // Adjust for anchoring
- position.x = localPlanePosition.x - canvasRTransform.sizeDelta.x * itemTransform.anchorMin.x;
- position.y = localPlanePosition.y - canvasRTransform.sizeDelta.y * itemTransform.anchorMin.y;
-
- Vector3 minLocalPosition;
- minLocalPosition.x = canvasRTransform.sizeDelta.x * (0 - canvasRTransform.pivot.x) + itemTransform.sizeDelta.x * itemTransform.pivot.x;
- minLocalPosition.y = canvasRTransform.sizeDelta.y * (0 - canvasRTransform.pivot.y) + itemTransform.sizeDelta.y * itemTransform.pivot.y;
-
- Vector3 maxLocalPosition;
- maxLocalPosition.x = canvasRTransform.sizeDelta.x * (1 - canvasRTransform.pivot.x) - itemTransform.sizeDelta.x * itemTransform.pivot.x;
- maxLocalPosition.y = canvasRTransform.sizeDelta.y * (1 - canvasRTransform.pivot.y) - itemTransform.sizeDelta.y * itemTransform.pivot.y;
-
- position.x = Mathf.Clamp(position.x, minLocalPosition.x, maxLocalPosition.x);
- position.y = Mathf.Clamp(position.y, minLocalPosition.y, maxLocalPosition.y);
- }
-
- itemTransform.anchoredPosition = position;
- itemTransform.localRotation = Quaternion.identity;
- itemTransform.localScale = Vector3.one;
- }
-
-
- private static void PlaceUIElementRoot(GameObject element, MenuCommand menuCommand)
- {
- GameObject parent = menuCommand.context as GameObject;
- bool explicitParentChoice = true;
- if (parent == null)
- {
- parent = GetOrCreateCanvasGameObject();
- explicitParentChoice = false;
-
- // If in Prefab Mode, Canvas has to be part of Prefab contents,
- // otherwise use Prefab root instead.
- PrefabStage prefabStage = PrefabStageUtility.GetCurrentPrefabStage();
- if (prefabStage != null && !prefabStage.IsPartOfPrefabContents(parent))
- parent = prefabStage.prefabContentsRoot;
- }
- if (parent.GetComponentInParent