Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
commit
01e39e0435
|
@ -1132,6 +1132,12 @@ namespace GameLogic
|
|||
return App.ResMgr.LoadAsset<Sprite>(spriteStr);
|
||||
}
|
||||
|
||||
public static Font LoadFont()
|
||||
{
|
||||
Font BuildInFont = Resources.GetBuiltinResource<Font>("Arial.ttf");
|
||||
return BuildInFont;
|
||||
}
|
||||
|
||||
public static void LoadSpriteAsync(string spriteName, Image image)
|
||||
{
|
||||
App.ResMgr.LoadAssetAsync<Sprite>(spriteName, (tmpName, sprite) => {
|
||||
|
|
|
@ -2858,6 +2858,16 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 2972572135738739882}
|
||||
m_Modifications:
|
||||
- target: {fileID: 8511423249256405072, guid: fe4b34a2e2ffda44ba6a1e58d8be23d3,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Effect_Dan_changzhu
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8511423249256405072, guid: fe4b34a2e2ffda44ba6a1e58d8be23d3,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7869096045278935994, guid: fe4b34a2e2ffda44ba6a1e58d8be23d3,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
@ -2913,16 +2923,6 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8511423249256405072, guid: fe4b34a2e2ffda44ba6a1e58d8be23d3,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Effect_Dan_changzhu
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8511423249256405072, guid: fe4b34a2e2ffda44ba6a1e58d8be23d3,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fe4b34a2e2ffda44ba6a1e58d8be23d3, type: 3}
|
||||
--- !u!4 &1439099829012666779 stripped
|
||||
|
|
|
@ -28,6 +28,9 @@ local function createPanel(uiConfig, parent)
|
|||
for i = 0, textArr.Length-1 do
|
||||
local textStr=textArr[i].text
|
||||
textArr[i].text=GetLanguageStrById(textStr)
|
||||
if GetCurLanguage() == 2 and (string.find(textArr[i].font.name,"kaiu",1) or string.find(textArr[i].font.name,"FZJinLS",1)) then
|
||||
textArr[i].font = Util.LoadFont()
|
||||
end
|
||||
end
|
||||
local imageArr=gameObject:GetComponentsInChildren(typeof(UnityEngine.UI.Image),true);
|
||||
for i = 0, imageArr.Length-1 do
|
||||
|
|
|
@ -596,6 +596,9 @@ function UIManager.CreatePanel(uiConfig, parent)
|
|||
for i = 0, textArr.Length-1 do
|
||||
local textStr=textArr[i].text
|
||||
textArr[i].text=GetLanguageStrById(textStr)
|
||||
if GetCurLanguage() == 2 and (string.find(textArr[i].font.name,"kaiu",1) or string.find(textArr[i].font.name,"FZJinLS",1)) then
|
||||
textArr[i].font = Util.LoadFont()
|
||||
end
|
||||
end
|
||||
local imageArr=gameObject:GetComponentsInChildren(typeof(UnityEngine.UI.Image),true);
|
||||
for i = 0, imageArr.Length-1 do
|
||||
|
|
|
@ -271,7 +271,7 @@ function this.SetWeedOutRootInfo()
|
|||
commonInfo.SetActive(false)
|
||||
local tmData = ArenaTopMatchManager.GetBaseData()
|
||||
this.WeedOutText.text = Language[10161]
|
||||
this.WeedOutMyRankText.text =Language[10103].. tmData.myrank <= 0 and Language[10036] or ArenaTopMatchManager.GetRankNameByRank(tmData.myrank)
|
||||
this.WeedOutMyRankText.text =Language[10103] .. (tmData.myrank <= 0 and Language[10036] or ArenaTopMatchManager.GetRankNameByRank(tmData.myrank))
|
||||
this.WeedOutBestRank.text = Language[10162]
|
||||
this.WeedOutBestRankText.text = tmData.maxRank <= 0 and Language[10086] or this.GetRankName(tmData.maxRank)
|
||||
end
|
||||
|
|
|
@ -71,6 +71,7 @@ public class DelegateFactory
|
|||
dict.Add(typeof(UnityEngine.Application.AdvertisingIdentifierCallback), factory.UnityEngine_Application_AdvertisingIdentifierCallback);
|
||||
dict.Add(typeof(UnityEngine.Application.LowMemoryCallback), factory.UnityEngine_Application_LowMemoryCallback);
|
||||
dict.Add(typeof(UnityEngine.Application.LogCallback), factory.UnityEngine_Application_LogCallback);
|
||||
dict.Add(typeof(System.Action<bool>), factory.System_Action_bool);
|
||||
dict.Add(typeof(System.Func<bool>), factory.System_Func_bool);
|
||||
dict.Add(typeof(UnityEngine.AudioClip.PCMReaderCallback), factory.UnityEngine_AudioClip_PCMReaderCallback);
|
||||
dict.Add(typeof(UnityEngine.AudioClip.PCMSetPositionCallback), factory.UnityEngine_AudioClip_PCMSetPositionCallback);
|
||||
|
@ -153,6 +154,7 @@ public class DelegateFactory
|
|||
DelegateTraits<UnityEngine.Application.AdvertisingIdentifierCallback>.Init(factory.UnityEngine_Application_AdvertisingIdentifierCallback);
|
||||
DelegateTraits<UnityEngine.Application.LowMemoryCallback>.Init(factory.UnityEngine_Application_LowMemoryCallback);
|
||||
DelegateTraits<UnityEngine.Application.LogCallback>.Init(factory.UnityEngine_Application_LogCallback);
|
||||
DelegateTraits<System.Action<bool>>.Init(factory.System_Action_bool);
|
||||
DelegateTraits<System.Func<bool>>.Init(factory.System_Func_bool);
|
||||
DelegateTraits<UnityEngine.AudioClip.PCMReaderCallback>.Init(factory.UnityEngine_AudioClip_PCMReaderCallback);
|
||||
DelegateTraits<UnityEngine.AudioClip.PCMSetPositionCallback>.Init(factory.UnityEngine_AudioClip_PCMSetPositionCallback);
|
||||
|
@ -235,6 +237,7 @@ public class DelegateFactory
|
|||
TypeTraits<UnityEngine.Application.AdvertisingIdentifierCallback>.Init(factory.Check_UnityEngine_Application_AdvertisingIdentifierCallback);
|
||||
TypeTraits<UnityEngine.Application.LowMemoryCallback>.Init(factory.Check_UnityEngine_Application_LowMemoryCallback);
|
||||
TypeTraits<UnityEngine.Application.LogCallback>.Init(factory.Check_UnityEngine_Application_LogCallback);
|
||||
TypeTraits<System.Action<bool>>.Init(factory.Check_System_Action_bool);
|
||||
TypeTraits<System.Func<bool>>.Init(factory.Check_System_Func_bool);
|
||||
TypeTraits<UnityEngine.AudioClip.PCMReaderCallback>.Init(factory.Check_UnityEngine_AudioClip_PCMReaderCallback);
|
||||
TypeTraits<UnityEngine.AudioClip.PCMSetPositionCallback>.Init(factory.Check_UnityEngine_AudioClip_PCMSetPositionCallback);
|
||||
|
@ -317,6 +320,7 @@ public class DelegateFactory
|
|||
StackTraits<UnityEngine.Application.AdvertisingIdentifierCallback>.Push = factory.Push_UnityEngine_Application_AdvertisingIdentifierCallback;
|
||||
StackTraits<UnityEngine.Application.LowMemoryCallback>.Push = factory.Push_UnityEngine_Application_LowMemoryCallback;
|
||||
StackTraits<UnityEngine.Application.LogCallback>.Push = factory.Push_UnityEngine_Application_LogCallback;
|
||||
StackTraits<System.Action<bool>>.Push = factory.Push_System_Action_bool;
|
||||
StackTraits<System.Func<bool>>.Push = factory.Push_System_Func_bool;
|
||||
StackTraits<UnityEngine.AudioClip.PCMReaderCallback>.Push = factory.Push_UnityEngine_AudioClip_PCMReaderCallback;
|
||||
StackTraits<UnityEngine.AudioClip.PCMSetPositionCallback>.Push = factory.Push_UnityEngine_AudioClip_PCMSetPositionCallback;
|
||||
|
@ -3583,6 +3587,63 @@ public class DelegateFactory
|
|||
ToLua.Push(L, o);
|
||||
}
|
||||
|
||||
class System_Action_bool_Event : LuaDelegate
|
||||
{
|
||||
public System_Action_bool_Event(LuaFunction func) : base(func) { }
|
||||
public System_Action_bool_Event(LuaFunction func, LuaTable self) : base(func, self) { }
|
||||
|
||||
public void Call(bool param0)
|
||||
{
|
||||
func.BeginPCall();
|
||||
func.Push(param0);
|
||||
func.PCall();
|
||||
func.EndPCall();
|
||||
}
|
||||
|
||||
public void CallWithSelf(bool param0)
|
||||
{
|
||||
func.BeginPCall();
|
||||
func.Push(self);
|
||||
func.Push(param0);
|
||||
func.PCall();
|
||||
func.EndPCall();
|
||||
}
|
||||
}
|
||||
|
||||
public System.Action<bool> System_Action_bool(LuaFunction func, LuaTable self, bool flag)
|
||||
{
|
||||
if (func == null)
|
||||
{
|
||||
System.Action<bool> fn = delegate(bool param0) { };
|
||||
return fn;
|
||||
}
|
||||
|
||||
if(!flag)
|
||||
{
|
||||
System_Action_bool_Event target = new System_Action_bool_Event(func);
|
||||
System.Action<bool> d = target.Call;
|
||||
target.method = d.Method;
|
||||
return d;
|
||||
}
|
||||
else
|
||||
{
|
||||
System_Action_bool_Event target = new System_Action_bool_Event(func, self);
|
||||
System.Action<bool> d = target.CallWithSelf;
|
||||
target.method = d.Method;
|
||||
return d;
|
||||
}
|
||||
}
|
||||
|
||||
bool Check_System_Action_bool(IntPtr L, int pos)
|
||||
{
|
||||
return TypeChecker.CheckDelegateType(typeof(System.Action<bool>), L, pos);
|
||||
}
|
||||
|
||||
void Push_System_Action_bool(IntPtr L, System.Action<bool> o)
|
||||
{
|
||||
ToLua.Push(L, o);
|
||||
}
|
||||
|
||||
class System_Func_bool_Event : LuaDelegate
|
||||
{
|
||||
public System_Func_bool_Event(LuaFunction func) : base(func) { }
|
||||
|
|
|
@ -86,6 +86,7 @@ public class GameLogic_UtilWrap
|
|||
L.RegFunction("DoLoopRotate", DoLoopRotate);
|
||||
L.RegFunction("GetChildrenTrans", GetChildrenTrans);
|
||||
L.RegFunction("LoadSprite", LoadSprite);
|
||||
L.RegFunction("LoadFont", LoadFont);
|
||||
L.RegFunction("LoadSpriteAsync", LoadSpriteAsync);
|
||||
L.RegFunction("SetGray", SetGray);
|
||||
L.RegFunction("SetSpineGray", SetSpineGray);
|
||||
|
@ -1554,6 +1555,22 @@ public class GameLogic_UtilWrap
|
|||
}
|
||||
}
|
||||
|
||||
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
|
||||
static int LoadFont(IntPtr L)
|
||||
{
|
||||
try
|
||||
{
|
||||
ToLua.CheckArgsCount(L, 0);
|
||||
UnityEngine.Font o = GameLogic.Util.LoadFont();
|
||||
ToLua.PushSealed(L, o);
|
||||
return 1;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
return LuaDLL.toluaL_exception(L, e);
|
||||
}
|
||||
}
|
||||
|
||||
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
|
||||
static int LoadSpriteAsync(IntPtr L)
|
||||
{
|
||||
|
|
|
@ -386,6 +386,7 @@ public static class LuaBinder
|
|||
L.RegFunction("Action_int", System_Action_int);
|
||||
L.RegFunction("Comparison_int", System_Comparison_int);
|
||||
L.RegFunction("Func_int_int", System_Func_int_int);
|
||||
L.RegFunction("Action_bool", System_Action_bool);
|
||||
L.RegFunction("Func_bool", System_Func_bool);
|
||||
L.RegFunction("Action_UnityEngine_AsyncOperation", System_Action_UnityEngine_AsyncOperation);
|
||||
L.RegFunction("Action_string", System_Action_string);
|
||||
|
@ -2410,6 +2411,33 @@ public static class LuaBinder
|
|||
}
|
||||
}
|
||||
|
||||
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
|
||||
static int System_Action_bool(IntPtr L)
|
||||
{
|
||||
try
|
||||
{
|
||||
int count = LuaDLL.lua_gettop(L);
|
||||
LuaFunction func = ToLua.CheckLuaFunction(L, 1);
|
||||
|
||||
if (count == 1)
|
||||
{
|
||||
Delegate arg1 = DelegateTraits<System.Action<bool>>.Create(func);
|
||||
ToLua.Push(L, arg1);
|
||||
}
|
||||
else
|
||||
{
|
||||
LuaTable self = ToLua.CheckLuaTable(L, 2);
|
||||
Delegate arg1 = DelegateTraits<System.Action<bool>>.Create(func, self);
|
||||
ToLua.Push(L, arg1);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
catch(Exception e)
|
||||
{
|
||||
return LuaDLL.toluaL_exception(L, e);
|
||||
}
|
||||
}
|
||||
|
||||
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
|
||||
static int System_Func_bool(IntPtr L)
|
||||
{
|
||||
|
|
|
@ -54,6 +54,7 @@ public class UnityEngine_ApplicationWrap
|
|||
L.RegVar("logMessageReceived", get_logMessageReceived, set_logMessageReceived);
|
||||
L.RegVar("logMessageReceivedThreaded", get_logMessageReceivedThreaded, set_logMessageReceivedThreaded);
|
||||
L.RegVar("onBeforeRender", get_onBeforeRender, set_onBeforeRender);
|
||||
L.RegVar("focusChanged", get_focusChanged, set_focusChanged);
|
||||
L.RegVar("wantsToQuit", get_wantsToQuit, set_wantsToQuit);
|
||||
L.RegVar("quitting", get_quitting, set_quitting);
|
||||
L.RegFunction("AdvertisingIdentifierCallback", UnityEngine_Application_AdvertisingIdentifierCallback);
|
||||
|
@ -752,6 +753,13 @@ public class UnityEngine_ApplicationWrap
|
|||
return 1;
|
||||
}
|
||||
|
||||
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
|
||||
static int get_focusChanged(IntPtr L)
|
||||
{
|
||||
ToLua.Push(L, new EventObject(typeof(System.Action<bool>)));
|
||||
return 1;
|
||||
}
|
||||
|
||||
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
|
||||
static int get_wantsToQuit(IntPtr L)
|
||||
{
|
||||
|
@ -951,6 +959,41 @@ public class UnityEngine_ApplicationWrap
|
|||
}
|
||||
}
|
||||
|
||||
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
|
||||
static int set_focusChanged(IntPtr L)
|
||||
{
|
||||
try
|
||||
{
|
||||
EventObject arg0 = null;
|
||||
|
||||
if (LuaDLL.lua_isuserdata(L, 2) != 0)
|
||||
{
|
||||
arg0 = (EventObject)ToLua.ToObject(L, 2);
|
||||
}
|
||||
else
|
||||
{
|
||||
return LuaDLL.luaL_throw(L, "The event 'UnityEngine.Application.focusChanged' can only appear on the left hand side of += or -= when used outside of the type 'UnityEngine.Application'");
|
||||
}
|
||||
|
||||
if (arg0.op == EventOp.Add)
|
||||
{
|
||||
System.Action<bool> ev = (System.Action<bool>)arg0.func;
|
||||
UnityEngine.Application.focusChanged += ev;
|
||||
}
|
||||
else if (arg0.op == EventOp.Sub)
|
||||
{
|
||||
System.Action<bool> ev = (System.Action<bool>)arg0.func;
|
||||
UnityEngine.Application.focusChanged -= ev;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
return LuaDLL.toluaL_exception(L, e);
|
||||
}
|
||||
}
|
||||
|
||||
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
|
||||
static int set_wantsToQuit(IntPtr L)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue