xiejun
|
63aa8128f6
|
四海UI修改
|
2023-12-12 11:43:45 +08:00 |
xiejun
|
52726874dd
|
四海历练相关
|
2023-12-08 23:57:58 +08:00 |
xiejun
|
10ade04a60
|
角色立绘位置改为配表
|
2023-11-10 16:07:52 +08:00 |
xiejun
|
6e1a65aa13
|
修改副本怪物显示弹窗预制体
|
2023-11-10 15:49:20 +08:00 |
wangzhenxing
|
0a51ced090
|
[飞升]=====大脑天宫特效修改
|
2022-01-22 17:08:17 +08:00 |
wangzhenxing
|
7de5fdac9e
|
[飞升]=====特效问题修改
|
2022-01-20 17:58:57 +08:00 |
wangzhenxing
|
e734c4a03d
|
[飞升]=======飞升修改
|
2022-01-20 11:41:20 +08:00 |
wangzhenxing
|
853fde91b2
|
[飞升]============飞升修改提交
|
2022-01-15 12:26:12 +08:00 |
wangzhenxing
|
1b39fbdbe9
|
【飞升】===========神魂后星级显示修改
|
2022-01-10 15:11:30 +08:00 |
wangzhenxing
|
5b670023ed
|
[飞升]=======飞升代码逻辑提交
|
2022-01-05 18:17:44 +08:00 |
jiaoyangna
|
d9f71e2f48
|
大闹天宫添加神魂等级
|
2021-12-06 17:47:14 +08:00 |
ZhangBiao
|
cf971541e1
|
【大闹天宫】无法挑战修改
|
2021-12-02 10:35:06 +08:00 |
wangzhenxing
|
ac32149aa8
|
[立绘朝向]=====皮肤,敌方立绘朝向修改
|
2021-11-29 17:07:28 +08:00 |
wangzhenxing
|
1eb6115bc9
|
[角色朝向]=======立绘朝向修改
|
2021-11-29 13:21:23 +08:00 |
gaoxin
|
bb685191dd
|
【优化】设置物品显示的方法改为通用方法
|
2021-11-26 14:27:24 +08:00 |
gaoxin
|
2f65f4d391
|
【心魔试炼】界面报错修复
|
2021-11-05 11:06:10 +08:00 |
jiaoyangna
|
766710dc6b
|
Merge branch 'china/dev' into 0功能/神魂
|
2021-10-29 13:25:35 +08:00 |
ZhangBiao
|
c1f3658da4
|
【界面优化】提交
|
2021-10-29 11:13:29 +08:00 |
jiaoyangna
|
ec3cee0ebb
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/Icon/Item/icon_sbx.png.meta
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-10-28 16:52:28 +08:00 |
ZhangBiao
|
871b2ad23b
|
【界面优化】大闹天宫调整
|
2021-10-28 16:40:54 +08:00 |
jiaoyangna
|
5e8ad7dd08
|
神魂提交
|
2021-10-26 16:00:31 +08:00 |
jiaoyangna
|
4d5876eb28
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua
|
2021-09-02 19:33:48 +08:00 |
ZhangBiao
|
6bbf30e344
|
【心魔试炼、幸运探宝】星级特效显示、高级探宝时间显示000000
|
2021-09-02 11:19:29 +08:00 |
jiaoyangna
|
56af6f1a11
|
第一次bug修改提交
|
2021-08-31 20:22:59 +08:00 |
jiaoyangna
|
2fbe372c76
|
四灵修改提交
|
2021-08-27 18:39:45 +08:00 |
jiaoyangna
|
6b8c2f2f3c
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.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/Popup/RewardTalismanSingleShowPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
# Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.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/Carbon/CarbonManager.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
|
2021-08-06 11:15:13 +08:00 |
zhangqiang
|
9a4f1a64b2
|
【漏提】
|
2021-05-28 15:01:18 +08:00 |
zhangqiang
|
63671cacbb
|
【修改图片加载方式 】 增加踏碎凌霄称号预设 没特效
|
2021-05-28 14:18:41 +08:00 |
zhangqiang
|
ac0feb82be
|
【bug】
|
2021-05-27 11:07:32 +08:00 |
zhangqiang
|
da9aeed441
|
【心魔试炼】提交
|
2021-05-26 11:48:44 +08:00 |
zhangqiang
|
f8ddf0fbe6
|
【心魔试炼】提交
|
2021-05-26 10:00:30 +08:00 |
zhangqiang
|
fcc00ee1d7
|
【心魔试炼】提交
|
2021-05-25 20:50:23 +08:00 |
zhangqiang
|
a1c4a6aa5c
|
【心魔】 + 山河社稷图修改
|
2021-05-25 14:51:26 +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 |
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 |
gaoxin
|
fa61ea1317
|
【ios推荐服】白片处理,修复无尽副本无法返回,修复副本回到主界面点击其他页签黑屏
|
2021-04-22 20:39:30 +08:00 |
ZhangBiao
|
2df3ac159c
|
【限时活动】完成?删除loggreen
|
2021-04-21 16:36:12 +08:00 |
gaoxin
|
30b329a837
|
【ios】图片回收
|
2021-04-21 13:12:04 +08:00 |
JLIOSM1
|
c31a82ef7f
|
【ios】lua文件格式修改
|
2021-04-20 13:58:00 +08:00 |
zhangqiang
|
8cf7de1811
|
【大闹天宫】试炼节点显示有问题
|
2021-04-13 18:26:37 +08:00 |
JieLing
|
ea7282bbbb
|
Merge branch 'xma/dev' into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-04-10 17:23:38 +08:00 |
jiaoyangna
|
071a91773a
|
导出 文本提交
|
2021-04-09 12:26:35 +08:00 |
jiaoyangna
|
0ab7c3177a
|
还原文字提交
|
2021-04-09 12:06:17 +08:00 |
gaoxin
|
9033d47109
|
【本地化】文本导出
|
2021-04-06 22:33:57 +08:00 |
gaoxin
|
b53717c9ee
|
【本地化】还原文本
|
2021-04-01 18:41:50 +08:00 |
jiaoyangna
|
23b46ba218
|
活动 修改提交
|
2021-03-30 20:17:26 +08:00 |
ZhangBiao
|
e9e002310b
|
【大闹天宫】
|
2021-03-18 21:15:03 +08:00 |
zhangqiang
|
7a6a0b1451
|
【贪婪节点修改】
|
2021-03-18 15:53:44 +08:00 |
DESKTOP-98AVA47\Administrator
|
c3cdf85e4d
|
【大闹天宫】试炼节点
|
2021-03-17 11:48:25 +08:00 |
JieLing
|
a0135661dc
|
【大闹天宫】试炼节点显示修改
|
2021-03-15 11:35:40 +08:00 |