wangzhenxing
|
bb18772265
|
Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2023-09-21 18:43:54 +08:00 |
xiejun
|
c47462c5d8
|
Merge branch 'dev_one_discount' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
# Conflicts:
# AssetBundles/version.txt
# Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
# Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab
# Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
# Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelChapterPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
|
2023-09-20 18:57:44 +08:00 |
wangzhenxing
|
1556e5c6a9
|
礼物合成提交
|
2023-09-18 17:41:06 +08:00 |
wangzhenxing
|
551579ca39
|
星际显示添加空判断
(cherry picked from commit fd5cd6836c )
|
2023-09-15 18:02:50 +08:00 |
wangzhenxing
|
fd5cd6836c
|
星际显示添加空判断
|
2023-09-15 18:00:39 +08:00 |
wangzhenxing
|
acdb5a21cd
|
礼物修改提交
|
2023-09-15 14:11:14 +08:00 |
wangzhenxing
|
eeb3859f72
|
礼物功能提交
|
2023-09-13 14:57:48 +08:00 |
wangzhenxing
|
3ac8d1ee2c
|
魂印图鉴修改提交
|
2023-09-01 18:48:59 +08:00 |
wangzhenxing
|
18e10b4fb6
|
命格修改提交
|
2023-08-31 19:12:02 +08:00 |
wangzhenxing
|
52393c592c
|
命石提交
|
2023-08-31 15:02:13 +08:00 |
xiejun
|
6ced2b0507
|
Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
# AssetBundles/version.txt
# Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
# Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
|
2023-08-29 17:58:24 +08:00 |
xiejun
|
f549956ebb
|
新预制体已经公会和活动ui
|
2023-08-28 11:34:43 +08:00 |
xiejun
|
148443883c
|
神将
|
2023-08-11 19:03:48 +08:00 |
wangzhenxing
|
34834da938
|
心愿法宝开启文字提示修改
|
2023-08-08 17:21:11 +08:00 |
xiejun
|
43d80275b9
|
神将部分UI替换
|
2023-08-04 18:58:14 +08:00 |
xiejun
|
fd8329bf90
|
海贼UI
|
2023-07-27 18:37:04 +08:00 |
xiejun
|
8a4e15e258
|
海贼UI替换
|
2023-07-21 17:04:16 +08:00 |
PC-202302260912\Administrator
|
15cce82e7a
|
法宝抽卡添加开启限制
|
2023-07-17 14:27:56 +08:00 |
wangzhenxing
|
df07616ab3
|
变身卡修改提交
|
2023-05-31 17:21:13 +08:00 |
wangzhenxing
|
12e2cecaa1
|
神兵属性,神兵羁绊,神兵分解提交
|
2023-04-04 11:15:32 +08:00 |
wangzhenxing
|
614ec0b6e1
|
多队塔排行榜显示修改提交
|
2023-03-22 10:45:26 +08:00 |
wangzhenxing
|
91b1bbb82c
|
遴选多队塔代码
|
2023-03-21 10:58:00 +08:00 |
wangzhenxing
|
6d55ae95d7
|
Revert "多队塔提交"
This reverts commit 4a411833a5 .
|
2023-03-20 11:42:40 +08:00 |
wangzhenxing
|
4a411833a5
|
多队塔提交
|
2023-03-20 11:22:44 +08:00 |
wangzhenxing
|
2985c1f5a2
|
法相装备修改提交
|
2023-02-21 14:20:46 +08:00 |
wangzhenxing
|
136bc6c12a
|
英雄一键升级修改
|
2022-12-23 14:56:30 +08:00 |
wangzhenxing
|
3a952c6753
|
英雄培养优化
|
2022-11-15 15:57:48 +08:00 |
wangzhenxing
|
ceeef789ed
|
探索特权修改提交
|
2022-11-08 13:45:52 +08:00 |
wangzhenxing
|
223fb60204
|
神魂特效显示修改,冲榜活动奖励修改
|
2022-11-07 17:24:41 +08:00 |
wangzhenxing
|
2d3304e7bd
|
gm修改器添加条件限制
|
2022-11-04 17:18:11 +08:00 |
wangzhenxing
|
f697f7893b
|
特权商店处理提交
|
2022-11-03 17:39:42 +08:00 |
yuanshuai
|
3ff54b15a3
|
Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt
|
2022-11-03 10:57:55 +08:00 |
yuanshuai
|
45ad268ee8
|
神尊特权 幸运转盘 GM刷冲礼包功能优化
|
2022-11-03 10:57:45 +08:00 |
wangzhenxing
|
0543114a36
|
角色星级扩展
|
2022-11-02 16:26:40 +08:00 |
wangzhenxing
|
da4b07d862
|
星级显示修改提交
|
2022-11-02 15:47:17 +08:00 |
wangzhenxing
|
3f49477a2a
|
functions 改成utf-8 编码
|
2022-09-29 10:31:21 +08:00 |
wangzhenxing
|
fdaec2ac28
|
[gm修改器]=====提交
|
2022-09-20 17:04:48 +08:00 |
yuanshuai
|
817dd37a71
|
神尊特权驭兽斋bug修改
|
2022-09-18 11:50:01 +08:00 |
yuanshuai
|
d42106b07e
|
神尊特权提交
|
2022-09-09 18:09:45 +08:00 |
wangzhenxing
|
bf108a4f18
|
[周卡]======周卡修改提交
|
2022-07-26 17:39:41 +08:00 |
wangzhenxing
|
8125728ae8
|
【装备】======套装属性技能激活提示信息修改
|
2022-06-14 18:20:03 +08:00 |
wangzhenxing
|
12e0c83271
|
【合成装备】=======套装属性显示修改
|
2022-06-14 17:59:20 +08:00 |
wangzhenxing
|
207fb46d9a
|
【装备】=======装备套装技能描述提示修改
|
2022-06-14 17:48:38 +08:00 |
wangzhenxing
|
1cc17d4e4b
|
[装备合成]=======装备详情显示修改
|
2022-06-14 17:32:32 +08:00 |
wangzhenxing
|
56380704c7
|
【装备】====装备添加青金品质
|
2022-06-13 16:38:48 +08:00 |
wangzhenxing
|
3b4e771d16
|
[神将信息展示]======神将信息修改
|
2022-05-19 16:38:52 +08:00 |
wangzhenxing
|
d4a6bfdda2
|
【神将排版优化】========神将信息界面修改
|
2022-05-18 20:00:57 +08:00 |
yuanshuai
|
55833325bf
|
跨服相关修改
|
2022-04-25 17:57:31 +08:00 |
yuanshuai
|
9ebdab46b3
|
挑战副本相关脚本提交
|
2022-04-14 16:07:45 +08:00 |
wangzhenxing
|
a13dd2939a
|
[功能]================神系英雄添加提叫
|
2022-03-28 18:18:19 +08:00 |