root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,990 Commits
38 Branches
2218 Tags
29 GiB
Commit Graph

9188 Commits (6f8fa46ccd09eca9bc57e76b65e699bc6583a1fa)

Author SHA1 Message Date
jiaoyangna f7db9fc907 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 17:22:18 +08:00
jiaoyangna 73b9fad19d 至尊降世活动兼容提交 2021-10-22 17:21:31 +08:00
ZhangBiao e821387c93 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 16:47:39 +08:00
gaoxin c1352e0a59 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-10 02:52:56 +08:00
gaoxin 24ea182587 【最佳】加入主角伤害展示 2021-11-10 02:52:51 +08:00
gaoxin 3f2ce26aff Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-10 01:17:33 +08:00
gaoxin 99985c442d 【积天豪礼】红点加入主界面下拉按钮红点 2021-11-10 01:17:28 +08:00
gaoxin 8d8a50a0ce Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-10 01:01:09 +08:00
gaoxin c080345afc 【积天豪礼】主界面按钮资源上传 2021-11-10 01:01:05 +08:00
gaoxin 7a5f41ef46 【积天豪礼】分离到主城 2021-11-10 00:58:39 +08:00
gaoxin 8125b21af3 【跨服】修复七界试炼红点刷新不及时的问题 2021-11-10 00:56:37 +08:00
ZhangBiao 0508d1d652 【御剑行】跨期修改 2021-10-22 16:47:30 +08:00
ZhangBiao ac6dca4805 【御剑行】赛季结束不可打开竞猜 2021-10-22 15:46:35 +08:00
ZhangBiao 0f0c0586bf 【御剑行】红点 2021-10-22 15:44:19 +08:00
ZhangBiao c16004cf3b 【百宝商会】增加次数显示 2021-10-22 15:41:49 +08:00
ZhangBiao 26e980b503 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 14:49:08 +08:00
ZhangBiao 0d94f23e41 【御剑行】红点提交 2021-10-22 14:48:56 +08:00
wangzhenxing 7ad105855a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 14:44:40 +08:00
wangzhenxing 8590face13 【战斗】========主角技能名称图片资源提交 2021-10-22 14:44:11 +08:00
ZhangBiao befea57bbc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 14:29:09 +08:00
ZhangBiao 7da9ee8b6d 【弹窗优化】邮件、每日任务 2021-10-22 14:28:59 +08:00
ZhangBiao 5aba21341c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 14:22:23 +08:00
ZhangBiao 1f5f4f15c3 【弹窗优化】提交 2021-10-22 14:22:12 +08:00
wangzhenxing fc3edefd82 【战斗】=====hot buff修改提交 2021-10-22 14:11:25 +08:00
wangzhenxing 8035e3f6f3 [战斗]==============战斗消息位置修改 2021-10-22 14:04:15 +08:00
wangzhenxing eefaa33687 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 13:59:08 +08:00
wangzhenxing e0b7df4206 [战斗]==========被动199 历战之躯 被动修改 2 2021-10-22 13:57:51 +08:00
ZhangBiao 609b191785 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 13:53:22 +08:00
ZhangBiao 22941d0af5 【弹窗优化】公会、公告、服务器列表】英雄信息 2021-10-22 13:53:10 +08:00
wangzhenxing 2a6f3389b3 [战斗]=============被动199 历战之躯 修改 2021-10-22 13:35:44 +08:00
ZhangBiao cdc17b555e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 13:22:51 +08:00
ZhangBiao 31e8f4c726 【弹窗优化】物品信息、自选箱、排行榜、限时活动奖励弹窗 2021-10-22 13:22:39 +08:00
wangzhenxing d93e0a9c4e 角色技能升级按钮添加动效 2021-10-22 13:15:08 +08:00
wangzhenxing 73361ef6c9 玉虚奖励预设修改提交 2021-10-22 12:09:10 +08:00
gaoxin 7b486f1559 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-23 03:01:26 +08:00
gaoxin 25a14f7a79 【商店】免费次数的商店，取消刷新后今日不再显示满次红点的功能，满次后刷新红点显示添加 2021-10-23 03:01:20 +08:00
gaoxin 582ab51299 【山河社稷图】每日奖励文字修改 2021-10-22 21:25:49 +08:00
wangzhenxing 4518c8c175 修行技能bug修改提交 2021-10-22 11:56:46 +08:00
ZhangBiao 7b20915c6c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 11:27:58 +08:00
ZhangBiao 39aa09f317 【点击黑色区域关闭】 2021-10-22 11:27:47 +08:00
ZhangBiao e48606b648 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 11:21:53 +08:00
ZhangBiao 1215e46af8 【御剑行】点击商店返回后增加请求 2021-10-22 11:21:42 +08:00
jiaoyangna bfd2e06ecc 至尊降世修改提交 2021-10-22 11:20:24 +08:00
ZhangBiao abbcc52f01 【御剑行】提交 2021-10-22 10:57:01 +08:00
ZhangBiao fa818dac35 【御剑行】提交 2021-10-22 10:41:20 +08:00
ZhangBiao 9fd8d6d886 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 10:25:36 +08:00
ZhangBiao a732dadb5f 【御剑行】修改提交 2021-10-22 10:25:20 +08:00
wangzhenxing eb5867b31c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 10:21:36 +08:00
wangzhenxing c494145ff8 主角技能添加屏蔽 2021-10-22 10:21:07 +08:00
ZhangBiao 19d4f27f76 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 10:20:42 +08:00
ZhangBiao 85819fcbae 【御剑行】红点调整 2021-10-22 10:20:30 +08:00
wangzhenxing ae47df29bb 【红点】=============修行技能红点提交 2021-10-22 10:08:53 +08:00
ZhangBiao 747cb5b179 【御剑行】修改提交 2021-10-22 10:00:19 +08:00
ZhangBiao d8da0bb26a 【协议】补提 2021-10-22 09:33:54 +08:00
ZhangBiao cef99194af Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-22 09:26:20 +08:00
ZhangBiao 2ab4be658d 【主角修为】图标顺序调整 2021-10-22 09:26:09 +08:00
jiaoyangna 68cbb5905a 至尊降世修改提交 2021-10-21 18:58:36 +08:00
jiaoyangna 4e89351ef8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-21 18:12:41 +08:00
jiaoyangna b24061ccd0 至尊降世报错修改提交 2021-10-21 18:12:28 +08:00
gaoxin 6c9f0098cf 【逍遥游】修复加速状态下，转盘卡死问题 2021-10-21 18:02:33 +08:00
jiaoyangna ad84124cd9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-21 18:00:20 +08:00
jiaoyangna bdb8510d92 坐骑界面修改提交 2021-10-21 18:00:05 +08:00
ZhangBiao 9e0ca64dbd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-21 17:55:20 +08:00
ZhangBiao e3b9c82ac7 【七界试炼】左右按钮在调整 2021-10-21 17:55:11 +08:00
wangzhenxing fb7ad25c56 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-21 17:49:46 +08:00
wangzhenxing 05669fe98b 红点常量提交 2021-10-21 17:49:30 +08:00
wangzhenxing 7261a428fb 主角技能伤害提交 2021-10-21 17:47:49 +08:00
ZhangBiao 869b65dd95 Merge branch 'china/dev' into 0活动开发聚集地/百宝商会第二季 
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab
 2021-10-21 17:47:34 +08:00
