Commit Graph

173 Commits (93eb328ddfc28f176e8e75233f977bcc64be4512)

Author SHA1 Message Date
zhangqiang e4eda3017e 【山河社稷图】提交 2021-05-13 20:30:10 +08:00
zhangqiang effe90990f 【山河社稷图】提交 2021-05-11 15:12:37 +08:00
zhangqiang 601f5c09b9 【拍脸】修改 2021-05-06 18:08:53 +08:00
gaoxin f570a522fe 【挂机】修复偶现生成怪的位置不够的问题 2021-04-28 19:02:02 +08:00
gaoxin 2a4b70f212 【回放】修复战斗回放时报错 2021-04-25 21:30:25 +08:00
gaoxin 229b7165ee 【挂机】第五账地图偶现死循环卡死 2021-04-25 16:49:08 +08:00
gaoxin 4a33407d27 【挂机】修复部分章节卡死 2021-04-25 16:05:11 +08:00
gaoxin d9640a660c 【sploader】翻译资源加载优化 2021-04-22 17:54:03 +08:00
gaoxin 43afe3d6f1 【内存】btview可能会导致重复卸载资源的问题 2021-04-22 13:40:04 +08:00
ZhangBiao 2df3ac159c 【限时活动】完成?删除loggreen 2021-04-21 16:36:12 +08:00
jiaoyangna 70b4ebdf83 容错修改 2021-04-21 14:31:26 +08:00
gaoxin 30b329a837 【ios】图片回收 2021-04-21 13:12:04 +08:00
jiaoyangna 61833b8b00 Merge branch '0功能/挂机界面' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2021-04-20 17:51:14 +08:00
jiaoyangna 20cf3f88a9 挂机修改提交 2021-04-20 17:42:53 +08:00
jiaoyangna c7f4c57585 点数修改 2021-04-20 17:21:32 +08:00
jiaoyangna 089f0ce436 挂机提交 2021-04-20 16:09:56 +08:00
jiaoyangna 5b2ddbf8e6 点数调整 2021-04-20 15:10:41 +08:00
jiaoyangna 1e04dcc200 名字提交 2021-04-20 14:52:02 +08:00
JLIOSM1 c31a82ef7f 【ios】lua文件格式修改 2021-04-20 13:58:00 +08:00
jiaoyangna efe1bdeab0 挂机界面修改 2021-04-19 11:58:22 +08:00
jiaoyangna c94f1051da 挂机修改提交 2021-04-17 21:04:09 +08:00
jiaoyangna 5f9144f4e5 挂机多人开启条件添加 2021-04-15 21:05:27 +08:00
jiaoyangna 3738137554 【挂机演示优化】挂机界面增加其他玩家 2021-04-15 15:51:24 +08:00
wangzhenxing 443ba942cf [功能]================称号功能提交 2021-04-12 16:23:57 +08:00
jiaoyangna 071a91773a 导出 文本提交 2021-04-09 12:26:35 +08:00
jiaoyangna 0ab7c3177a 还原文字提交 2021-04-09 12:06:17 +08:00
gaoxin 500d54469d 【扫光】挂机,充值界面扫光光效添加 2021-04-08 18:16:28 +08:00
ZhangBiao bfaa5195b5 Revert "【表删除】报错处理"
This reverts commit b163fc3035.
2021-04-07 11:54:39 +08:00
gaoxin 9033d47109 【本地化】文本导出 2021-04-06 22:33:57 +08:00
gaoxin b163fc3035 【表删除】报错处理 2021-04-06 15:16:37 +08:00
gaoxin b53717c9ee 【本地化】还原文本 2021-04-01 18:41:50 +08:00
gaoxin cbb28ebeae 【本地化】文本导出 2021-04-01 18:36:34 +08:00
zhangqiang 2497735700 【关卡】在25级关卡和27级关卡,卡等级的时候,“挑战关卡”按钮是置灰的 2021-04-01 16:21:35 +08:00
gaoxin 9c080a0cac 【激素探索】按钮扫光光效修改 2021-03-31 19:06:16 +08:00
gaoxin 35ed5c2854 【挂机】修复关卡未解锁时按钮状态显示错误的问题 2021-03-31 14:28:57 +08:00
zhangqiang 40cc3683f9 【称号坐骑时装】中地图修改 2021-03-30 22:22:01 +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
zhangqiang ecf18e4b5a 【称号坐骑时装】大地图修改 2021-03-30 21:11:27 +08:00
jiaoyangna ad24255948 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 21:02:36 +08:00
gaoxin 6e34c88fa5 【人物信息栏】修复战力刷新不及时的问题 2021-03-30 20:46:47 +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
jiaoyangna 23b46ba218 活动 修改提交 2021-03-30 20:17:26 +08:00
gaoxin c2a5c2dc17 【特权优化】将界面顶部的特权等级移回-挂机,副本界面修啊给i 2021-03-30 19:54:19 +08:00
zhangqiang 365a694eca 【称号坐骑时装】 跳章节修改 2021-03-30 19:18:32 +08:00
jiaoyangna c2fac79eca 活动 提交 2021-03-30 18:26:10 +08:00
zhangqiang 25e351dba3 【称号坐骑时装】修改 2021-03-30 10:28:03 +08:00
zhangqiang db6f2d0b32 【称号坐骑时装】提交 2021-03-29 17:53:40 +08:00
zhangqiang 9637337c39 【称号坐骑时装】 修改提交 2021-03-27 20:01:39 +08:00
zhangqiang 095701c33f 【称号时装坐骑】初提 2021-03-26 20:06:08 +08:00
gaoxin c6674710f9 【引导】2倍速引导增加 2021-03-19 18:14:52 +08:00
ZhangBiao 4861711fbc 【本地化】 2021-03-03 18:25:34 +08:00
jiaoyangna d81075da7a 还原lua 2021-03-02 16:53:12 +08:00
jiaoyangna 88e59e0c7c lua 提交 2021-03-02 15:49:02 +08:00
JieLing 619b3d9983 【本地化】挂机界面优化 2021-02-26 17:16:37 +08:00
jiaoyangna e4f4649cf9 文本提交 2021-02-20 18:01:57 +08:00
jiaoyangna 602dbc924c 文本还原 2021-02-20 16:43:44 +08:00
jiaoyangna f15fa6f1f9 越南语图片提交 2021-02-18 17:21:14 +08:00
gaoxin 78e7305c15 【本地化】导出中文 2021-02-05 15:58:37 +08:00
gaoxin 927025f6de 【本地化】中文字还原,合并用 2021-02-05 12:44:50 +08:00
gaoxin bf3a6eb705 【本地化】界面显示问题修复 2021-01-29 13:34:16 +08:00
gaoxin adf591cbec 【本地化】lua代码还原 2021-01-27 18:16:54 +08:00
gaoxin c567dcd426 【本地化】代码本地化提交 2021-01-26 17:08:39 +08:00
gaoxin 81b3ca1ddc 【本地化】 中文字还原,合并代码用 2021-01-26 11:13:09 +08:00
gaoxin 802881378c Merge branch 'master_xma_local' into gx/xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
2021-01-26 11:08:54 +08:00
gaoxin 3b83a72215 【本地化】文字还原 2021-01-26 11:05:27 +08:00
DESKTOP-98AVA47\Administrator 040971534e 【巅峰赛限时头像修改】 2021-01-15 21:06:48 +08:00
gaoxin f501e92272 【本地化】代码还原,合并用 2021-01-12 11:00:44 +08:00
gaoxin ae7da93056 【本地化】还原文字 2021-01-12 10:56:26 +08:00
gaoxin 27b3c1ea32 【本地化】还原文本到代码中合并用 2021-01-09 14:20:06 +08:00
jiaoyangna fffb834f8a 【优化】挂机宝箱显示当前的挂机时间 2020-12-29 11:26:34 +08:00
ZhangBiao 5137e588dc Revert "【关卡界面】怎加挂机时间"
This reverts commit 136b2a4c18.
2020-12-29 10:53:48 +08:00
jiaoyangna eba0a867da Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化 2020-12-28 20:10:50 +08:00
jiaoyangna a8bcdf14f4 【优化】道具不能使用0个,且优化道具使用多个的上限(目前20过少) 2020-12-28 20:10:45 +08:00
ZhangBiao 136b2a4c18 【关卡界面】怎加挂机时间 2020-12-28 19:46:50 +08:00
zhangqiang 26d714e1c5 【优化】等级成长礼 2020-12-24 16:06:10 +08:00
DESKTOP-98AVA47\Administrator b11cf4dfe3 【巅峰赛】拍脸修改 有表 张强提交 2020-12-24 21:04:33 +08:00
gaoxin f53a566ce8 【逍遥游】功能入口随功能开启添加 2020-10-19 22:57:02 +08:00
jiaoyangna 4aa18b7ac1 推送礼包派脸修改 2020-10-19 22:01:44 +08:00
yuanshuai 131d1aab1b 【逍遥游】红点和帮助弹窗提交 2020-10-19 21:39:48 +08:00
gaoxin 364c9c99fc 【逍遥游】功能合并到local分支 2020-10-19 20:37:53 +08:00
gaoxin b3d15c1945 头像特效添加 2020-09-27 16:58:10 +08:00
JieLing 5985c0304f Merge branch 'master_tishen_hw' of http://60.1.1.230/gaoxin/JL_Client into master_tishen_hw 2020-09-22 10:36:10 +08:00
wangxiaolong 12f296aa6d 添加日志输出 2020-09-22 10:34:22 +08:00
JieLing 02b58da225 修复进入游戏报错 2020-09-21 18:26:54 +08:00
wangxiaolong 68e2fda511 添加日志输出 2020-09-21 16:55:18 +08:00
gaoxin 4edb1c7925 修复可能在引导日常之前就可以领取日常奖励的问题 2020-09-07 15:38:12 +08:00
gaoxin 97eaf77009 主界面底部界面经验条显示调整 2020-09-01 17:12:00 +08:00
zhangqiang cf7b336eef 漏提 2020-09-01 09:37:51 +08:00
zhangqiang a6fa4453e6 需求主城或关卡停留过长添加聊天气泡 2020-08-31 20:52:50 +08:00
jiaoyangna e5bccae20b 【成就】点击任务,没有自动选择有红点的页签 2020-08-31 17:10:33 +08:00
JieLing 8e9e944279 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2020-08-25 16:18:27 +08:00
JieLing ff27e11daa 修复第五章会导致挂机界面卡死的问题 2020-08-25 16:06:06 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
gaoxin 02c213aca8 挂机地图新增 2020-08-24 17:17:21 +08:00
jiaoyangna c10b4eec2d jisu daren tijiao 2020-08-22 20:54:18 +08:00
jiaoyangna a63f5e92d2 急速达人红点提交 2020-08-22 20:46:06 +08:00
jiaoyangna 3bb8e284d9 破阵诛仙 2020-08-28 16:36:08 +08:00
shihongyi e797e9f48d 合并develop &2 进程中,暂时不要更新 2020-08-12 11:37:26 +08:00
jiaoyangna e0359bb37a encoding upate 2020-08-06 17:52:32 +08:00