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

757 Commits (526e2226fc2164bbd2ae77abcadb99bbcbca07a8)

Author SHA1 Message Date
jiaoyangna 63448b9f1a Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-01-08 15:49:28 +08:00
zhangqiang 6f87cf04a8 【资源导入】 灵兽 金乌 live2d and 三个音效 2021-01-08 15:21:24 +08:00
jiaoyangna a5a93d43a7 【ID1007787】 
【优化】心魔试炼高级阶段奖励没有展示，添加层数奖励
 2021-01-07 19:24:04 +08:00
jiaoyangna 6ae1a0b75e 【ID1007696】 
【优化】逍遥游移动时头顶出现金币的奖励特效
 2021-01-07 17:45:50 +08:00
zhangqiang 7bedefc780 【战斗回放】 2021-01-06 16:12:54 +08:00
jiaoyangna d249a4c0c1 【优化】挂机宝箱显示当前的挂机时间 2020-12-31 15:55:20 +08:00
zhangqiang 694320d99c Merge branch '0功能/1月6_版本优化' into master_develop 
# Conflicts:
#	Assets/Effect_ls_08_jinwu_attack_02.controller.meta
#	Assets/ManagedResources/Atlas/DyAct_ShengXingYouLi/ArtFont.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_banner.png.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon1.png.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_zi.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon1.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi.meta
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_beijin.jpg.meta
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhezhao.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhuangbeidi.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_banner.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_icon1.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_icon2.png.meta
#	Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan.meta
#	Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Animation.meta
#	Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Animation/GameObject 7.controller.meta
#	Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture.meta
#	Assets/ManagedResources/EffectResSkill/Effect_ls_08_jinwu/Animation/Effect_ls_08_jinwu_attack_02_ctrl.controller
#	Assets/ManagedResources/EffectResSkill/Effect_ls_08_jinwu/Animation/Effect_ls_08_jinwu_attack_02_ctrl.controller.meta
#	Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab
#	Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.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/Fight/View/InvadeMonsterView.lua
#	Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	FontArt/ArtFont_zh/s_shengxingyouli_anniu_01_zh.png
#	FontArt/ArtFont_zh/s_shengxingyouli_anniu_02_zh.png
#	FontArt/中英文不一致资源/zh/s_shengxingyouli_banner_zh.png
 2020-12-31 14:53:17 +08:00
zhangqiang 0a2b4f3c3e 【漏提】 2020-12-30 18:25:48 +08:00
zhangqiang a6d16c13e5 【寻宝】加锁 2020-12-30 18:08:44 +08:00
jiaoyangna 0e8811df2b 【优化】背包中使用多个道具，明确标注数量 2020-12-30 11:02:44 +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
zhangqiang 1227e93456 【寻宝】 优化 加锁 1 2020-12-29 16:56:18 +08:00
jiaoyangna 1cf3f17888 【优化】神将解锁锁定状态基本看不出来，让其更加明显 2020-12-29 14:23:53 +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
JieLing d86c2dc822 【资源修改】 2020-12-28 20:04:59 +08:00
ZhangBiao 136b2a4c18 【关卡界面】怎加挂机时间 2020-12-28 19:46:50 +08:00
zhangqiang 66e2b0b25d 【新将来袭】资源引用丢失 2020-12-28 19:41:17 +08:00
ZhangBiao 9f3560471c Merge branch '0功能/1月6_版本优化' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1月6_版本优化 2020-12-28 17:07:30 +08:00
ZhangBiao 56436bb4c3 【云梦祈福】1080*2460，重置按钮点击没反应 修改 2020-12-28 17:06:59 +08:00
jiaoyangna 2e3ac84814 【优化】背包中使用多个道具，明确标注数量 2020-12-28 16:40:32 +08:00
jiaoyangna 02ac474504 【优化】背包分类优化 2020-12-28 16:26:38 +08:00
jiaoyangna d85bd9c3aa 【优化】背包分类优化 2020-12-28 16:25:38 +08:00
zhangqiang 46d090b509 【抽卡横线】去掉 2020-12-28 13:54:34 +08:00
ZhangBiao 263e5cd0f6 【森罗幻境】遇怪弹出的详情底部，猎妖师->神将 修改 2020-12-28 11:34:35 +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
wangzhenxing 96f31b63ad [优化]魂宝灵宝加号点击区域扩大 2020-12-26 19:45:44 +09:00
wangzhenxing e4596beb99 【宝物】==========宝物添加加号提示 2020-12-26 19:44:48 +09:00
jiaoyangna c1f87eb208 逍遥红点 提交 2020-12-26 18:39:47 +08:00
gaoxin 1171415e74 【技能Tip】修复大小不能自适应文字的问题 2020-12-26 18:34:08 +08:00
zhangqiang a90dc5ff6b 【抽卡修改】提交 2020-12-26 17:20:38 +08:00
ZhangBiao 6befa383c8 【降妖夺宝】界面调整 2020-12-24 18:36:38 +08:00
ZhangBiao 601eefb120 【降妖夺宝】点击抽卡时可以切换其他界面修复 2020-12-24 16:57:39 +08:00
jiaoyangna 1f05f5f8f6 逍遥游 红点提交 2020-12-24 16:19:46 +08:00
jiaoyangna e95ae4724b 【优化】放生灵兽添加开启等级。 2020-12-24 16:19:32 +08:00
jiaoyangna 171e9a4690 【优化】巅峰赛，十绝阵预告图标双行文字优化 2020-12-24 10:45:15 +08:00
jiaoyangna 3a6e07bf1c 【逍遥游优化】逍遥游玩法优化内容 2020-12-23 20:18:43 +08:00
ZhangBiao 8801a84c2b 【新将活动】商店跳转修复 2020-12-23 17:28:20 +08:00
zhangqiang 9d6574d3b3 【优化】公会援助赠送的按钮时间间隔过长，优化按钮连续点击的效果。只加了按钮点击动画 2020-12-23 16:00:10 +08:00
jiaoyangna 4a6d8d0561 【优化】移除点将台界面的进入动画 2020-12-23 15:06:56 +08:00
jiaoyangna 4520616bd0 Merge branch '0功能/1230版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1230版本优化内容 2020-12-23 14:52:22 +08:00
jiaoyangna 41977a85f5 【优化】删除十绝阵敌方阵容上的血条和怒气条 2020-12-23 14:52:13 +08:00
ZhangBiao d0b94a1c3b 【新将活动】新将来袭、新疆招募、升星有礼 提交 2020-12-23 14:36:15 +08:00
zhangqiang 47397d8b06 【优化】优化编队界面，现在拖动下阵/换位的操作不流畅，经常失败 2020-12-23 14:32:59 +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 239dc826df 【升星有礼】合并分支资源名修改 2020-12-23 11:22:44 +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 9e7f7454e8 【降妖夺宝】合并分支资源名修改 2020-12-23 11:15:54 +08:00