ZhangBiao 96860e358c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-21 17:46:34 +08:00
ZhangBiao 42618596e1 【七界试炼】按钮显隐提交 2021-10-21 17:46:23 +08:00
jiaoyangna 36b574a645 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-21 17:39:09 +08:00
jiaoyangna 8fa8a9d690 至尊降世界面修改提交 2021-10-21 17:38:53 +08:00
ZhangBiao a6ebd138e4 【新百宝商会】提交 2021-10-21 17:28:53 +08:00
gaoxin 6cb068ea60 【建木神树】红点刷新不及时 2021-10-21 17:18:40 +08:00
gaoxin 34a58a310c 【排行榜】修复膜拜后页签红点刷新不及时，修复跨服前七天跨服按钮会显示红点 2021-10-21 17:02:05 +08:00
gaoxin f4912f5772 【逍遥游】转盘再加速 2021-10-21 16:43:19 +08:00
gaoxin aa9ce7f992 【逍遥游】优化转盘速度 2021-10-21 16:30:38 +08:00
wangzhenxing 5575ba2245 [战斗]=====灵兽技能修改提交 2021-10-21 16:17:10 +08:00
wangzhenxing c131aa96b4 [qijie]button 2021-10-21 16:12:59 +08:00
ZhangBiao bf82ae5d9e 【七界试炼】按钮调整2 
(cherry picked from commit da71c81536)
 2021-10-21 15:16:28 +08:00
