Commit Graph

108 Commits (cadc9337da32f5d15e326456c67c8101683863e5)

Author SHA1 Message Date
ZhangBiao 73588be932 【踏碎凌霄】 2021-04-26 17:12:39 +08:00
ZhangBiao 98f12190ea 【踏碎凌霄】 2021-04-26 16:46:03 +08:00
ZhangBiao 072b7713c2 【恭喜获得】界面结构调整 2021-04-25 17:40:49 +08:00
ZhangBiao 39329ce5cc 【踏碎凌霄提交】 2021-04-25 15:07:36 +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
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
zhangqiang 25e351dba3 【称号坐骑时装】修改 2021-03-30 10:28:03 +08:00
zhangqiang 51bb90edce 【称号坐骑时装】 协议 无尽副本修改 2021-03-29 12:07:28 +08:00
jiaoyangna 1e19dfe3d5 添加一个gm 功能的新手引导 2021-03-15 15:21:28 +08:00
jiaoyangna 838de7cd1c 文字提交 2021-03-12 14:31:52 +08:00
jiaoyangna 8430af12af 文字提交 2021-03-12 14:24:41 +08:00
jiaoyangna cf02c49ac5 领取奖励界面修改提交 2021-03-11 17:35:04 +08:00
jiaoyangna e177f63787 系统消息新类型添加标签 2021-03-11 17:06:08 +08:00
jiaoyangna a7353213aa 四灵提交 2021-03-10 17:31:40 +08:00
gaoxin e3bc4ecfe0 【本地化】修复升级重复显示lv文字 2021-03-10 11:04:46 +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 d81075da7a 还原lua 2021-03-02 16:53:12 +08:00
jiaoyangna 88e59e0c7c lua 提交 2021-03-02 15:49:02 +08:00
jiaoyangna bc2d95ddec 四灵 提交 2021-02-26 17:44:13 +08:00
jiaoyangna fdf9a1c913 四邻bug 修改 2021-02-22 20:25:58 +08:00
jiaoyangna 6d1d7c7996 战斗回放类型修改 2021-02-22 18:42:26 +08:00
jiaoyangna e4f4649cf9 文本提交 2021-02-20 18:01:57 +08:00
jiaoyangna 602dbc924c 文本还原 2021-02-20 16:43:44 +08:00
gaoxin 78e7305c15 【本地化】导出中文 2021-02-05 15:58:37 +08:00
gaoxin 927025f6de 【本地化】中文字还原,合并用 2021-02-05 12:44:50 +08:00
gaoxin adf591cbec 【本地化】lua代码还原 2021-01-27 18:16:54 +08:00
gaoxin 81b3ca1ddc 【本地化】 中文字还原,合并代码用 2021-01-26 11:13:09 +08:00
zhangqiang f6b4a710c8 【战斗回放】大闹天宫战斗后,在森罗幻境中查看战斗回放,播放的是大闹天宫回放 2021-01-18 15:50:56 +08:00
zhangqiang 2d8cf57a08 【车迟斗法】战斗后bug 2021-01-18 15:11:27 +08:00
zhangqiang e90509b0ae 【战斗回放】 强制引导屏蔽回放按钮 2021-01-12 11:19:10 +08:00
zhangqiang 8d5d222639 【战斗回放】 强制新手引导屏蔽按钮 2021-01-11 19:44:59 +08:00
jiaoyangna 6dbc555860 【战斗回放】按钮显示修改 2021-01-08 11:16:22 +08:00
zhangqiang ecbde627e4 【战斗回放】bug 2021-01-07 18:03:57 +08:00
zhangqiang 7bedefc780 【战斗回放】 2021-01-06 16:12:54 +08:00
zhangqiang b3bd8f8fa6 【漏提】 2020-12-30 18:20:32 +08:00
zhangqiang a6d16c13e5 【寻宝】加锁 2020-12-30 18:08:44 +08:00
guowei df79f56b72 【优化五星成长礼包、心魔试炼礼包】 2020-12-24 13:52:28 +08:00
jiaoyangna 22038419b7 神医天降提交 2020-11-06 19:54:00 +08:00
zhangqiang 3479bd153c 【灵兽系统】 合并 功能ok 但是战斗合完进不去 2020-10-31 17:01:46 +08:00
jiaoyangna ed758d3a37 五星拍脸 2020-08-31 16:50:15 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
zhangqiang c08c537b16 公会副本提交 2020-08-20 20:05:38 +08:00
zhangqiang 22ad34291b 献祭 和 吞卡 掉落身上装备不显示提交 2020-08-10 14:16:48 +08:00
jiaoyangna e0359bb37a encoding upate 2020-08-06 17:52:32 +08:00
jiaoyangna adc3b71e40 分解修改提交 2020-07-16 10:49:01 +08:00
gaoxin edc24d7efd 修复获取奖励卡顿的问题 2020-07-02 17:01:40 +08:00
JieLing 8c61581548 外网 0.16.10 内网 0.15.23 2020-06-28 17:48:49 +08:00
JieLing d87ab3767e 内网 0.15.20 2020-06-23 18:36:24 +08:00
JieLing e189462ac9 内网测试 0.15.14 2020-06-18 20:39:29 +08:00
JieLing cf5f3e9952 内网测试 0.15.12 2020-06-13 11:47:13 +08:00
JieLing 063868ce73 外网包 0.16.1 2020-05-25 19:16:23 +08:00
JieLing 266b9065d8 测试版本 带热更 0.15.1 2020-05-15 16:52:35 +08:00
JieLing 4c8d2cf8de 提交 2020-05-09 13:31:21 +08:00