Merge branch 'sskin' of ssh://192.168.0.8:29418/XianJing into hy_test

Assets/Lua/Config/RoleAvatarCfg.lua

@@ -1452,34 +1452,42 @@ local RoleAvatarCfg = {
 [10097]={
 ['Id']=10097,
 ['AvatarPrefab']='Fashion_HeadTop/Zhanbushi_Women_HeadTop_01',
+['ModelPosition']={0,-1.98,0.03},
 },
 [10098]={
 ['Id']=10098,
 ['AvatarPrefab']='Fashion_HeadTop/Zhanbushi_Man_HeadTop_01',
+['ModelPosition']={0,-1.98,0.03},
 },
 [10099]={
 ['Id']=10099,
 ['AvatarPrefab']='Fashion_HeadTop/zhanxingshi_Women_HeadTop_01',
+['ModelPosition']={0,-1.98,0.03},
 },
 [10100]={
 ['Id']=10100,
 ['AvatarPrefab']='Fashion_HeadTop/Zhanxingshi_Man_HeadTop_01',
+['ModelPosition']={0,-1.98,0.03},
 },
 [10101]={
 ['Id']=10101,
 ['AvatarPrefab']='Fashion_HeadTop/Xianxia_Women_HeadTop_01',
+['ModelPosition']={0,-1.98,0.03},
 },
 [10102]={
 ['Id']=10102,
 ['AvatarPrefab']='Fashion_HeadTop/Xianxia_Man_HeadTop_01',
+['ModelPosition']={0,-1.98,0.03},
 },
 [10103]={
 ['Id']=10103,
 ['AvatarPrefab']='Fashion_HeadTop/Maoxianjia_Women_HeadTop_01',
+['ModelPosition']={0,-1.98,0.03},
 },
 [10104]={
 ['Id']=10104,
 ['AvatarPrefab']='Fashion_HeadTop/Maoxianjia_Man_HeadTop_01',
+['ModelPosition']={0,-1.98,0.03},
 },
 --==========================================头中（面，耳等）=============================================
 -- [20013]={

Assets/Lua/Managers/OpenPayMgr.lua

@@ -269,7 +269,7 @@ function OpenPayMgr:GetCurVersionCfg(version)
 end
 
 function OpenPayMgr:GetCurPayMode()
-    local vs =  UnityEngine.Application.Version
+    local vs =  UnityEngine.Application.version
     local vcfg = self:GetCurVersionCfg(vs)
     if self.platform == "SDKHwQuick" then
         return vcfg.AndroidPayMode + 0