ZhangBiao da71c81536 【七界试炼】按钮调整2 2021-10-21 15:15:55 +08:00
ZhangBiao 24f0574e0a 【七界试炼】按钮修改 
(cherry picked from commit 81fe590710)
 2021-10-21 15:15:24 +08:00
ZhangBiao 81fe590710 【七界试炼】按钮修改 2021-10-21 15:12:01 +08:00
gaoxin 7822274c0c 【出包场景】新增游心的第二个包的出包场景 2021-10-21 13:48:43 +08:00
wangzhenxing 3d9bf0041f [战斗]============灵兽技能伤害不检测是否命中 2021-10-21 13:25:41 +08:00
ZhangBiao 448ec131e8 Merge branch 'china/dev' into 0活动开发聚集地/百宝商会第二季 
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
 2021-10-21 13:07:13 +08:00
ZhangBiao 3293656507 【新百宝商会】提交 2021-10-21 13:06:25 +08:00
wangzhenxing bb849d4b93 主角技能界面修改 2021-10-21 11:58:33 +08:00
ZhangBiao b5d4d87f63 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-21 11:14:36 +08:00
ZhangBiao 984bb12611 【主角修为】问号文字调整 2021-10-21 11:14:24 +08:00
gaoxin 04613652fd 【公会战】不再请求公会战数据 2021-10-21 11:10:55 +08:00
ZhangBiao afaf672de4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-21 10:58:21 +08:00
ZhangBiao 205200268d 【主角修为】提交 2021-10-21 10:58:09 +08:00
wangzhenxing 18da581061 [战斗]=====技能添加空判断 2021-10-21 10:41:57 +08:00
gaoxin da665cc148 【编队】取消公会战相关编队判断，获取编队信息时不再检测公会战防守编队信息 2021-10-21 10:22:00 +08:00
wangzhenxing a17242b0c0 Merge branch 'china/dev' into 0功能/玉虚论道 
Conflicts:
	Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
	Assets/ManagedResources/~Lua/Data/ConfigData.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
	Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua
 2021-10-20 22:13:29 +08:00
wangzhenxing 7b7879ce89 [战斗]=========效果130修改 2021-10-20 22:00:01 +08:00
wangzhenxing 24f0812b9f 主角技能提交 2021-10-20 21:33:37 +08:00
gaoxin 630271bf6c 【挚礼月卡】修复金额刷新不及时的问题 2021-10-20 19:15:40 +08:00
jiaoyangna ce28ba9362 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-20 18:50:47 +08:00
jiaoyangna 5425fc980a 坐骑界面技能描述修改提交 2021-10-20 18:50:34 +08:00
ZhangBiao 6a3c9ccd25 【主角修为】问号提交 2021-10-20 18:35:30 +08:00
ZhangBiao bb489b08e8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-20 18:33:02 +08:00
ZhangBiao 1e3b3c9f27 【御剑行】修改提交 2021-10-20 18:31:59 +08:00
gaoxin 09ca5f98ad Merge branch '0活动开发聚集地/挚礼月卡' into china/dev 2021-10-20 16:36:56 +08:00
gaoxin a712ddee3b 【挚礼月卡】功能完善 2021-10-20 16:36:36 +08:00
jiaoyangna e420c89429 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-20 15:17:38 +08:00
jiaoyangna f3f416e202 添加天书秘卷登陆请求 2021-10-20 15:17:22 +08:00
gaoxin 85b15d6cb7 Merge branch 'china/dev' into 0活动开发聚集地/挚礼月卡 2021-10-20 15:14:38 +08:00
ZhangBiao 65c676eda9 【主角修为】文字调整 2021-10-20 15:11:41 +08:00
ZhangBiao 4299fdd035 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-20 15:10:09 +08:00
ZhangBiao 0d8af528ff 【主角修为】引导提交 2021-10-20 15:09:59 +08:00
jiaoyangna dd89fb59e8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-20 15:06:59 +08:00
jiaoyangna 9aa975cd7b 羁绊打印 2021-10-20 15:06:23 +08:00
ZhangBiao e2cb67caf3 【修行】点击加成按钮后 游戏崩溃修改 2021-10-20 14:27:43 +08:00
ZhangBiao 557b9cc523 Merge branch 'china/dev' into 0活动开发聚集地/百宝商会第二季 2021-10-20 14:05:15 +08:00
ZhangBiao 52ead2a89e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-20 14:04:52 +08:00
ZhangBiao d774b09a63 【御剑行】协议和资源提交 2021-10-20 14:04:40 +08:00
gaoxin 32cabdd75c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-20 13:52:00 +08:00
gaoxin 74f3c07aa4 【山河每日奖励】新增二次确认 2021-10-20 13:51:55 +08:00
ZhangBiao f75e42d9c9 Merge branch 'china/dev' into 0活动开发聚集地/御剑行 
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.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/JumpManager.lua
 2021-10-20 13:41:32 +08:00
