【活动】提交最新配置和Dll
parent
45234ac69d
commit
8b633822c6
|
|
@ -166,13 +166,13 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
firstArrow: {fileID: 0}
|
||||
endArrow: {fileID: 0}
|
||||
dir: 1
|
||||
dir: 0
|
||||
isSort: 0
|
||||
isAutoSetDrag: 0
|
||||
isAutoSetDrag: 1
|
||||
isShowArrow: 0
|
||||
lines: 1
|
||||
squareSpacing: 0
|
||||
cell: {fileID: 0}
|
||||
cell: {fileID: 800170154126115791}
|
||||
Spacing: {x: 0, y: 0}
|
||||
row: 0
|
||||
col: 0
|
||||
|
|
@ -350,7 +350,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
|
|
@ -438,7 +438,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 1.12, y: -132.7}
|
||||
m_SizeDelta: {x: 105, y: 112}
|
||||
m_SizeDelta: {x: 159.01, y: 112}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4423263984059329244
|
||||
CanvasRenderer:
|
||||
|
|
@ -958,7 +958,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
|
|
@ -986,7 +986,7 @@ GameObject:
|
|||
- component: {fileID: 4449991386833319224}
|
||||
- component: {fileID: 304690288048585159}
|
||||
m_Layer: 5
|
||||
m_Name: ImageClaim (1)
|
||||
m_Name: ImageClaimed
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -1033,7 +1033,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
|
|
@ -1281,7 +1281,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 1.12, y: -132.7}
|
||||
m_SizeDelta: {x: 105, y: 112}
|
||||
m_SizeDelta: {x: 159.01, y: 112}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5179621317892385675
|
||||
CanvasRenderer:
|
||||
|
|
@ -1468,7 +1468,7 @@ GameObject:
|
|||
- component: {fileID: 3608880495040569225}
|
||||
- component: {fileID: 4801701596418998107}
|
||||
m_Layer: 5
|
||||
m_Name: ImageClaim (1)
|
||||
m_Name: ImageClaimed
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -1515,7 +1515,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
|
|
@ -1546,7 +1546,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2702631760732509106
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1563,10 +1563,10 @@ RectTransform:
|
|||
- {fileID: 7398358348321211759}
|
||||
- {fileID: 4561008189087437380}
|
||||
- {fileID: 8358704397485154120}
|
||||
- {fileID: 8012617369541906865}
|
||||
- {fileID: 7582768358038877024}
|
||||
- {fileID: 4701640429676948944}
|
||||
- {fileID: 3868733730518094341}
|
||||
- {fileID: 8012617369541906865}
|
||||
m_Father: {fileID: 3862841458804321550}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
|
|
@ -2041,7 +2041,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1763992691693448859
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2193,7 +2193,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -362.12, y: 277.4}
|
||||
m_AnchoredPosition: {x: -481.41, y: 277.4}
|
||||
m_SizeDelta: {x: 484.38, y: 28.26}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3555683924345459372
|
||||
|
|
|
|||
|
|
@ -21,10 +21,10 @@ public sealed partial class DataActivitySevenDaySign : Luban.BeanBase
|
|||
{
|
||||
cacheJsonNode = _buf;
|
||||
{ if(!_buf["Id"].IsNumber) { throw new SerializationException(); } Id = _buf["Id"]; }
|
||||
{ var __json0 = _buf["Rewards"]; if(!__json0.IsArray) { throw new SerializationException(); } Rewards = new System.Collections.Generic.List<item.ItemCounts>(__json0.Count); foreach(JSONNode __e0 in __json0.Children) { item.ItemCounts __v0; { if(!__e0.IsObject) { throw new SerializationException(); } __v0 = global::cfg.item.ItemCounts.DeserializeItemCounts(__e0); } Rewards.Add(__v0); } }
|
||||
{ var __json0 = _buf["Rewards"]; if(!__json0.IsArray) { throw new SerializationException(); } Rewards = new System.Collections.Generic.List<int>(__json0.Count); foreach(JSONNode __e0 in __json0.Children) { int __v0; { if(!__e0.IsNumber) { throw new SerializationException(); } __v0 = __e0; } Rewards.Add(__v0); } }
|
||||
}
|
||||
|
||||
public DataActivitySevenDaySign(int Id, System.Collections.Generic.List<item.ItemCounts> Rewards )
|
||||
public DataActivitySevenDaySign(int Id, System.Collections.Generic.List<int> Rewards )
|
||||
{
|
||||
this.Id = Id;
|
||||
this.Rewards = Rewards;
|
||||
|
|
@ -43,14 +43,13 @@ public sealed partial class DataActivitySevenDaySign : Luban.BeanBase
|
|||
/// <summary>
|
||||
/// 签到奖励
|
||||
/// </summary>
|
||||
public System.Collections.Generic.List<item.ItemCounts> Rewards { get; private set; }
|
||||
public System.Collections.Generic.List<int> Rewards { get; private set; }
|
||||
|
||||
public const int __ID__ = 127236356;
|
||||
public override int GetTypeId() => __ID__;
|
||||
|
||||
public void ResolveRef(Tables tables)
|
||||
{
|
||||
foreach (var _e in Rewards) { _e?.ResolveRef(tables); }
|
||||
}
|
||||
|
||||
public override string ToString()
|
||||
|
|
|
|||
|
|
@ -46006,6 +46006,19 @@
|
|||
"OutCalculate": [],
|
||||
"CalculateType": 0
|
||||
},
|
||||
{
|
||||
"Key": "uiInterface_ShowPoster",
|
||||
"Name": "uiInterface_ShowPoster",
|
||||
"value": "显示立绘",
|
||||
"Desc": "显示立绘",
|
||||
"Notes": "",
|
||||
"Param0": "",
|
||||
"Param1": "",
|
||||
"Param2": "",
|
||||
"InnerCalculate": false,
|
||||
"OutCalculate": [],
|
||||
"CalculateType": 0
|
||||
},
|
||||
{
|
||||
"Key": "uiInterface_HidePoster",
|
||||
"Name": "uiInterface_HidePoster",
|
||||
|
|
@ -62712,8 +62725,8 @@
|
|||
"CalculateType": 0
|
||||
},
|
||||
{
|
||||
"Key": "activity_reward_tommorow",
|
||||
"Name": "activity_reward_tommorow",
|
||||
"Key": "activity_reward_tomorrow",
|
||||
"Name": "activity_reward_tomorrow",
|
||||
"value": "明日可领",
|
||||
"Desc": "",
|
||||
"Notes": "",
|
||||
|
|
|
|||
|
|
@ -2,67 +2,25 @@
|
|||
{
|
||||
"Id": 1001,
|
||||
"Rewards": [
|
||||
{
|
||||
"Id": 1,
|
||||
"Count": 100
|
||||
},
|
||||
{
|
||||
"Id": 4,
|
||||
"Count": 50
|
||||
},
|
||||
{
|
||||
"Id": 1,
|
||||
"Count": 200
|
||||
},
|
||||
{
|
||||
"Id": 4,
|
||||
"Count": 100
|
||||
},
|
||||
{
|
||||
"Id": 1,
|
||||
"Count": 300
|
||||
},
|
||||
{
|
||||
"Id": 4,
|
||||
"Count": 200
|
||||
},
|
||||
{
|
||||
"Id": 2,
|
||||
"Count": 100
|
||||
}
|
||||
940011,
|
||||
940012,
|
||||
940013,
|
||||
940014,
|
||||
940015,
|
||||
940016,
|
||||
940017
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 2001,
|
||||
"Rewards": [
|
||||
{
|
||||
"Id": 1,
|
||||
"Count": 100
|
||||
},
|
||||
{
|
||||
"Id": 4,
|
||||
"Count": 50
|
||||
},
|
||||
{
|
||||
"Id": 1,
|
||||
"Count": 200
|
||||
},
|
||||
{
|
||||
"Id": 4,
|
||||
"Count": 100
|
||||
},
|
||||
{
|
||||
"Id": 1,
|
||||
"Count": 300
|
||||
},
|
||||
{
|
||||
"Id": 4,
|
||||
"Count": 200
|
||||
},
|
||||
{
|
||||
"Id": 2,
|
||||
"Count": 100
|
||||
}
|
||||
940011,
|
||||
940012,
|
||||
940013,
|
||||
940014,
|
||||
940015,
|
||||
940016,
|
||||
940017
|
||||
]
|
||||
}
|
||||
]
|
||||
|
|
@ -3370,6 +3370,104 @@
|
|||
"Id": 940001,
|
||||
"RewardType": 0,
|
||||
"ItemID": 1003,
|
||||
"MinCount": 20,
|
||||
"MaxCount": 20
|
||||
},
|
||||
{
|
||||
"Id": 940011,
|
||||
"RewardType": 0,
|
||||
"ItemID": 1,
|
||||
"MinCount": 1000,
|
||||
"MaxCount": 1000
|
||||
},
|
||||
{
|
||||
"Id": 940011,
|
||||
"RewardType": 0,
|
||||
"ItemID": 2,
|
||||
"MinCount": 10,
|
||||
"MaxCount": 10
|
||||
},
|
||||
{
|
||||
"Id": 940012,
|
||||
"RewardType": 0,
|
||||
"ItemID": 1110001,
|
||||
"MinCount": 1,
|
||||
"MaxCount": 1
|
||||
},
|
||||
{
|
||||
"Id": 940012,
|
||||
"RewardType": 0,
|
||||
"ItemID": 2,
|
||||
"MinCount": 10,
|
||||
"MaxCount": 10
|
||||
},
|
||||
{
|
||||
"Id": 940013,
|
||||
"RewardType": 0,
|
||||
"ItemID": 1,
|
||||
"MinCount": 1000,
|
||||
"MaxCount": 1000
|
||||
},
|
||||
{
|
||||
"Id": 940013,
|
||||
"RewardType": 0,
|
||||
"ItemID": 2,
|
||||
"MinCount": 10,
|
||||
"MaxCount": 10
|
||||
},
|
||||
{
|
||||
"Id": 940014,
|
||||
"RewardType": 0,
|
||||
"ItemID": 1,
|
||||
"MinCount": 1000,
|
||||
"MaxCount": 1000
|
||||
},
|
||||
{
|
||||
"Id": 940014,
|
||||
"RewardType": 0,
|
||||
"ItemID": 2,
|
||||
"MinCount": 10,
|
||||
"MaxCount": 10
|
||||
},
|
||||
{
|
||||
"Id": 940015,
|
||||
"RewardType": 0,
|
||||
"ItemID": 1110001,
|
||||
"MinCount": 1,
|
||||
"MaxCount": 1
|
||||
},
|
||||
{
|
||||
"Id": 940015,
|
||||
"RewardType": 0,
|
||||
"ItemID": 2,
|
||||
"MinCount": 10,
|
||||
"MaxCount": 10
|
||||
},
|
||||
{
|
||||
"Id": 940016,
|
||||
"RewardType": 0,
|
||||
"ItemID": 1,
|
||||
"MinCount": 1000,
|
||||
"MaxCount": 1000
|
||||
},
|
||||
{
|
||||
"Id": 940016,
|
||||
"RewardType": 0,
|
||||
"ItemID": 2,
|
||||
"MinCount": 10,
|
||||
"MaxCount": 10
|
||||
},
|
||||
{
|
||||
"Id": 940017,
|
||||
"RewardType": 0,
|
||||
"ItemID": 1110001,
|
||||
"MinCount": 1,
|
||||
"MaxCount": 1
|
||||
},
|
||||
{
|
||||
"Id": 940017,
|
||||
"RewardType": 0,
|
||||
"ItemID": 2,
|
||||
"MinCount": 10,
|
||||
"MaxCount": 10
|
||||
}
|
||||
|
|
|
|||
|
|
@ -321,6 +321,36 @@
|
|||
],
|
||||
"RangeEnd": []
|
||||
},
|
||||
{
|
||||
"MotionName": "死亡姿势01",
|
||||
"MotionFullPath": "ani_s_deadpose01_a001",
|
||||
"RangeStart": [
|
||||
0,
|
||||
1
|
||||
],
|
||||
"RangeLoop": [],
|
||||
"RangeEnd": []
|
||||
},
|
||||
{
|
||||
"MotionName": "死亡姿势02",
|
||||
"MotionFullPath": "ani_s_deadpose02_a001",
|
||||
"RangeStart": [
|
||||
0,
|
||||
1
|
||||
],
|
||||
"RangeLoop": [],
|
||||
"RangeEnd": []
|
||||
},
|
||||
{
|
||||
"MotionName": "死亡姿势03",
|
||||
"MotionFullPath": "ani_s_deadpose03_a001",
|
||||
"RangeStart": [
|
||||
0,
|
||||
1
|
||||
],
|
||||
"RangeLoop": [],
|
||||
"RangeEnd": []
|
||||
},
|
||||
{
|
||||
"MotionName": "沮丧-低头扶额",
|
||||
"MotionFullPath": "ani_s_depressed01_a001",
|
||||
|
|
|
|||
|
|
@ -46006,6 +46006,19 @@
|
|||
"OutCalculate": [],
|
||||
"CalculateType": 0
|
||||
},
|
||||
{
|
||||
"Key": "uiInterface_ShowPoster",
|
||||
"Name": "uiInterface_ShowPoster",
|
||||
"value": "显示立绘",
|
||||
"Desc": "显示立绘",
|
||||
"Notes": "",
|
||||
"Param0": "",
|
||||
"Param1": "",
|
||||
"Param2": "",
|
||||
"InnerCalculate": false,
|
||||
"OutCalculate": [],
|
||||
"CalculateType": 0
|
||||
},
|
||||
{
|
||||
"Key": "uiInterface_HidePoster",
|
||||
"Name": "uiInterface_HidePoster",
|
||||
|
|
@ -62712,8 +62725,8 @@
|
|||
"CalculateType": 0
|
||||
},
|
||||
{
|
||||
"Key": "activity_reward_tommorow",
|
||||
"Name": "activity_reward_tommorow",
|
||||
"Key": "activity_reward_tomorrow",
|
||||
"Name": "activity_reward_tomorrow",
|
||||
"value": "明日可领",
|
||||
"Desc": "",
|
||||
"Notes": "",
|
||||
|
|
|
|||
|
|
@ -1,32 +1,32 @@
|
|||
[
|
||||
{
|
||||
"index": 1,
|
||||
"BannerImgPath": "Assets/Art_Out/UI/Texture/I18N/UI_Pic_MainPannel/BannerPic_MainPannel/UI_Banner_0000.png",
|
||||
"BannerImgPath": "Assets/Art_Out/UI/Texture/I18N/CN/BannerPic_Notice/UI_Banner_0000.png",
|
||||
"type": 1,
|
||||
"NoticeImgPath": "Assets/Art_Out/UI/Texture/I18N/UI_Pic_MainPannel/BannerPic_Notice/UI_0000.png"
|
||||
"NoticeImgPath": "Assets/Art_Out/UI/Texture/I18N/CN/BannerPic_MainPannel/UI_0000.png"
|
||||
},
|
||||
{
|
||||
"index": 2,
|
||||
"BannerImgPath": "Assets/Art_Out/UI/Texture/I18N/UI_Pic_MainPannel/BannerPic_MainPannel/UI_Banner_CardPoolJump.png",
|
||||
"BannerImgPath": "Assets/Art_Out/UI/Texture/I18N/CN/BannerPic_Notice/UI_Banner_CardPoolJump.png",
|
||||
"type": 1,
|
||||
"NoticeImgPath": "Assets/Art_Out/UI/Texture/I18N/UI_Pic_MainPannel/BannerPic_Notice/UI_CardPoolJump.png"
|
||||
"NoticeImgPath": "Assets/Art_Out/UI/Texture/I18N/CN/BannerPic_MainPannel/UI_CardPoolJump.png"
|
||||
},
|
||||
{
|
||||
"index": 3,
|
||||
"BannerImgPath": "Assets/Art_Out/UI/Texture/I18N/UI_Pic_MainPannel/BannerPic_MainPannel/UI_Banner_ApologyNotice.png",
|
||||
"BannerImgPath": "Assets/Art_Out/UI/Texture/I18N/CN/BannerPic_Notice/UI_Banner_ApologyNotice.png",
|
||||
"type": 1,
|
||||
"NoticeImgPath": "Assets/Art_Out/UI/Texture/I18N/UI_Pic_MainPannel/BannerPic_Notice/UI_ApologyNotice.png"
|
||||
"NoticeImgPath": "Assets/Art_Out/UI/Texture/I18N/CN/BannerPic_MainPannel/UI_ApologyNotice.png"
|
||||
},
|
||||
{
|
||||
"index": 4,
|
||||
"BannerImgPath": "Assets/Art_Out/UI/Texture/I18N/UI_Pic_MainPannel/BannerPic_MainPannel/UI_Banner_UpdateNotice.png",
|
||||
"BannerImgPath": "Assets/Art_Out/UI/Texture/I18N/CN/BannerPic_Notice/UI_Banner_UpdateNotice.png",
|
||||
"type": 1,
|
||||
"NoticeImgPath": "Assets/Art_Out/UI/Texture/I18N/UI_Pic_MainPannel/BannerPic_Notice/UI_UpdateNotice.png"
|
||||
"NoticeImgPath": "Assets/Art_Out/UI/Texture/I18N/CN/BannerPic_MainPannel/UI_UpdateNotice.png"
|
||||
},
|
||||
{
|
||||
"index": 5,
|
||||
"BannerImgPath": "Assets/Art_Out/UI/Texture/I18N/UI_Pic_MainPannel/BannerPic_MainPannel/UI_Banner_RepairNotice.png",
|
||||
"BannerImgPath": "Assets/Art_Out/UI/Texture/I18N/CN/BannerPic_Noticel/UI_Banner_RepairNotice.png",
|
||||
"type": 1,
|
||||
"NoticeImgPath": "Assets/Art_Out/UI/Texture/I18N/UI_Pic_MainPannel/BannerPic_Notice/UI_RepairNotice.png"
|
||||
"NoticeImgPath": "Assets/Art_Out/UI/Texture/I18N/CN/BannerPic_MainPannel/UI_RepairNotice.png"
|
||||
}
|
||||
]
|
||||
Loading…
Reference in New Issue