ZhangBiao
|
4cc35be589
|
【牛气冲天】界面按钮调整
|
2021-06-02 20:11:37 +08:00 |
gaoxin
|
cf189bbbb6
|
【每日充值】文字替换
|
2021-06-02 19:45:24 +08:00 |
gaoxin
|
3f605a818b
|
【资源】修改白金框资源
|
2021-06-02 17:30:39 +08:00 |
wangzhenxing
|
aa3171aef7
|
[抽卡祈愿]======活动报错修改
|
2021-06-01 14:41:28 +08:00 |
gaoxin
|
081ff4c0d8
|
【资源】修行和困难副本预告图标上传
|
2021-05-31 19:20:37 +08:00 |
gaoxin
|
8b35b8ccf7
|
【踏碎凌霄】称号icon上传
|
2021-05-31 17:32:18 +08:00 |
jiaoyangna
|
37b818abb5
|
图片提交
|
2021-05-29 21:06:11 +08:00 |
ZhangBiao
|
5aeb2f0ed3
|
【修行】名字左侧印记提交
|
2021-05-29 18:06:15 +08:00 |
gaoxin
|
b20c824b8a
|
【资源】新增碎片框资源
|
2021-05-29 16:26:12 +08:00 |
jiaoyangna
|
d3098d3b3b
|
百寶
|
2021-05-29 15:06:31 +08:00 |
jiaoyangna
|
fb8db45fda
|
百宝商会修改提交
|
2021-05-28 18:53:54 +08:00 |
gaoxin
|
05c3f30a7f
|
【资源】主界面活动按钮优化
|
2021-05-28 15:53:40 +08:00 |
ZhangBiao
|
4af21bc33d
|
【幸运探宝】进度条奖励包装显示修改
|
2021-05-28 15:11:57 +08:00 |
wangzhenxing
|
347341ca02
|
[福利]红包修改提交
|
2021-05-28 12:36:39 +08:00 |
wangzhenxing
|
560089c1f5
|
[限时祈愿活动] 预设 协议提交
|
2021-05-28 10:58:20 +08:00 |
wangzhenxing
|
675ef2efd7
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
Conflicts:
Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
|
2021-05-28 10:47:07 +08:00 |
wangzhenxing
|
21574bebf1
|
【限时祈愿】==祈愿活动提交
|
2021-05-28 10:36:55 +08:00 |
jiaoyangna
|
1e247043ac
|
Merge branch '0优化/无尽副本' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-05-27 19:42:22 +08:00 |
ZhangBiao
|
0c78275a6e
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-27 14:09:51 +08:00 |
ZhangBiao
|
e615af9011
|
【福星高照】bug修改
|
2021-05-27 14:09:39 +08:00 |
zhangqiang
|
0bcd6ade1f
|
【山河社稷图】bug + 资源 前端得刷资源
|
2021-05-27 14:06:20 +08:00 |
ZhangBiao
|
7ddf0dd07f
|
【福星高照】按钮提交
|
2021-05-27 10:03:57 +08:00 |
gaoxin
|
653d9bbd06
|
【meta】
|
2021-05-26 13:43:11 +08:00 |
jiaoyangna
|
5fb2aa23ce
|
无尽副本修改提交
|
2021-05-25 16:20:56 +08:00 |
jiaoyangna
|
33834cc9b2
|
Merge branch 'china/dev-c' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Atlas/FourElement.meta
# Assets/ManagedResources/Atlas/FourElement/ArtFont/s_silingshilian_yitongguan_zh.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_daodi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_di.jpg.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_fodi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_rendi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_renjieshiliandi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shilianjianglidi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shoudi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_yaodi.png.meta
# Assets/ManagedResources/LuaBytes.meta
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua.meta
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua.meta
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralRewardPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
# Assets/ManagedResources/~Lua/View/ScrollCycleView.lua
|
2021-05-24 16:39:34 +08:00 |
ZhangBiao
|
daf5a675f8
|
【修行】预览界面资源添加
|
2021-05-22 18:52:49 +08:00 |
jiaoyangna
|
f3e48f1d38
|
牛气冲天按钮提交
|
2021-05-22 17:10:16 +08:00 |
wangzhenxing
|
1478142476
|
称号资源替换提交
|
2021-05-22 15:02:09 +08:00 |
wangzhenxing
|
ead8668479
|
福利红包修改提交
|
2021-05-21 17:32:52 +08:00 |
zhangqiang
|
016667ef7e
|
【战斗背景音乐】 山河社稷图入口文字
|
2021-05-21 16:38:20 +08:00 |
zhangqiang
|
d2a53631d6
|
【山河社稷图】提交
|
2021-05-21 16:21:07 +08:00 |
wangzhenxing
|
db3b58ea8e
|
合并冲突提交
|
2021-05-21 15:05:09 +08:00 |
wangzhenxing
|
6ab70e6e8d
|
【功能】==========公会红包
|
2021-05-21 14:47:04 +08:00 |
zhangqiang
|
1ed6cbaad0
|
【山河社稷图】替换新资源
|
2021-05-21 14:37:09 +08:00 |
gaoxin
|
006eae4bd9
|
【死灵试炼】资源及相关代码导入,但代码未使用
|
2021-05-21 13:45:10 +08:00 |
ZhangBiao
|
7f19809419
|
【修行】提交
|
2021-05-20 20:12:01 +08:00 |
ZhangBiao
|
b1e7cd1164
|
【修行】提交
|
2021-05-20 17:37:56 +08:00 |
ZhangBiao
|
5ea5e5b689
|
【修行】紫府神印界面添加资源
|
2021-05-20 10:55:33 +08:00 |
ZhangBiao
|
098ab986e4
|
【修行】meta提交
|
2021-05-19 20:43:16 +08:00 |
ZhangBiao
|
be1085d2bb
|
Merge branch 'china/dev-c' into 0功能/修行玩法
# Conflicts:
# Assets/ManagedResources/Atlas/ActivityAltas/r_huodong_tiao02.png.meta
# Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua
|
2021-05-19 20:01:57 +08:00 |
ZhangBiao
|
00cdcffd23
|
【修行】图片meta提交
|
2021-05-19 19:55:02 +08:00 |
gaoxin
|
ab4baa0420
|
【meta】
|
2021-05-19 19:46:52 +08:00 |
gaoxin
|
30372368f6
|
【资源】特惠商城资源格式修改
|
2021-05-19 17:11:37 +08:00 |
gaoxin
|
989361e574
|
Merge branch 'china/ios' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua
|
2021-05-19 15:15:13 +08:00 |
ZhangBiao
|
d2e6f593be
|
【修行】小点提交
|
2021-05-19 14:46:51 +08:00 |
gaoxin
|
73f476a4e8
|
【资源】重复资源删除
|
2021-05-19 14:26:37 +08:00 |
gaoxin
|
1b873eb38d
|
Merge branch 'china/dev-c' into china/ios
# Conflicts:
# Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_zida_en.png.meta
# Assets/ManagedResources/ArtFont_en/n_niuqichongchong_banner_en.png.meta
# Assets/ManagedResources/ArtFont_en/n_niuqichongchong_niuqizhi_en.png.meta
# Assets/ManagedResources/ArtFont_en/q_qinlongmibao_banner1_en.png.meta
# Assets/ManagedResources/ArtFont_en/r_fabao_guiyuan_en.png.meta
# Assets/ManagedResources/ArtFont_en/sl_en.png.meta
# Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_1_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_2_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_3_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_4_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_6_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_7_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_8_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_9_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_banner_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_niuqizhi_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/q_qinlongmibao_banner1_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/r_fabao_guiyuan_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/sl_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_2_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/w_wj_banner_vi.png.meta
# Assets/ManagedResources/Atlas/BattleAtlas/r_zhandou_leiquehei_01.png.meta
# Assets/ManagedResources/Atlas/DyAct_Activity7/timelimit_putishushen2.png.meta
# Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/QiKaiDeSheng/q_qikaidesheng_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangLongFuHu/x_xianglongfuhu_shenjiang3.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YiShanDaoHai/y_yishandaohai_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_100_zh.png.meta
# Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-congzhi_zh.png.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2.png.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2_gouxuan.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_01_zh.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_zh.png.meta
# Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/sl_zh.png.meta
# Assets/ManagedResources/BG/t_tapolingxiao_beijingtu.png.meta
# Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/p_pozhengzhuxian_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/q_qikaidesheng_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/s_yongwangzhiqian_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/y_yishandaohai_banner_zh.png
# Assets/ManagedResources/EffectResUI/Story/Texture/UI_fuzhou_02.png.meta
# Assets/ManagedResources/EffectResUI/Story/Texture/dianjijiekai.png.meta
# Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
# Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
# Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua
# Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
# Assets/ManagedResources/~Lua/View/PlayerInfoView.lua
|
2021-05-19 14:12:37 +08:00 |
ZhangBiao
|
916f5af5c8
|
【修行】资源调整
|
2021-05-19 10:23:39 +08:00 |
ZhangBiao
|
9b1c6ac930
|
【修行】资源提交
|
2021-05-18 21:00:38 +08:00 |
jiaoyangna
|
83697a9de4
|
Merge branch 'china/dev' into china/dev-c
|
2021-05-18 20:53:23 +08:00 |
jiaoyangna
|
b6b5599812
|
“稀有”角标美术资源替换
|
2021-05-18 20:36:43 +08:00 |
jiaoyangna
|
ea50404431
|
福星高照图片提交
(cherry picked from commit 11f9f993bd)
|
2021-05-18 20:22:58 +08:00 |
zhangqiang
|
f7ee7f5642
|
【跳过战斗优化】主线战斗中的BOSS关卡,改为不允许跳过 3
|
2021-05-18 18:18:45 +08:00 |
zhangqiang
|
a40ec43b81
|
【山河社稷图】章节开启界面修改
|
2021-05-18 16:54:35 +08:00 |
wangzhenxing
|
d19c7e1baf
|
图片提交
|
2021-05-18 15:02:15 +08:00 |
wangzhenxing
|
9ebc0f8401
|
公告修改提交
|
2021-05-18 15:01:59 +08:00 |
jiaoyangna
|
85f0581895
|
元字,展示了两种艺术字
|
2021-05-18 14:13:54 +08:00 |
ZhangBiao
|
6385b78048
|
【meta提交】
|
2021-05-17 11:59:01 +08:00 |
zhangqiang
|
e763e54799
|
Merge branch 'china/dev-c' into china_fightLevel
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-05-17 11:04:01 +08:00 |
ZhangBiao
|
8003c43f71
|
Merge branch 'china/dev-c' into 0功能/修行玩法
|
2021-05-17 10:32:30 +08:00 |
ZhangBiao
|
5fe75af0bf
|
Merge branch 'china/dev' into 0功能/修行玩法
|
2021-05-17 10:15:42 +08:00 |
gaoxin
|
02649f00ca
|
Merge branch 'china/dev' into china/dev-c
|
2021-05-15 17:40:21 +08:00 |
gaoxin
|
c3c485b209
|
【资源】云游商人资源修改
|
2021-05-15 17:36:47 +08:00 |
jiaoyangna
|
9662b5f236
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/ManagedResources/ArtFont_vi/x_xianshishangshi_banner_png_vi.png.meta
# Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_1801_zh.png.meta
# Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_18_zh.png.meta
# Assets/ManagedResources/Atlas/DyAct_Activity3/shenjiang33_change.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
# Assets/ManagedResources/Atlas/TagAtlas/ArtFont/r_shangdian_xingchen_zh.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_03_zh.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_04_zh.png.meta
# Assets/ManagedResources/DynamicAtlas/ArtFont/c_czlb_banner_solgan_zh.png.meta
# Assets/ManagedResources/Icon/Item/r_Material_scfx_0001.png.meta
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page3.prefab
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
# Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua
|
2021-05-15 16:37:00 +08:00 |
jiaoyangna
|
58b2beb015
|
文字曲线提交
|
2021-05-15 15:39:53 +08:00 |
jiaoyangna
|
b54c907427
|
商店名称提交
|
2021-05-15 14:33:49 +08:00 |
ZhangBiao
|
410262cee8
|
Merge branch 'china/dev' into 0功能/修行玩法
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
|
2021-05-14 13:27:01 +08:00 |
jiaoyangna
|
c855739dd6
|
嫦娥修改提交
|
2021-05-14 10:08:04 +08:00 |
jiaoyangna
|
acffbdc9e1
|
跳过按钮修改
|
2021-05-13 21:15:24 +08:00 |
zhangqiang
|
e4eda3017e
|
【山河社稷图】提交
|
2021-05-13 20:30:10 +08:00 |
jiaoyangna
|
2ed525a64d
|
限时兑换预设修改
|
2021-05-13 20:06:07 +08:00 |
jiaoyangna
|
401e90dd85
|
嫦娥修改提交
(cherry picked from commit 644d9d7d10)
|
2021-05-13 19:27:26 +08:00 |
jiaoyangna
|
644d9d7d10
|
嫦娥修改提交
|
2021-05-13 19:26:23 +08:00 |
jiaoyangna
|
3c04e8dbe1
|
[主题活动修改提交]
(cherry picked from commit f88ccd8f68)
|
2021-05-12 17:37:59 +08:00 |
zhangqiang
|
effe90990f
|
【山河社稷图】提交
|
2021-05-11 15:12:37 +08:00 |
ZhangBiao
|
7104d77d7e
|
【修行】开坑
|
2021-05-11 15:09:25 +08:00 |
jiaoyangna
|
f88ccd8f68
|
[主题活动修改提交]
|
2021-05-10 10:06:53 +08:00 |
ZhangBiao
|
40bc700f65
|
【累充】周刷新的累充,页签会显示每日累充
|
2021-05-08 12:01:18 +08:00 |
zhangqiang
|
1db33218d8
|
【山河社稷图】首提
|
2021-05-07 14:44:50 +08:00 |
jiaoyangna
|
6fc61a91e4
|
图片修改提交
|
2021-04-30 15:30:01 +08:00 |
gaoxin
|
871e4c4257
|
【资源】修复特惠商城资源变形
|
2021-04-29 16:19:15 +08:00 |
ZhangBiao
|
ecccb455a2
|
Merge branch 'china/dev' into china/dev-c
|
2021-04-29 14:35:28 +08:00 |
wangzhenxing
|
e88f4d83d7
|
主城左滑箭头添加呼吸动画
|
2021-04-29 14:07:14 +08:00 |
gaoxin
|
406b7923a6
|
【资源】充值按钮资源替换
|
2021-04-29 10:54:22 +08:00 |
gaoxin
|
af3bb06c32
|
【资源】首充,至尊降世文字资源替换
|
2021-04-28 16:05:20 +08:00 |
gaoxin
|
e0b212c61d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-27 23:42:25 +08:00 |
gaoxin
|
4ea075e0e5
|
【资源】玉帝资源名修改
|
2021-04-27 23:42:13 +08:00 |
ZhangBiao
|
ba024be162
|
【踏碎凌霄】已未达成提交
|
2021-04-27 23:37:11 +08:00 |
ZhangBiao
|
dc03b46855
|
【踏碎凌霄】活动界面提交
|
2021-04-27 22:26:36 +08:00 |
wangzhenxing
|
d2a7fdcee1
|
天尊降世活动资源提交
|
2021-04-27 22:16:42 +08:00 |
ZhangBiao
|
dfb0a68f2c
|
【踏碎凌霄】资源提交
|
2021-04-27 21:45:04 +08:00 |
ZhangBiao
|
8e72485e7b
|
【累计充值】资源替换
|
2021-04-27 21:17:42 +08:00 |
jiaoyangna
|
c3ee907f50
|
Merge branch '剧情' into china/dev
|
2021-04-27 14:12:11 +08:00 |
jiaoyangna
|
1537410e05
|
剧情提交
|
2021-04-27 14:06:04 +08:00 |
gaoxin
|
357a27c100
|
Merge remote-tracking branch 'origin/剧情' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/Story/wukongJuqing.jpg.meta
# Assets/ManagedResources/Atlas/Story/wzs.jpg.meta
# Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png.meta
# Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_wenhao.png.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-04-26 19:03:05 +08:00 |
wangzhenxing
|
bbbf5598d6
|
立绘图片资源替换
|
2021-04-26 11:11:46 +08:00 |
jiaoyangna
|
15ef116032
|
剧情提交
|
2021-04-26 09:41:41 +08:00 |
gaoxin
|
4ebd3d79f6
|
【限时神装】文字资源提花
|
2021-04-25 17:41:48 +08:00 |
wangzhenxing
|
278282f73e
|
[图片]==============替换立绘图片资源
|
2021-04-23 17:45:39 +08:00 |
wangzhenxing
|
1b92e5fed4
|
删除重复得问号 加号图片
|
2021-04-23 11:20:17 +08:00 |
jiaoyangna
|
20f6a06162
|
重复资源删除
|
2021-04-22 17:41:46 +08:00 |
jiaoyangna
|
5cd260fea5
|
资源提交
|
2021-04-22 15:26:00 +08:00 |
ZhangBiao
|
8117c5ebba
|
【云游商人】怎加红点
|
2021-04-22 10:59:32 +08:00 |
gaoxin
|
3819869e27
|
Merge branch 'china/dev' into china/ios
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleSkinPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleSkinPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleStoryLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
|
2021-04-21 17:54:16 +08:00 |
ZhangBiao
|
eab420381c
|
Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-04-21 15:02:04 +08:00 |
JLIOSM1
|
cab9724de6
|
【ios】资源位置修改
|
2021-04-20 13:57:33 +08:00 |
ZhangBiao
|
37003eea1b
|
【限时神装】更换背景图
|
2021-04-19 20:28:06 +08:00 |
ZhangBiao
|
24a8cbe9b0
|
Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-04-19 20:12:51 +08:00 |
jiaoyangna
|
a277c5e6fa
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-17 17:20:58 +08:00 |
ZhangBiao
|
48720f5dff
|
【新人商城】资源提交
(cherry picked from commit 8922b7eaba)
|
2021-04-17 14:03:35 +08:00 |
zhangqiang
|
1ee7063569
|
【限时招募】 提交
|
2021-04-16 18:13:09 +08:00 |
ZhangBiao
|
6064633a28
|
【云游商人】资源提交
|
2021-04-16 11:12:17 +08:00 |
ZhangBiao
|
c8cd41670b
|
【至尊豪礼】提交
|
2021-04-14 17:20:55 +08:00 |
ZhangBiao
|
c686791e73
|
【至尊豪礼】资源提交
|
2021-04-14 14:48:30 +08:00 |
ZhangBiao
|
8922b7eaba
|
【新人商城】资源提交
|
2021-04-14 12:00:06 +08:00 |
ZhangBiao
|
cce3a957f3
|
meta提交
|
2021-04-14 11:24:41 +08:00 |
ZhangBiao
|
f1864ae6cf
|
Revert "【每日累充】banner和按钮资源替换"
This reverts commit c34a3fcc24.
|
2021-04-13 16:54:48 +08:00 |
ZhangBiao
|
c34a3fcc24
|
【每日累充】banner和按钮资源替换
|
2021-04-13 13:46:09 +08:00 |
gaoxin
|
839a9e4d1d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-12 17:03:11 +08:00 |
wangzhenxing
|
443ba942cf
|
[功能]================称号功能提交
|
2021-04-12 16:23:57 +08:00 |
JieLing
|
9cd895e8e9
|
【资源处理】meta文件提交,文件压缩优化
|
2021-04-12 15:00:57 +08:00 |
jiaoyangna
|
c82b907b54
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 16:20:30 +08:00 |
jiaoyangna
|
acca43f54c
|
菩提树神图片提交
|
2021-04-09 16:20:26 +08:00 |
ZhangBiao
|
ce0a6a55d1
|
Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
|
2021-04-09 15:58:49 +08:00 |
ZhangBiao
|
a2065c13f2
|
【社稷大典】领取贡献等级奖励,界面会重复播放打开时的动画
|
2021-04-09 15:58:20 +08:00 |
gaoxin
|
17c39e0d74
|
【本地化】翻译资源导入
|
2021-04-09 15:25:29 +08:00 |
jiaoyangna
|
9496ef8943
|
meta 文件提交
(cherry picked from commit e0fec1aa3a)
|
2021-04-09 13:42:03 +08:00 |
jiaoyangna
|
e0fec1aa3a
|
meta 文件提交
|
2021-04-09 13:40:54 +08:00 |
jiaoyangna
|
8291a48e73
|
Merge branch 'china_dev_merge' into xma_dev_b_merge
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta
# Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta
# Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta
# Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont.meta
# Assets/ManagedResources/Icon/ChengHao.meta
# Assets/ManagedResources/Icon/ZuoQi.meta
# Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
# Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
# Assets/ManagedResources/~Lua/View/FetterItem.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-04-09 12:24:01 +08:00 |
ZhangBiao
|
8893dd7d7b
|
【活动优化】日周月礼包增加角标及妖晶数量变更
|
2021-04-09 11:05:08 +08:00 |
gaoxin
|
9de990fafd
|
【本地化】资源名修正
|
2021-04-08 18:29:09 +08:00 |
ZhangBiao
|
3833c53f68
|
【十五日登录、福星高照】修改
|
2021-04-08 16:39:02 +08:00 |
zhangqiang
|
e84bdaf457
|
【每日好礼】
|
2021-04-07 21:07:42 +08:00 |
ZhangBiao
|
d423390397
|
【十五日登录】特效+无尽副本编队问题
|
2021-04-07 20:27:56 +08:00 |
zhangqiang
|
894a8bcfd4
|
【问题提交】
|
2021-04-07 19:52:25 +08:00 |
jiaoyangna
|
586d7eca06
|
限时召唤提交
|
2021-04-07 11:24:49 +08:00 |
ZhangBiao
|
c121c077a8
|
meta提交
|
2021-04-07 11:23:03 +08:00 |
jiaoyangna
|
e5699cb8c7
|
天书秘卷 图片提交
|
2021-04-07 11:11:44 +08:00 |
jiaoyangna
|
2a0589b1d8
|
天书秘卷修改提交
|
2021-04-07 10:58:37 +08:00 |
ZhangBiao
|
63bcee6168
|
Merge branch '0活动开发聚集地/十五日登录' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-04-06 15:51:24 +08:00 |
ZhangBiao
|
4c0150b7d9
|
【十五日登陆】导入特效资源
|
2021-04-02 16:04:57 +08:00 |
ZhangBiao
|
d69d96a321
|
【十五日登陆】红点
|
2021-04-02 11:53:07 +08:00 |
gaoxin
|
1a4c96e88d
|
Merge remote-tracking branch 'origin/gx/china/dev_tr' into xma/dev-b
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png.meta
# Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab
# Assets/ManagedResources/~Lua/Common/Language.lua
# Assets/ManagedResources/~Lua/Framework/Framework.lua
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua
# Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
# Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua
# Assets/ManagedResources/~Lua/Modules/Expert/WeekCard.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
# Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua
# Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
# Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerSkin.lua
# Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
# data_execl/Language_data/LanguageLua.csv
# data_execl/Language_data/LanguageText.csv
|
2021-04-02 11:34:27 +08:00 |
ZhangBiao
|
e4122121a4
|
【十五日登陆】资源提交
|
2021-04-02 11:23:07 +08:00 |
jiaoyangna
|
ae17483a8e
|
灵兽 修改提交
|
2021-04-01 14:56:47 +08:00 |
jiaoyangna
|
0c43f05161
|
灵兽秘卷修改
|
2021-03-31 18:00:44 +08:00 |
ZhangBiao
|
86425e1c91
|
【十五日登陆】提交
|
2021-03-31 15:20:02 +08:00 |
ZhangBiao
|
1c2f1d23c0
|
【十五日登陆】开坑
|
2021-03-31 15:02:04 +08:00 |
jiaoyangna
|
43da7e2d51
|
十绝阵提交
|
2021-03-31 14:25:43 +08:00 |
jiaoyangna
|
b7a0cca0fe
|
成长基金修改提交
|
2021-03-30 22:19:54 +08:00 |
ZhangBiao
|
d4b843d972
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 22:03:59 +08:00 |
ZhangBiao
|
4dcdd67648
|
【极速探索优化】更改极速探索界面,突出激活探索特权的按钮
|
2021-03-30 22:01:58 +08:00 |
jiaoyangna
|
0494e55215
|
Merge branch '0活动开发聚集地/活动拆分归类' into china/dev
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
|
2021-03-30 20:41:32 +08:00 |
ZhangBiao
|
d61c55d24d
|
Merge branch 'china/dev' into 0活动开发聚集地/福星高照
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-03-30 18:55:35 +08:00 |
jiaoyangna
|
c2fac79eca
|
活动 提交
|
2021-03-30 18:26:10 +08:00 |
zhangqiang
|
aabe3e082f
|
【归元修改】资源提交
|
2021-03-30 17:31:44 +08:00 |
ZhangBiao
|
289af5b209
|
【活动优化】青龙秘宝界面优化
|
2021-03-30 14:34:25 +08:00 |
jiaoyangna
|
87e724d19d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Common/functions.lua
|
2021-03-30 13:48:08 +08:00 |
jiaoyangna
|
ed1d9a2b1f
|
Merge branch '0功能/天书秘卷' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-03-30 13:46:49 +08:00 |
ZhangBiao
|
a0fb7f5714
|
【天宫寻宝】按钮增加特效
|
2021-03-30 13:43:46 +08:00 |
ZhangBiao
|
32146997e4
|
【寻宝优化】优化天宫寻宝界面
|
2021-03-30 11:25:07 +08:00 |
ZhangBiao
|
8796bf4957
|
【福星高照】提交
|
2021-03-30 10:27:18 +08:00 |
zhangqiang
|
76c9760993
|
Merge branch 'china/dev' into 0功能/称号坐骑皮肤
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab
|
2021-03-29 17:56:19 +08:00 |
ZhangBiao
|
e0d05e175e
|
【福星高照】提交
|
2021-03-29 09:52:53 +08:00 |
zhangqiang
|
095701c33f
|
【称号时装坐骑】初提
|
2021-03-26 20:06:08 +08:00 |
jiaoyangna
|
8aa411244e
|
灵兽秘卷修改提交
|
2021-03-25 16:21:34 +08:00 |
ZhangBiao
|
24fa8c17e2
|
Merge branch '0活动开发聚集地/牛气冲天' into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-03-25 11:13:37 +08:00 |
jiaoyangna
|
f972b1646a
|
主题活动提交
|
2021-03-24 18:16:30 +08:00 |
zhangqiang
|
4939c4da92
|
【称号坐骑时装】部分资源提交
|
2021-03-24 16:31:14 +08:00 |
jiaoyangna
|
e5e8c60c8b
|
主题活动
|
2021-03-24 13:57:08 +08:00 |
jiaoyangna
|
3334257425
|
添加天书秘卷入口
|
2021-03-23 15:37:39 +08:00 |
ZhangBiao
|
16a933e530
|
|
2021-03-19 15:49:00 +08:00 |
ZhangBiao
|
65f994b37b
|
【牛气冲天】提交
|
2021-03-19 15:16:49 +08:00 |
jiaoyangna
|
ec8ff74e61
|
Merge branch 'china/dev' into 0功能/天书秘卷
|
2021-03-19 15:11:37 +08:00 |
jiaoyangna
|
beb93b5ed9
|
天书秘卷
|
2021-03-19 14:37:24 +08:00 |
ZhangBiao
|
04cd0b8599
|
【限时神装】资源名修改
|
2021-03-19 14:37:13 +08:00 |
jiaoyangna
|
0301617829
|
图片添加_zh
|
2021-03-19 14:05:20 +08:00 |
zhangqiang
|
6b153fc680
|
【三张资源替换】
|
2021-03-18 19:30:54 +08:00 |
gaoxin
|
45994e7653
|
【八日登录】资源替换
|
2021-03-18 14:29:46 +08:00 |
jiaoyangna
|
9f1f204588
|
主界面提交
|
2021-03-17 20:43:47 +08:00 |
ZhangBiao
|
4efb36a195
|
【八日登陆】资源修改
|
2021-03-17 14:37:56 +08:00 |
jiaoyangna
|
0cdd115646
|
Merge branch 'china/dev' into 0功能/天书秘卷
|
2021-03-16 18:32:52 +08:00 |
jiaoyangna
|
147d358e11
|
天书密卷
|
2021-03-16 17:37:32 +08:00 |
ZhangBiao
|
4528e23541
|
Merge branch 'china/dev' into 0活动开发聚集地/限时神装
|
2021-03-16 14:49:47 +08:00 |
ZhangBiao
|
5334a7c7da
|
【首领来袭】
|
2021-03-13 12:57:31 +08:00 |
ZhangBiao
|
24ea537bba
|
Merge branch 'master_xma_local' into 0活动开发聚集地/限时神装
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua
|
2021-03-11 15:15:09 +08:00 |
jiaoyangna
|
292069ba5d
|
活动提交
|
2021-03-11 10:59:49 +08:00 |
jiaoyangna
|
4121f24a27
|
Merge branch 'master_xma_local' into 0功能/本周版本优化内容
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
|
2021-03-10 13:50:38 +08:00 |
JieLing
|
abd4028923
|
【meta】打包后meta文件上传
|
2021-03-09 16:04:18 +08:00 |
jiaoyangna
|
5bd35da17c
|
Revert "图片整理提交"
This reverts commit 988b881285.
|
2021-03-09 14:37:14 +08:00 |
jiaoyangna
|
0b5afbc4ea
|
Revert "删除 有_zh的图片的 没有加后缀的 图片"
This reverts commit 72998061d8.
|
2021-03-09 14:36:27 +08:00 |
jiaoyangna
|
64062ba3cf
|
Revert "图片提交"
This reverts commit 6418f1280d.
|
2021-03-09 14:36:20 +08:00 |
jiaoyangna
|
6418f1280d
|
图片提交
|
2021-03-09 14:18:15 +08:00 |
jiaoyangna
|
72998061d8
|
删除 有_zh的图片的 没有加后缀的 图片
|
2021-03-09 14:08:19 +08:00 |
jiaoyangna
|
988b881285
|
图片整理提交
|
2021-03-09 12:44:53 +08:00 |
gaoxin
|
6d7c2c0a25
|
【本地化】图片资源压缩
|
2021-03-08 16:53:16 +08:00 |
jiaoyangna
|
46d1d9bce7
|
本地化提交
|
2021-03-08 16:52:07 +08:00 |
jiaoyangna
|
49c527a9bb
|
装备界面提交
|
2021-03-08 14:20:27 +08:00 |
jiaoyangna
|
4c390cf272
|
预设修改提交
|
2021-03-08 13:51:39 +08:00 |
jiaoyangna
|
cf3c571182
|
Merge branch 'master_xma_local' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
|
2021-03-08 11:14:15 +08:00 |
jiaoyangna
|
02ca65089f
|
Merge branch 'master_xma_local' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Harmony.meta
# Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Logic/GameEvent.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
|
2021-03-08 10:27:14 +08:00 |
ZhangBiao
|
fbe63e5ccf
|
【首领来袭】增加动画
|
2021-02-26 14:07:22 +08:00 |
ZhangBiao
|
a3f8b35225
|
Merge branch '0优化/战斗增加boss详情' into 0功能/本周版本优化内容
|
2021-02-26 11:04:41 +08:00 |
ZhangBiao
|
df3c0638f4
|
【首领来袭】资源提交
|
2021-02-26 09:36:39 +08:00 |
jiaoyangna
|
f3cc8413f2
|
主题活动提交
|
2021-02-25 10:20:14 +08:00 |
jiaoyangna
|
186fd78744
|
Revert "主城修改提交"
This reverts commit 22b85af363.
|
2021-02-23 10:01:11 +08:00 |
jiaoyangna
|
22b85af363
|
主城修改提交
|
2021-02-22 21:17:55 +08:00 |
ZhangBiao
|
0584ed1e2f
|
【商店】元神商店页签提交
|
2021-02-19 16:39:27 +08:00 |
zhangqiang
|
1c95b576f0
|
Merge branch '0功能/鸿蒙门阵' into 0功能/本周版本优化内容
# Conflicts:
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/View/ScrollCycleView.lua
|
2021-02-19 10:54:36 +08:00 |
jiaoyangna
|
0b5b98a77a
|
【活动需求】勇往直前主题活动(社稷大典)
|
2021-02-18 10:52:02 +08:00 |
jiaoyangna
|
8eb3babc04
|
四灵提交
|
2021-02-04 15:12:37 +08:00 |
gaoxin
|
150d00e064
|
【资源】法宝资源添加,meta文件提交
|
2021-01-30 13:23:06 +08:00 |
DESKTOP-98AVA47\Administrator
|
531592ae3d
|
【本地化】
|
2021-01-29 13:55:55 +08:00 |
liujiaqi
|
e1504107e4
|
【资源】新春活动,鞭炮资源
|
2021-01-28 11:38:57 +08:00 |
jiaoyangna
|
ea6e1f242c
|
灵兽界面修改提交
|
2021-03-02 21:06:42 +08:00 |
jiaoyangna
|
bdb47125a6
|
Merge branch 'local_to_dev' into xma/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab
# Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua
# Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua
# Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
# Assets/ManagedResources/~Lua/Modules/Compound/CompoundSelectListPopup.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonActivatePanel.lua
# Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonUpGradePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
# Assets/ManagedResources/~Lua/Modules/Expert/DiffMonsterBuy.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightMopUpEndPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua
# Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua
# Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightBuyExtraPopup.lua
# Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchDataManager.lua
# Assets/ManagedResources/~Lua/Modules/Formation/ElementPopup.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
# Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua
# Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRankPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildMemberInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_RankView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/BuffChoosePanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/BuffOptionPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapOptionPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
# Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
# Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildSkillReset.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonChipCompound.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua
# Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCoinPurchasePart.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopExchangePopup.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/RewardSoulPrintSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPopUpV2.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
# Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyScorePageV2.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorOnePanel.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShowTechnologPanel.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
# Assets/ManagedResources/~Lua/View/JumpView.lua
# Assets/ManagedResources/~Lua/View/ShopView.lua
# FontArt/ArtFont_zh/hongmengzhen_zh.png
# FontArt/ArtFont_zh/jianmushenshu_zh.png
# FontArt/ArtFont_zh/silingshilian_zh.png
|
2021-03-02 16:44:38 +08:00 |
liujiaqi
|
8a00efca60
|
共鸣 英雄界面 提交
|
2021-02-26 17:26:17 +08:00 |
jiaoyangna
|
8753e784ec
|
图片提交
|
2021-02-26 13:44:50 +08:00 |
gaoxin
|
6b128d46ef
|
Merge branch 'xma/dev_temp' into xma/dev
|
2021-02-24 15:08:38 +08:00 |
gaoxin
|
169ad402c7
|
【本地化】修复白片得问题
|
2021-02-23 19:12:16 +08:00 |
jiaoyangna
|
2044d5c903
|
主城提交
|
2021-02-23 09:51:37 +08:00 |
jiaoyangna
|
bb3e1e568c
|
图片提交
|
2021-02-20 19:23:38 +08:00 |
jiaoyangna
|
13af07470c
|
图片提交
|
2021-02-20 19:22:57 +08:00 |
jiaoyangna
|
a05694855c
|
Merge branch 'local_to_xmadev' into xma/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
# Assets/ManagedResources/~Lua/Modules/Compound/CompoundSelectListPopup.lua
# Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonActivatePanel.lua
# Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonUpGradePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
# Assets/ManagedResources/~Lua/Modules/Expert/DiffMonsterBuy.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightMopUpEndPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua
# Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua
# Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightBuyExtraPopup.lua
# Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchDataManager.lua
# Assets/ManagedResources/~Lua/Modules/Formation/ElementPopup.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
# Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/BuffChoosePanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/BuffOptionPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapOptionPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
# Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
# Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildSkillReset.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonChipCompound.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua
# Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCoinPurchasePart.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopExchangePopup.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/RewardSoulPrintSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPopUpV2.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
# Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyScorePageV2.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorOnePanel.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShowTechnologPanel.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua
# Assets/ManagedResources/~Lua/View/JumpView.lua
# Assets/ManagedResources/~Lua/View/ShopView.lua
|
2021-02-20 17:55:52 +08:00 |
gaoxin
|
6a7ea1b8b5
|
【本地化】ui资源本地化导出
|
2021-02-05 16:06:10 +08:00 |
gaoxin
|
90bf24b3b0
|
Merge branch 'master_xma_local' into gx/xma_local
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/ActivityGift/CourtesyDressPanel.prefab
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
# Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Loading/LoadingPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab
# Assets/ManagedResources/Prefabs/UI/SevenDayCarnival/SevenDayCarnivalPanelV2.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
# Assets/ManagedResources/~Lua/Modules/Compound/CompoundSelectListPopup.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonActivatePanel.lua
# Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonUpGradePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
# Assets/ManagedResources/~Lua/Modules/Expert/DiffMonsterBuy.lua
# Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightMopUpEndPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua
# Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua
# Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightBuyExtraPopup.lua
# Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchDataManager.lua
# Assets/ManagedResources/~Lua/Modules/Formation/ElementPopup.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
# Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/BuffChoosePanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/BuffOptionPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapOptionPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
# Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua
# Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
# Assets/ManagedResources/~Lua/Modules/Operating/WeekMonthGiftPackPage.lua
# Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildSkillReset.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonChipCompound.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua
# Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCoinPurchasePart.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopExchangePopup.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/RewardSoulPrintSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPopUpV2.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
# Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyScorePageV2.lua
# Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorOnePanel.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShowTechnologPanel.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua
# Assets/ManagedResources/~Lua/View/JumpView.lua
# Assets/ManagedResources/~Lua/View/ShopView.lua
|
2021-02-05 14:30:05 +08:00 |
gaoxin
|
2a16ca3b03
|
【本地化】资源修正
|
2021-02-04 19:40:17 +08:00 |
gaoxin
|
91a98b6715
|
【本地化】新翻译资源导出,修复限时召唤界面白片
|
2021-02-04 11:22:59 +08:00 |
gaoxin
|
7ea8f43432
|
【本地化】中英文资源整理
|
2021-01-27 15:10:12 +08:00 |
ZhangBiao
|
a6911749d2
|
Merge branch '0活动开发聚集地/牛转乾坤' into 0功能/本周版本优化内容
|
2021-01-27 13:41:56 +08:00 |
gaoxin
|
871196a742
|
【本地化】资源提交
|
2021-01-26 17:56:55 +08:00 |
zhangqiang
|
99883b6a2e
|
【势不可挡】banner资源替换
|
2021-01-26 16:57:14 +08:00 |
jiaoyangna
|
8e0047d5e8
|
Merge branch 'master_xma_local' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
|
2021-01-26 14:48:06 +08:00 |
ZhangBiao
|
78bc7e8ab3
|
Merge branch '0功能/本周版本优化内容' into 0活动开发聚集地/牛转乾坤
|
2021-01-26 13:49:08 +08:00 |
ZhangBiao
|
78f6e3bea3
|
【限时神装】主城界面icon提交
|
2021-01-26 09:38:36 +08:00 |
jiaoyangna
|
14ba84052d
|
【ID1008002】
【活动需求】碧血丹心主题活动(限时兑换-掉落春节道具(鞭炮或者糖葫芦))新增扭转乾坤转盘活动。2月11日~2月17日【ID1008003】
【活动需求】势不可挡主题活动(易经宝库-挖矿活动)2月18日~2月24日【ID1008001】
【活动需求】叱咤风云主题活动(新将来袭-观音)2月4日~2月10日
|
2021-01-25 20:34:16 +08:00 |
ZhangBiao
|
9e14cada49
|
【牛转钱坤】完事了
|
2021-01-21 15:10:27 +08:00 |
jiaoyangna
|
5ea05a80f5
|
图片替换
|
2021-01-21 15:20:52 +08:00 |
ZhangBiao
|
20857d4e27
|
【牛转钱坤】差不多完事了
|
2021-01-20 18:27:23 +08:00 |
ZhangBiao
|
158bf92955
|
【牛转乾坤】资源提交
|
2021-01-20 14:52:12 +08:00 |
guowei
|
5a11596515
|
【鸿蒙阵修改】
|
2021-01-18 17:43:11 +08:00 |
DESKTOP-98AVA47\Administrator
|
dda2e859c6
|
【资源重复】
|
2021-01-15 22:41:22 +08:00 |
DESKTOP-98AVA47\Administrator
|
3d87c29330
|
【资源重复】
|
2021-01-15 22:20:30 +08:00 |
DESKTOP-98AVA47\Administrator
|
8f437f407d
|
【本周优化修改】
|
2021-01-15 22:11:38 +08:00 |
ZhangBiao
|
136f640f60
|
【限时神装】
|
2021-01-15 17:50:43 +08:00 |
ZhangBiao
|
44a4d5485b
|
【限时神装】开坑
|
2021-01-15 17:03:51 +08:00 |
guowei
|
3f8312953e
|
Merge branch 'master_xma_local' into 0功能/鸿蒙门阵
|
2021-01-14 10:20:12 +08:00 |
zhangqiang
|
37181c6ec7
|
【资源】资源路径变更
|
2021-01-13 17:29:15 +08:00 |
zhangqiang
|
005dfc0eff
|
【破阵诛仙】替换资源banner
|
2021-01-13 17:11:00 +08:00 |
zhangqiang
|
1e78f3ff35
|
【资源替换】 必出金色任务
|
2021-01-13 15:33:39 +08:00 |
jiaoyangna
|
76f33e87d4
|
主题活动
|
2021-01-13 11:01:41 +08:00 |
jiaoyangna
|
5809df035a
|
主题活动
|
2021-01-12 10:59:04 +08:00 |
jiaoyangna
|
4627e88c2f
|
主题活动提交
|
2021-01-12 10:39:41 +08:00 |
guowei
|
372b74eb05
|
【鸿蒙阵补齐资源】
|
2021-01-11 11:03:06 +08:00 |
zhangqiang
|
7f0786065e
|
【铜墙铁壁】资源位置改变
|
2021-01-09 17:03:47 +08:00 |
zhangqiang
|
d45aae1c64
|
【资源导入】灵兽宝阁 金乌文字
|
2021-01-08 19:24:46 +08:00 |
jiaoyangna
|
d7dfdfcb2e
|
铜墙铁壁
|
2021-01-08 19:23:09 +08:00 |
zhangqiang
|
9f9b2920e3
|
【战斗回放】
|
2021-01-08 19:19:01 +08:00 |
guowei
|
3ded7b31fc
|
【鸿蒙阵修改】
|
2021-01-08 17:29:54 +08:00 |
zhangqiang
|
b942b82c80
|
【资源导入】灵兽宝阁 金乌文字
|
2021-01-08 16:56:51 +08:00 |
jiaoyangna
|
3cecf72861
|
铜墙铁壁
|
2021-01-07 16:22:36 +08:00 |
guowei
|
6c191263bd
|
Merge branch 'master_xma_local' into 0功能/鸿蒙门阵
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
# Assets/ManagedResources/~Lua/Message/CommonProto.proto
# Assets/ManagedResources/~Lua/Message/Expedition.proto
# Assets/ManagedResources/~Lua/Message/Family.proto
# Assets/ManagedResources/~Lua/Message/FightInfoProto.proto
# Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto
# Assets/ManagedResources/~Lua/Message/MapInfoProto.proto
# Assets/ManagedResources/~Lua/Message/MessageTypeProto.proto
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto.proto
# Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua
|
2021-01-06 20:05:35 +08:00 |
zhangqiang
|
7bedefc780
|
【战斗回放】
|
2021-01-06 16:12:54 +08:00 |
JieLing
|
cdd6f979c8
|
【狭路相逢】资源调整位置
|
2021-01-04 18:13:16 +08:00 |
ZhangBiao
|
71c18b1e94
|
狭路相逢
|
2021-01-04 15:52:13 +08:00 |
ZhangBiao
|
667adb2ba1
|
【资源替换】重置界面妖晶资源替换
|
2020-12-31 17:18:37 +08:00 |
jiaoyangna
|
d249a4c0c1
|
【优化】挂机宝箱显示当前的挂机时间
|
2020-12-31 15:55:20 +08:00 |
zhangqiang
|
a6d16c13e5
|
【寻宝】加锁
|
2020-12-30 18:08:44 +08:00 |
jiaoyangna
|
223c23f4bd
|
[狭路相逢] 提交
|
2020-12-30 15:56:11 +08:00 |
zhangqiang
|
739f390115
|
Merge branch 'master_xma_local' into 0功能/1月6_版本优化
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
|
2020-12-29 17:00:08 +08:00 |
jiaoyangna
|
1cf3f17888
|
【优化】神将解锁锁定状态基本看不出来,让其更加明显
|
2020-12-29 14:23:53 +08:00 |
zhangqiang
|
2576c5bcdd
|
【新将来袭】banner 图片替换
|
2020-12-29 12:13:29 +08:00 |
jiaoyangna
|
fffb834f8a
|
【优化】挂机宝箱显示当前的挂机时间
|
2020-12-29 11:26:34 +08:00 |
JieLing
|
d86c2dc822
|
【资源修改】
|
2020-12-28 20:04:59 +08:00 |
JieLing
|
91cfcb8ccd
|
【资源文件夹】
|
2020-12-28 19:28:05 +08:00 |
JieLing
|
f799c5432c
|
【资源调整】2
|
2020-12-28 18:59:53 +08:00 |
zhangqiang
|
bbddb9e2ec
|
【资源调整】
|
2020-12-28 18:25:51 +08:00 |
gaoxin
|
bf6fd2d13d
|
Merge remote-tracking branch 'origin/0活动开发聚集地/新将活动3个' into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2020-12-26 20:22:23 +08:00 |
zhangqiang
|
26778992fa
|
【资源导入】 buff图标 和 状态字混乱
|
2020-12-26 11:57:58 +08:00 |
jiaoyangna
|
1f05f5f8f6
|
逍遥游 红点提交
|
2020-12-24 16:19:46 +08:00 |
jiaoyangna
|
171e9a4690
|
【优化】巅峰赛,十绝阵预告图标双行文字优化
|
2020-12-24 10:45:15 +08:00 |
jiaoyangna
|
0054f5e646
|
【优化】十绝阵战斗结束后返回至挑战界面,而非编队界面(编队界面无法查看剩余挑战次数和当前绝阵排名)
|
2020-12-24 10:37:38 +08:00 |
jiaoyangna
|
5a0bece22e
|
所向披靡修改
|
2020-12-24 10:23:02 +08:00 |
ZhangBiao
|
38a1eeee9a
|
Merge branch '0活动开发聚集地/升星有礼' into 0活动开发聚集地/新将活动3个
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
|
2020-12-23 11:29:12 +08:00 |
ZhangBiao
|
e40364082c
|
Merge branch '0活动开发聚集地/降妖夺宝' into 0活动开发聚集地/新将活动3个
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
|
2020-12-23 11:21:27 +08:00 |
ZhangBiao
|
30f8049ef5
|
Merge branch '0活动开发聚集地/新将来袭' into 0活动开发聚集地/新将活动3个
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
# Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2020-12-23 11:13:48 +08:00 |
jiaoyangna
|
27568171e5
|
[四灵] 提交
|
2020-12-22 20:33:35 +08:00 |
zhangqiang
|
bb140eab60
|
【鸿蒙阵】 资源漏提
|
2020-12-22 11:33:25 +08:00 |
jiaoyangna
|
9c412cad00
|
[四灵试炼] 提交
|
2020-12-21 20:24:36 +08:00 |
ZhangBiao
|
8d245aab44
|
【降妖夺宝】开坑
|
2020-12-21 17:13:05 +08:00 |
ZhangBiao
|
12760d7cb1
|
【升星有礼】完成
|
2020-12-21 15:41:31 +08:00 |
jiaoyangna
|
c4a0cab9a8
|
Merge branch '0功能/建木神树' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2020-12-21 10:46:53 +08:00 |
jiaoyangna
|
8ff2d808cd
|
四灵试炼 提交
|
2020-12-21 10:37:37 +08:00 |
guowei
|
f744e609a1
|
【鸿蒙阵剩余图片】
|
2020-12-18 16:31:28 +08:00 |
guowei
|
8438bb9de6
|
【补充 鸿蒙阵贴图】
|
2020-12-18 13:40:59 +08:00 |
jiaoyangna
|
9f01de23ea
|
[主题活动]
|
2020-12-18 11:22:54 +08:00 |
guowei
|
52d493ebc7
|
【鸿蒙阵】二次提交
|
2020-12-17 10:41:00 +08:00 |
jiaoyangna
|
0a1e1666f7
|
【博文多识】
|
2020-12-12 17:21:13 +08:00 |
ZhangBiao
|
44c848ac37
|
【建木神树】
|
2020-12-10 14:15:07 +08:00 |
jiaoyangna
|
b460087193
|
【博文多识】
|
2020-12-10 11:35:56 +08:00 |