布局

assets/json/dropData.json.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.2",
-  "uuid": "8d1459a1-60a0-4cae-8b84-51700d756231",
+  "uuid": "a1932367-d2fc-4346-9414-0f3181baf709",
   "importer": "json",
   "subMetas": {}
 }

assets/json/emitterBasicLevel.json.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.2",
-  "uuid": "8d9f1c2c-d0c0-48cd-b763-23d813b30b74",
+  "uuid": "1272e5e7-ac62-478a-8ca0-13143be9f46e",
   "importer": "json",
   "subMetas": {}
 }

assets/script/common/xlsConfig.ts

@@ -53,30 +53,30 @@ export type xlsTaskMain = {id:string,nextid:string,kind:string,need:number,item:
 // type for wing.excel
 
 export class XlsConfig {
-    xlsAttrAttr: xlsAttrAttr[]
-    xlsAudioInfo: xlsAudioInfo[]
-    xlsChapterInfo: xlsChapterInfo[]
-    xlsChapterLayout: xlsChapterLayout[]
-    xlsDropData: xlsDropData[]
-    xlsEmitterInfo: xlsEmitterInfo[]
-    xlsEmitterBasicLevel: xlsEmitterBasicLevel[]
     xlsEquipInfo: xlsEquipInfo[]
-    xlsGuideInfo: xlsGuideInfo[]
     xlsItemKind: xlsItemKind[]
     xlsItemInfo: xlsItemInfo[]
+    xlsEmitterInfo: xlsEmitterInfo[]
+    xlsEmitterBasicLevel: xlsEmitterBasicLevel[]
     xlsKaiqiInfo: xlsKaiqiInfo[]
+    xlsDropData: xlsDropData[]
+    xlsChapterInfo: xlsChapterInfo[]
+    xlsChapterLayout: xlsChapterLayout[]
     xlsLanguageClientText: xlsLanguageClientText[]
-    xlsLanguageSeverHouduan: xlsLanguageSeverHouduan[]
-    xlsLanguageLang: xlsLanguageLang[]
-    xlsLevelLevel: xlsLevelLevel[]
     xlsMathInfo: xlsMathInfo[]
-    xlsMergePropInfo: xlsMergePropInfo[]
+    xlsGuideInfo: xlsGuideInfo[]
+    xlsAttrAttr: xlsAttrAttr[]
+    xlsAudioInfo: xlsAudioInfo[]
     xlsMergeInfo: xlsMergeInfo[]
+    xlsLanguageSeverHouduan: xlsLanguageSeverHouduan[]
+    xlsPingbiciInfo: xlsPingbiciInfo[]
     xlsNameName: xlsNameName[]
     xlsPackageInfo: xlsPackageInfo[]
-    xlsPingbiciInfo: xlsPingbiciInfo[]
+    xlsLevelLevel: xlsLevelLevel[]
     xlsTaskDesc: xlsTaskDesc[]
     xlsTaskMain: xlsTaskMain[]
+    xlsMergePropInfo: xlsMergePropInfo[]
+    xlsLanguageLang: xlsLanguageLang[]
 
     constructor(bundleName:string, callback: Function, progressCallback?: Function) {
         cc.assetManager.loadBundle(bundleName, (err, bundle) => {

assets/script/logic/fgui/Home/Home/HomeMergeTipCom.ts

@@ -40,7 +40,7 @@ export default class HomeMergeTipCom {
     private OnHcMergeTip(data: MergeTipData): void {
         this._vm.visible = data.isShow;
         if (data.isShow) {
-            this.MergeListUtil.refreshItems(data.mergeArr);
+            this.MergeListUtil.refreshItems(data.mergeArr, { showRate: true });
         }
     }
 }

assets/script/logic/fgui/Home/Home/HomeMergeTipItem.ts

@@ -12,10 +12,12 @@ export default class HomeMergeTipItem extends ItemRender {
 	IconLoad: fgui.GLoader;
 	@Autowire
 	RateLabel: fgui.GTextField;
+	RateCtr: fgui.Controller;
 	private mData: MergeItem;
 	sp_item: ResSprite;
 	onInit() {
 		this.sp_item = this.IconLoad.node.addComponent(ResSprite);
+		this.initControllers();
 	}
 
 	onShow(): void {
@@ -24,10 +26,15 @@ export default class HomeMergeTipItem extends ItemRender {
 	onHide(): void {
 	}
 
-	setData(data: MergeItem, index?: number, param?: { refresh: boolean }) {
+	setData(data: MergeItem, index?: number, param?: { showRate: boolean }) {
 		this.mData = data;
 		this.RateLabel.text = `${(data.rate / 100).toFixed(0)}%`;
 		let quality = 0;
+		if (param.showRate) {
+			this.RateCtr.selectedIndex = 1;
+		} else {
+			this.RateCtr.selectedIndex = 0;
+		}
 		if (this.mData.type == HcType.emitter) {
 			let mergePropCfg = Gamecfg.emitterInfo.getItem(this.mData.id.toString());
 			this.sp_item.setSpriteFrame('gridMap', `mergeProp/${mergePropCfg.icon}`);

assets/script/shared/admin/PtlgameError.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "3cae8661-8ffa-4f63-9075-59beee4292ee",
+  "uuid": "fe9875c6-6dbb-42f1-a75b-4fc2ffd2f58d",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/admin/PtlroleDataEdit.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "6bbfdeaa-7635-467a-abbb-f38dcef455ce",
+  "uuid": "b223886c-fad1-46b8-8533-786bc1b40986",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/admin/PtlsevData.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "ec225fae-afb6-479d-9dc4-dce91420d4f6",
+  "uuid": "bf0c3474-b0aa-4034-966d-3ec68b8a8a27",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/admin/PtlsevDataEdit.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "8db784fb-f259-45cb-8f87-947077f0f9aa",
+  "uuid": "4936b889-ad47-46af-89f5-c809cf97a0b2",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/chat/PtlChatHistory.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "719c2b1f-57b9-414b-b301-53be6b9eeba0",
+  "uuid": "0bfb3cb7-98f9-42a5-8c33-3424727299d5",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/common/MsgItemsRwd.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "e5832f70-a564-460d-afa6-b60a92c36641",
+  "uuid": "8c7dbbfa-aa42-4069-bcf9-1ad4e95caf95",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/hc/PtlHcInfo.ts

@@ -33,6 +33,7 @@ export interface HcInfoGeziInfo {
 export interface HcInfoGeziEmitter {
     tili:number  //剩余发射次数
     lastTime:number  //最后一次回复时间 需要根据配置表的类型做判定
+    level:number //发射器等级
 }
 
 

fgui-project/assets/Home/Components/HomeMergetip.xml

@@ -5,7 +5,7 @@
     <image id="n30_tt6a" name="n30" src="f6x03e" fileName="Images/home/Img_zjm_xiangqingdi.png" xy="375,288" pivot="0.5,1" anchor="true" size="730,208" group="n31_tt6a">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </image>
-    <list id="n35_tt6a" name="MergeList" xy="415,206" pivot="0.5,0.5" anchor="true" size="664,167" group="n31_tt6a" layout="row" overflow="scroll" scroll="horizontal" colGap="2" defaultItem="ui://1xjqm8v2tt6aj" align="center" vAlign="middle" autoClearItems="true">
+    <list id="n35_tt6a" name="MergeList" xy="375,206" pivot="0.5,0.5" anchor="true" size="664,167" group="n31_tt6a" layout="row" overflow="scroll" scroll="horizontal" colGap="2" defaultItem="ui://1xjqm8v2tt6aj" align="center" vAlign="middle" autoClearItems="true">
       <item/>
       <item/>
       <item/>