Commit Graph

320 Commits (7ffae74046586b244a2964ad681227ddb61f7839)

Author SHA1 Message Date
PC-202302260912\Administrator f683040488 小兵战斗界面修改 2024-04-08 18:40:42 +08:00
PC-202302260912\Administrator 360d8c71e1 小兵添加多血条显示 2024-04-02 18:47:44 +08:00
PC-202302260912\Administrator 0c0996187f 红点修改提交 2024-04-01 17:32:41 +08:00
PC-202302260912\Administrator 58b97c7152 小兵等级添加红点 2024-04-01 15:47:03 +08:00
PC-202302260912\Administrator efb714863e 小兵修改提交 2024-04-01 15:12:36 +08:00
PC-202302260912\Administrator f9d180ea53 小兵提交 2024-03-29 19:25:56 +08:00
PC-202302260912\Administrator fd3ac0926a 小兵替换战力变化添加显示 2024-03-29 17:29:25 +08:00
PC-202302260912\Administrator b55e3bbe71 击败boss特效修改 2024-03-29 16:20:28 +08:00
PC-202302260912\Administrator 6083ced4be 小兵挂机奖励显示修改 2024-03-29 16:04:06 +08:00
PC-202302260912\Administrator f379b76dfd 挂机修改 2024-03-29 11:53:40 +08:00
PC-202302260912\Administrator 84be275ca1 小兵显示修改提交 2024-03-28 16:21:39 +08:00
PC-202302260912\Administrator 74ed832ac6 显示挂机关卡层数 2024-03-28 15:22:30 +08:00
PC-202302260912\Administrator b53c9e9a25 挂机产出显示修改 2024-03-28 11:47:07 +08:00
PC-202302260912\Administrator b9b1d46899 挂机小兵战斗力实时修改 2024-03-26 18:31:42 +08:00
PC-202302260912\Administrator 9f61f2cc0a 挂机界面刷新boss关卡显示 2024-03-22 18:18:17 +08:00
PC-202302260912\Administrator 008056935c 小兵战斗添加血条 2024-03-22 17:38:21 +08:00
PC-202302260912\Administrator 5e14cc49e5 小兵战斗 添加后台战斗 2024-03-22 16:28:04 +08:00
PC-202302260912\Administrator d108dd850a 添加查看上阵小兵信息界面 2024-03-21 18:20:32 +08:00
PC-202302260912\Administrator a01b5c220c Merge branch 'tcx_xiyou_dev' into tcx_xiyou_solider
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2024-03-21 15:37:17 +08:00
PC-202302260912\Administrator 38c9947b89 关卡修改 2024-03-21 11:37:43 +08:00
PC-202302260912\Administrator 4b9a2cca1e 挂机修改提交 2024-03-20 15:50:34 +08:00
PC-202302260912\Administrator bc0df7acec 挂机显示修改 2024-03-19 18:43:17 +08:00
PC-202302260912\Administrator 7f62ec9ca4 挂机打boss 伤害字显示修改 2024-03-19 18:23:34 +08:00
PC-202302260912\Administrator 96258981ad 挂机战斗修改提交 2024-03-19 17:47:02 +08:00
PC-202302260912\Administrator eeb51a7aaa 小兵提交 2024-03-13 18:56:19 +08:00
sean 2386350df6 英雄界面优化 2024-01-19 20:01:17 +08:00
wangzhenxing 56cdd1b8d3 gm刷冲描述修改 ,特权特权激活修改 2023-08-07 20:10:34 +08:00
PC-202302260912\Administrator eafdbd9f44 Revert "屏蔽挂机界面寻宝入口显示及红点检测"
This reverts commit 374e6d80cd.
2023-07-14 11:27:34 +08:00
PC-202302260912\Administrator 3f1ab4f07f 探索对应特权跳转修改 2023-06-28 15:28:39 +08:00
PC-202302260912\Administrator 374e6d80cd 屏蔽挂机界面寻宝入口显示及红点检测 2023-06-28 14:51:14 +08:00
wangzhenxing 6a2b5b8b09 推荐阵容调整位置 加红点 2023-01-10 16:39:58 +08:00
wangzhenxing 2206d01288 太初特权入口修改 2022-12-15 14:29:02 +08:00
wangzhenxing 2bf115a8d8 挂机奖励预览修改 2022-12-06 11:07:34 +08:00
yuanshuai 828e56c6be 挂机战斗修改提交 2022-11-25 15:43:42 +08:00
yuanshuai a18efd9a1f 挂机战斗优化 2022-11-24 19:00:24 +08:00
yuanshuai 5005e8da5f 挂机战斗修改 2022-11-24 18:28:48 +08:00
yuanshuai 7acb7c8f44 关卡挂机游戏提交 2022-11-22 18:19:37 +08:00
wangzhenxing fec63345d6 [bt]======探索修改 2022-11-22 15:05:42 +08:00
wangzhenxing 689ebec257 关卡奖励图标适配 2022-11-17 10:50:37 +08:00
wangzhenxing eeca517eaf 屏蔽普通特权入口 2022-11-09 10:24:03 +08:00
wangzhenxing b73735f7cb 刷冲特权优化,通关某关卡添加空判断 2022-11-04 15:40:41 +08:00
wangzhenxing 74d375cf7f [送无限抽]=======提交 2022-10-17 16:13:47 +08:00
wangzhenxing f6ed4db66c 【飘渺之旅】=====红点修改 2022-07-25 16:46:46 +08:00
wangzhenxing e488e98680 [飘渺之旅]======红点修改提交 2022-07-25 15:37:56 +08:00
wangzhenxing b0dfb411b8 [数字游戏]======红点修改提交 2022-07-25 15:06:04 +08:00
yuanshuai cd0d9bad9e 添加八日登陆红点 2022-07-21 13:43:03 +08:00
yuanshuai e7db9b7373 数字游戏按钮控制 2022-07-18 16:05:39 +08:00
yuanshuai 57acd39446 数字游戏入口屏蔽 2022-07-13 10:55:39 +08:00
yuanshuai d952b9a44c 数字游戏模块提交 2022-07-11 15:43:04 +08:00
wangzhenxing d119bac1c0 【首充】========关卡首充显示修改 2022-07-01 14:43:08 +08:00
wangzhenxing 43e1913e37 [首充]=====首充按钮普通关卡大小调整 2022-06-30 18:27:53 +08:00
wangzhenxing d2df97df2a [首充]=======首充添加到普通关卡界面 2022-06-30 18:17:58 +08:00
wangzhenxing 8eec6cb793 【关卡排行】=====关卡界面关卡排行榜修改 2022-05-18 13:48:03 +08:00
yuanshuai b8308b380c 开服福利奖励修改 2022-05-09 18:31:41 +08:00
yuanshuai 25515c21b7 关卡奖励报错修改 2022-04-29 11:48:39 +08:00
jiaoyangna 5be4e726ea 挂机收益显示错误修改 2022-03-10 17:04:37 +08:00
jiaoyangna 087e83bce7 【ID1019501】
【探索】进入地图后,小人显示有血,原地晃
2022-01-24 11:23:19 +08:00
gaoxin 925db190ee 【引导】修复挂机界面打开时触发引导小手不消失的问题 2022-01-18 11:38:00 +08:00
gaoxin 69e30f8fd0 【关卡】功能引导时关闭小手显示 2022-01-17 11:02:33 +08:00
gaoxin 1c827a3a23 【关卡】有可挑战关卡时添加小手显示 2022-01-14 16:02:10 +08:00
gaoxin 70d753cce5 极速探索按钮颜色调整 2022-01-13 16:41:12 +08:00
jiaoyangna fe4f9fdcf7 探索地图报错修改 2022-01-07 13:43:07 +08:00
jiaoyangna b1be355601 Merge branch 'tansuo' into china/dev
# Conflicts:
#	Assets/ManagedResources/Atlas/ExploreAtlas.meta
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2022-01-06 16:07:59 +08:00
jiaoyangna c8b604bde4 【ID1011007】
【优化】功能开启增加新条件类型
2022-01-06 11:30:35 +08:00
jiaoyangna 330c34a0b8 探索地图人物切换修改 2021-12-31 16:32:08 +08:00
jiaoyangna 17c6d0cdc7 地图小人挺住不动修改 2021-12-31 14:07:56 +08:00
jiaoyangna 7a9d61e8c9 地图探索修改提交 2021-12-31 11:40:42 +08:00
jiaoyangna 657574b61a 探索地图修改提交 2021-12-29 16:21:59 +08:00
jiaoyangna 89c298f593 探索地图修改提交 2021-12-29 16:05:16 +08:00
jiaoyangna 978689d9a7 探索提交 2021-12-28 17:52:28 +08:00
jiaoyangna 9dafa85858 探索提交 2021-12-28 13:30:27 +08:00
jiaoyangna d83373ecab Merge branch 'china/dev' into tansuo
# Conflicts:
#	Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab
#	Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/JumpViewNew.lua
#	Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua
2021-12-27 17:00:14 +08:00
jiaoyangna 71496d3905 探索提交 2021-12-27 15:42:52 +08:00
jiaoyangna 5f9f7da264 探索提交 2021-12-24 17:49:54 +08:00
jiaoyangna 88130ac4dd 探索提交 2021-12-24 14:09:48 +08:00
jiaoyangna 7f0e684bc0 一键探索修改提交 2021-12-24 11:18:03 +08:00
jiaoyangna e34092f93d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-12-24 10:54:16 +08:00
jiaoyangna 6dfafd7054 探索提交 2021-12-24 00:33:33 +08:00
jiaoyangna 5d37c0d4d9 探索提交 2021-12-23 17:23:02 +08:00
gaoxin da2b205955 【挂机】添加新人商城入口 2021-12-30 00:01:14 +08:00
jiaoyangna 83b5a04ac6 探索提交 2021-12-23 13:45:33 +08:00
jiaoyangna 39254af42e 探索提交 2021-12-23 13:45:05 +08:00
jiaoyangna f9689bafde 删除没用的log 2021-12-21 13:10:52 +08:00
jiaoyangna e2eada47d1 删除log 2021-12-20 22:00:12 +08:00
jiaoyangna b841b77467 关卡解锁跳转添加提交 2021-12-20 15:43:54 +08:00
jiaoyangna 5ab2f2f40a 关卡tips 关卡条件修改提交 2021-12-20 14:56:43 +08:00
gaoxin ce0c1db2f3 【关卡】解锁提示资源提交 2021-12-27 16:55:17 +08:00
gaoxin 5bfb89d276 【关卡挂机】未解锁跳转功能添加 2021-12-27 13:11:33 +08:00
gaoxin 7d02fd5394 【解锁提示】添加解锁条件显示 2021-12-27 09:58:34 +08:00
gaoxin ab3d7e939b 【解锁提示】添加功能解锁提示 2021-12-26 19:12:25 +08:00
gaoxin f0d9f4828f 【关卡新条件】条件显示在按钮上 2021-12-26 18:13:39 +08:00
gaoxin f920d4807c 【无用log删除】 2021-12-13 15:49:02 +08:00
gaoxin c46d18eb17 【关卡新条件】好感度等级获取方式修改,逍遥游完成次数协议添加 2021-12-13 15:48:26 +08:00
gaoxin 6c259fbf26 【关卡新条件】完善 2021-12-13 15:27:17 +08:00
gaoxin 3835273079 【关卡】条件新增 2021-12-10 17:37:07 +08:00
gaoxin 666e6f51a3 【开服福利】最后一档奖励变更为寻仙玉,外面入口还是猴子图片 2021-12-07 17:10:43 +08:00
ZhangBiao 9e83ce264d 【引导】升级后不弹引导修改 2021-11-30 15:43:02 +08:00
ZhangBiao d39153607b 【灵兽特惠】倒计时修改 2021-11-29 13:40:53 +08:00
gaoxin e2c42fcdb5 【关卡】修复剧情关卡后按钮状态刷新不及时的问题 2021-12-02 04:18:13 +08:00
gaoxin 8a960ece3b 【关卡】添加剧情关卡 2021-12-02 01:06:34 +08:00