ZhangBiao 7bd64b6a13 Merge branch 'china/dev' into 0功能/主角修为 2021-10-20 13:16:07 +08:00
ZhangBiao 76cfad3419 【主角修为】完成提交 2021-10-20 13:15:31 +08:00
jiaoyangna 7d1f1d7f01 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-20 11:17:27 +08:00
jiaoyangna 9e83a95373 新增资源 2021-10-20 11:17:11 +08:00
xuexinpeng 0eaaf0fc77 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-19 19:07:25 +08:00
xuexinpeng c1483a7438 玉虚论道 战斗记录添加空判断 2021-10-19 19:06:12 +08:00
gaoxin e6af50143c 【山河社稷图】修复小人方向错误 2021-10-19 19:03:02 +08:00
gaoxin b2a163ae3d 【百宝商会第二季】预设上传 2021-10-19 19:01:40 +08:00
ZhangBiao a387432369 【主角修为】提交 2021-10-19 18:34:10 +08:00
gaoxin 7a9cdc15b2 Merge branch '0功能/山河社稷图每日奖励' into china/dev 2021-10-19 18:02:20 +08:00
gaoxin e01b39c8a4 【山河每日奖励】优化宝箱显示 2021-10-19 18:01:50 +08:00
gaoxin 3c371623d7 【山河每日奖励】完善奖励领取逻辑 2021-10-19 17:07:32 +08:00
ZhangBiao 8f05e215fe 【我要变强】增加评分进度条显隐控制 2021-10-19 15:40:42 +08:00
ZhangBiao 2d982e67d3 【主角修为】提交 2021-10-19 15:34:43 +08:00
gaoxin e647486e07 【战斗】失败界面我要变强按钮资源修改-预设修改 2021-10-19 14:05:02 +08:00
gaoxin 60c8973644 【战斗】失败界面我要变强按钮资源修改 2021-10-19 14:03:52 +08:00
gaoxin 335bc04645 【每日豪礼】选中时也显示红点 2021-10-19 13:52:58 +08:00
ZhangBiao bbc98ac478 【牛气冲天】进度显示不全修复 2021-10-19 13:35:10 +08:00
jiaoyangna 2ec0a28cf3 去掉log 2021-10-19 13:34:03 +08:00
jiaoyangna 47a5fe6e3f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-19 13:25:21 +08:00
jiaoyangna 005468635f 页签添加红点 2021-10-19 13:25:08 +08:00
ZhangBiao 2f92759e9f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-19 11:20:22 +08:00
ZhangBiao db87d4925a 【灵兽山】放生10只整灵兽后，可以同时选择整只灵兽和碎片，恭送后消耗是正确的，仅显示问题 2021-10-19 11:20:11 +08:00
gaoxin 89d93783b7 【优化】每日豪礼充值以后没有红点提示领取 2021-10-19 11:08:35 +08:00
jiaoyangna 1f077cbcdc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-19 11:04:25 +08:00
jiaoyangna c091c55bef 【ID1010437】 
【优化】开服玉帝御剑坐骑活动
 2021-10-19 11:04:06 +08:00
gaoxin a23791e07c 【战斗】失败界面添加我要变强跳转 2021-10-19 10:46:12 +08:00
ZhangBiao 48236ba797 【天枢密卷】增加跳转 2021-10-19 10:34:45 +08:00
ZhangBiao 99fb560ca2 【七界试炼】上下层按钮调整 2021-10-19 10:12:41 +08:00